363 Commits

Author SHA1 Message Date
Carrie
93d5292338
Make iron darker, tweak copper, tweak gold block (#1411) 2025-05-07 18:20:11 +02:00
IntegratedQuantum
5a1a824e05
Add SPIR-V compilation to ensure our shaders remain SPIR-V compatible (#1404)
* Remove unused `directionalLight` uniform

* Add glslang libraries

* Update to the new Cubyz-libs version

* Dehardcode OS-dependent library file name stuff

* Audio somehow crashes on close, not sure why but I assume it's probably because of the library being compiled with a new zig version.

* Remove irrelevant uniforms from Window uniform list

* Remove unused itemdrop uniform

* Implement SPIR-V compilation code, the actual output is discarded

* Improve linking shader errors by passing a file path

* Fix formatting
2025-05-05 20:20:11 +02:00
Carrie
2cf88669e7
Removed unused block textures (#1402) 2025-05-05 17:21:10 +02:00
Carrie
7fed896a77
Permafrost, cold grass, and osier (+ biome changes) (#1369)
* Permafrost, cold grass, osier, cold taiga, tweaks

* Tweak osier and cold grass item

* formatting

* Move cold_taiga to taiga/cold and migrate taiga/base

* Fix subbiomes
2025-05-04 12:39:44 +02:00
Carrie
900b52a02c
Resin assets (#1383)
* Resin assets

* resin_block = .wood

* Make resin block more frictiony
2025-05-04 12:34:17 +02:00
IntegratedQuantum
1a1a503033 gl_DepthRange is not supported by SPIR-V
progress towards #1376
2025-05-02 17:04:21 +02:00
IntegratedQuantum
73d50720b4 Assign locations to all uniform declarations
progress towards #1376
2025-05-02 16:47:29 +02:00
IntegratedQuantum
3ba4d5fd14 Explicitly specify image bindings for all sampler uniforms.
progress towards #1376
2025-05-02 15:49:01 +02:00
IntegratedQuantum
9898db654b Specify the location of all shader in/out parameters.
also normalized the version and layout formatting
progress towards #1376
2025-05-02 14:53:57 +02:00
OneAvargeCoder193
9181b31a6d
Add stars and a simple skybox (#1043)
* really bad and inefficient star code i think

* add stars that dont work during the day but look cool

* remove galaxy shape and replace it with a simple sphere

* add broken background

* make stars affected by fog

* make the stars additive

* remove commented code in shaders

* remove unused variables in the shader

* make the stars spin

* make stars not have bloom

* fix formatting

* temp changes

* fix formatting (still temp changes)

* switch to cubyz random numbers

* multiply star matrix in cpu instead of gpu

* changed star to be twice as big, not affect by resolution as much, and also be loaded from a texture

* remove trailing whitespaces

* remove unused constants

* simplify the code by removing a log and power

* optimizing the stars

* remove debug code

* make stars triangles instead of points

* simplify the math more

* give star ssbo unique id

* fix formatting issues

* make array multiline

* fix formatting

* remove files i accidentally added

* remove random obj file

* fix some issues

* use square distance

* fix formatting

* small change

* fix some stuff

* fix other things

* comp error

* more stuff

* fix some stuff with the stars

* test

* fix formatting

* fix more formatting

* test 2

* fixes

* changes

* changes

* fix formatting

* fixes

* remove patch
2025-04-27 20:29:19 +02:00
Carrie
a2911710a6
Add ladder assets (#1310) 2025-04-27 17:31:48 +02:00
OneAvargeCoder193
735e99826e
Make the crosshair transparent (#1347)
* make crosshair transparent

* fix styling

* fixes
2025-04-27 15:14:07 +02:00
Carrie
db767b9c30
Update tool template textures (#1355) 2025-04-27 11:00:33 +02:00
Carrie
f8c26e751b
New selection wand texture (#1354) 2025-04-27 10:58:56 +02:00
Carrie
1c22c879f4
Ruby ore + diamond texture tweaks (#1349)
* Ruby blocks and item, tweaks to diamond textures

* Tweak ruby ore and add recipes

* Change ore height

* minHeight
2025-04-27 10:58:27 +02:00
IntegratedQuantum
05ab8a4a5b Make mushrooms degradable 2025-04-26 09:38:57 +02:00
Krzysztof Wiśniewski
fde5a69cdc
Add selection wand (#1298)
* Add selection wand

* Update zon file extension

* Apply review change requests

* Simplify receive logic for worldEditPos

* Convert isServerSide to method
2025-04-25 20:49:37 +02:00
IntegratedQuantum
f41504f684
Tool reparammarametetrizatation (#1332)
* Change how to specify tool parameters

* Some mild reparammarametetrizatation and pickaxes now only have one relevant tip.

* Ignore properties that couldn't be found instead of assigning some default

* Remove grip and strength from materials

* Ensure that all woods can break all stones, but not copper, and ensure that all stones tipped woods can break copper.

Also increased weight damage slightly

* Reparammamaramamararara

* Update shover and axe (mostly copied from the pickaxe with less damage)

* Remove the unused FunctionType struct.

* Remove named slots from axe
2025-04-24 21:57:12 +02:00
Carrie
f0bfe30c0e
Allow ores on obsidian (#1305) 2025-04-23 22:43:58 +02:00
Krzysztof Wiśniewski
f193eb68bd
Migrate jungle(TODO) to jungle (#1334) 2025-04-22 22:44:49 +02:00
Krzysztof Wiśniewski
a4584d5e96
Add void block (#1324)
* Add void block

* Apply review change requests
2025-04-22 19:18:45 +02:00
IntegratedQuantum
176c9d4c75 Introduce item tags and generalize the tag system
All tags now share the same index space, I don't see a reason why we should have separate spaces for these.

I also made diamond powerful if encased in gold/silver
2025-04-20 17:43:24 +02:00
IntegratedQuantum
4286455915 Implement basic modifier restrictions with an example for diamond.
Still needs tooltips and item tags to be more useful
2025-04-20 13:57:05 +02:00
Carrie
332e9f57f0
Add silver ore (#1306)
* Add silver ore, ingot, block, lower gold ore

* Add recipes, make gold and silver ore values different
2025-04-16 12:36:26 +02:00
Carrie
d4e187e5af
Redistribute ores (#1304) 2025-04-14 09:27:54 +02:00
Carrie
da3ffce871
Big mushroom blocks (#1299)
* Add big mushroom blocks, tweak mushrooms to match

* Add mushroom branches, make glimmergill cap emissive, add recipes, material vals

* Tweak blockHealth
2025-04-13 16:50:23 +02:00
Carrie
871b635cae
Sulfur ore, block, and torches (#1287)
* Sulfur ore, block, and torches

* Tweak block health

* Add material values, brighten sulfur block
2025-04-13 16:45:05 +02:00
Carrie
747a2dc957
Add copper ore and make iron generate deeper (#1268)
* Add copper ore and redistribute ores

* Add copper recipes

* Revert ore redistrib, nerf copper
2025-04-04 17:32:15 +02:00
Krzysztof Wiśniewski
098115ad53
Block Entity Data (#1224)
* Implement VTable for entity data

* Make storage variable global

* Connect onInteract event

* Remove chest poc

* Revert "Remove chest poc"

This reverts commit 49759687dba180cbdf9609cfd942d2363991c4d5.

* Separate client and server callbacks

* Fix formatting issues

* Apply review requests

* Add assert and todo

* Apply review requests

* Remove chest textures

* Fix plenty of bugs in implementation

* Update src/entity_data.zig

Co-authored-by: IntegratedQuantum <43880493+IntegratedQuantum@users.noreply.github.com>

* Update src/entity_data.zig

Co-authored-by: IntegratedQuantum <43880493+IntegratedQuantum@users.noreply.github.com>

* Do not trigger onInteract while shifting

* Apply review requests

* Apply review change requests

* Update src/game.zig

Co-authored-by: IntegratedQuantum <43880493+IntegratedQuantum@users.noreply.github.com>

---------

Co-authored-by: IntegratedQuantum <43880493+IntegratedQuantum@users.noreply.github.com>
2025-03-31 20:07:31 +02:00
IntegratedQuantum
1b7102768f Remove the time from itemdrop rendering.
This was used for animated textures which isn't necessary anymore.
2025-03-30 12:13:15 +02:00
Carrie
8d54e187cf
Convert leaf piles into texturePiles (#1242)
* Convert leaf piles to texturePiles, add to biomes, reduce break time

* Fix rotation name, tweak yellow leaf pile texture, delete unused leaf pile textures
2025-03-28 19:57:19 +01:00
Carrie
dc902b3909
Add chest textures (#1245) 2025-03-27 16:41:28 +01:00
ikabod-kee
ce750dbe77
Added Duckweed (#1247) 2025-03-27 16:15:30 +01:00
IntegratedQuantum
005fb6a3aa Fix missing newline 2025-03-24 20:38:58 +01:00
Krzysztof Wiśniewski
f5a2e3d3c1
Revert "Remove sbb blocks" (#1226)
This reverts commit 65cee0ef1202b3a85f9ac2799dc0f6b902fa4074.
2025-03-24 19:11:10 +01:00
IntegratedQuantum
42268c4b22 Allow branches to have a shell model that's always rendered and add leafy branches for all wood types. 2025-03-23 20:21:37 +01:00
Carrie
8f0693f7b0
Lily pads / adjust water reflectivity (#1221)
* Add lily pads and reduce water reflectivity

* tweka water reflectivity
2025-03-23 19:36:31 +01:00
Krzysztof Wiśniewski
07f5d823dd
Add pile rotation mode (#1216)
* Add pile rotation mode

* Fix formatting issues

* Rename to .zig.zon

* Update textures to those provided by ikabood-kee

* Add gradual block breaking

* Adapt to new model and texture changes

* New duckweed textures

* Add configurable state count

* Rename to texturePile

* Add moreData storage

* Apply review suggestions

---------

Co-authored-by: Carrie <carriecapp9@gmail.com>
2025-03-23 19:35:38 +01:00
Zachary Hall
20dfc6ba71
Add hunger, hunger bar, and related functions on the Player struct. (#1210)
* Add hunger and hunger bar
 - New functions added to Player struct in game.zig to use and heal hunger.
 - If an attempt is made to use more hunger than there is available, the player is killed.
 - Hunger bar uses placeholder icons.
 - Hunger bar is based on the health bar
 -  Hunger bar is anchored to the left of the hotbar, rather than the right like the health bar.

* Don't kill player when hunger runs out.
- Don't use hunger when there's not enough to use
- Allow for code to know if hunger was used, so that is can handle not having enough hunger.

* New hunger textures

* Desaturate the highlight a little

* Return true if hunger was already true.

* Fix formatting

* Rename hunger to energy, and fix other issues.

* Make energy synchronized between client and server

Also removes the functions that add/remove energy on the game.Player struct

* Run formatter

* Fix incorrect formatting by formatter.

* Remove AddHunger struct and addHunger function

 - Keep base operation so things like accessories and food can use it when syncing

* Fix formatting again.

---------

Co-authored-by: Carrie <carriecapp9@gmail.com>
2025-03-23 17:06:21 +01:00
IntegratedQuantum
1268f8e95e Allow specifying all 16 model textures via its index
fixes #1144
2025-03-22 14:26:59 +01:00
Carrie
302544bbcb
Add cactus flowers, tussock, and cactus top texture (#1195)
* Add cactus flowers, tussock, and cactus top texture

* minor cactus flower texture tweaks

* Gradient cactus flower
2025-03-19 21:45:12 +01:00
IntegratedQuantum
6f26dde472 keepOriginal is now specified in the biome and can be used for subbiomes.
fixes #1135
2025-03-17 21:30:08 +01:00
Carrie
32269f1f84
New branch textures (#1200)
* Birch branch and start of mahogany branch textures

* Do all the other ones and tweka mahogany
2025-03-13 20:59:22 +01:00
OneAvargeCoder193
35fedba2c6
Change branches so that the textures can be rotated (#1183)
* add pipes, which are like branches but you can have different textures on each mode

* fix formatting

* remove testing block

* fix more formatting issues

* fix more formatting issues

* simplify fromRelPos

* fix fromRelPos and give pipe same properties as branch

* fix flashing dots caused by floating point inaccuracies

* remove debug object

* fix formatting issues

* fix a couple things

* remove debug textures

* fix formatting and also make dir an enum

* fix more formatting issues

* remove branches

* rename pipe to branch

* remove floating point fix

* remove branch model

* Add back branches and add temporary textures

* add back the branches

* fix some stuff

* small changes

* fix compiler error

---------

Co-authored-by: Carrie <carriecapp9@gmail.com>
2025-03-12 18:27:28 +01:00
Carrie
3c7231cb43
Darken grass plants for better contrast (#1182)
* Make grass plants darker for better contrast

* Make grass plants blend into grass blocks
2025-03-09 12:57:38 +01:00
IntegratedQuantum
b303244773
Run the zon format check with our zig fmt (#1175)
* Format all the zon assets to prepare for running the the format check with our zig fmt

* Update ci.yml

* Remove zon files from the old formatter

* Add a formatting violation to test the CI

* Undo the check
2025-03-07 22:34:55 +01:00
ikabod-kee
5a9e537ed4
Birch, Thin Birch + Rare Chopped Forests (#1170)
* A

* Added Thin Birch Biome

* Density

* Changes

* Changes 2
2025-03-07 22:08:38 +01:00
Carrie
f9c5e4bb98
Glimmergills and Glimmergill caves (#1174)
* Add glimmergills and glimmergill caves

* Lower glimmergill cave height

* Formatting
2025-03-07 22:07:44 +01:00
Carrie
81bb084997
Branches for all wood types + item textures and recipes (#1149)
* Add all branch variants, item textures, recipes

* Delete unused textures

* Fix indentation
2025-03-06 21:32:39 +01:00
Carrie
b497133967
Mushrooms: Bolete and Toadstool (#1165)
* Add bolete and toadstool

* Add item textures and add to biomes
2025-03-06 20:34:47 +01:00