Commit Graph

91 Commits (master)

Author SHA1 Message Date
Nicole Collings a59e1d2a82 Various shit. 2020-04-06 17:18:57 -07:00
Nicole Collings 4febca7ef8 Lua Defined structures - WIP, New UI Library, move Base from mods~
Refactor GUIBuilder and MenuSandbox
Added outlined textures
2020-03-25 18:27:05 -07:00
Nicole Collings c1dc594d54 SSEs will get deleted when deleted on the server, ortho model shading.
* register_on supports place & break, not after_* yet
* fixed a potential segfault loading an invalid mod
* added @aurailus:item_collection, converted `drop` params to `yields`
2020-02-28 13:03:19 -08:00
Nicole Collings cc7163d61b Add clamping support to the ortho shader
* Biome tint leaves, tweak fluff texture to be less dense
2020-02-21 00:07:13 -08:00
Nicole Collings dad2f216fa Implement blend masking, fix block_foliage model hack. 2020-02-12 16:16:10 -08:00
Nicole Collings 7ba58799e9 Uproot GuiVertex, GuiMesh, GuiEntity, use generic entities.
* Add update method to GUIComponent
* Cursory 'model' GUIType support.
* Fix zeus:default/entity/bee.venus
2020-02-11 16:54:20 -08:00
Nicole Collings 7c54de84fa Clean up the Register* functions, make them all one header file
* Reorganize src/lua
* Add `environment` table to Biome Definitions
2020-01-10 14:58:46 -08:00
Nicole Collings 87eaf4058b Lua Entities can be registered on server side, don't transfer yet. 2019-12-28 20:40:29 -08:00
Nicole Collings bce33e9bc5 Inventory can have blocks in it! GuiShader supports 3d models.
* Increased contrast in plant_twine.png & plant_fibre.png
2019-12-18 17:12:34 -08:00
Nicole Collings 6830c4adc4 Lua Inventory API
* Split inventory mod into zeus:inventory
* Redo inventory textures
* Add more textures and items to zeus:materials
* Convert zepha.is_server() to zepha.server & zepha.client bools
2019-12-17 17:26:48 -08:00
Nicole Collings 532a0c3255 Add safeties to subgame indexing & menu mod loading.
* TextureAtlas loadDirectory function can be recursive.
* Re-implement GameGui showMenu.
2019-12-13 00:54:17 -08:00
Nicole Collings 3824b06061 Lua button callbacks, menu start_game API 2019-12-12 16:42:46 -08:00
Nicole Collings 3aaf649c42 Refactor bottom bar, dynamically search for subgames. 2019-12-11 21:38:20 -08:00
Nicole Collings 4d10fe826a Merge remote-tracking branch 'origin/master'
# Conflicts:
#	assets/textures/menu_flag_multiplayer.png
2019-12-11 14:20:58 -08:00
Nicole Collings 407d35c210 GUIImageButton class 2019-12-11 14:20:40 -08:00
ImgBotApp 336fa50566
[ImgBot] Optimize images
*Total -- 4.94kb -> 4.29kb (13.14%)

/assets/textures/menu_flag_settings.png -- 1.26kb -> 0.95kb (24.61%)
/assets/textures/menu_flag_quit.png -- 1.21kb -> 1.04kb (14.16%)
/assets/textures/menu_flag_content.png -- 1.22kb -> 1.12kb (8.31%)
/assets/textures/menu_flag_multiplayer.png -- 1.24kb -> 1.17kb (5.21%)

Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>
2019-12-11 08:42:37 +00:00
Nicole Collings bac6403425 `crop` texture modifier, UI flag hover textures. 2019-12-11 00:41:46 -08:00
ImgBotApp 83a6332e9b
[ImgBot] Optimize images
*Total -- 65.81kb -> 60.60kb (7.92%)

/assets/textures/subgame_flag_settings.png -- 0.78kb -> 0.68kb (12.38%)
/assets/textures/menu_flag_settings.png -- 0.77kb -> 0.68kb (11.04%)
/assets/textures/zeus_background.png -- 60.86kb -> 55.90kb (8.14%)
/assets/textures/menu_flag_quit.png -- 0.72kb -> 0.70kb (2.18%)
/assets/textures/zeus_logo.png -- 2.68kb -> 2.62kb (2.08%)

Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>
2019-12-10 22:41:15 +00:00
Nicole Collings f3e8196275 Add art assets to repo 2019-12-10 14:40:04 -08:00
Nicole Collings af8fb9c5a3 Biome tinting, client side biome data 2019-11-18 23:03:51 -08:00
Nicole Collings 737a7da74f Make Dropped Items zoop into player when theyr're close enough.
* Set loadfile to nil
2019-11-12 01:15:06 -08:00
Nicole Collings 8272aac9c1 GUIInventoryItems and GUIInventoryLists 2019-10-29 19:21:50 -07:00
Nicole Collings e57f99b9c4 Register Entity & Add Entity API Functions.
- LuaEntity Usertype
- Entities with dynamic models
- Lua functionality for setting ItemDef models (Blocks and Items)
- Move interp functions to int_, make set_ immediate.
- Tweak SSAO Shader
2019-10-05 00:53:37 -07:00
Nicole Collings 55595c6ecf Item Models 2019-10-02 16:26:48 -07:00
Nicole Collings 009d2f38ee Clear the gBuffer properly! 2019-09-28 16:55:32 -07:00
Nicole Collings 2bea0a34c6 Clean up Renderer class. 2019-09-25 23:30:42 -07:00
Nicole Collings 4c00f88963 Abstract SSAO Logic into *Shader classes 2019-09-24 23:39:12 -07:00
Nicole Collings 894cd18e8b Make set(int loc, ...) functions on the Shader. 2019-09-24 16:48:08 -07:00
Nicole Collings 40c46d8316 Visible (buggy) SSAO 2019-09-13 16:15:46 -07:00
Nicole Collings 35ad9f95a9 Better SSAO 2019-09-13 14:36:10 -07:00
Nicole Collings b12a3dc5a1 Function SSAO 2019-09-13 14:24:54 -07:00
Nicole Collings 6ee9a3cb3c Reimplement swaying leaves & grass with version 3.30 shaders.
* Move SOL_ALL_SAFETIES_ON to CMake target_compile_definitions.
2019-09-08 12:33:33 -07:00
Nicole Collings 0d97fdf779 Convert shaders to OpenGL 3.30 2019-09-08 11:26:07 -07:00
Nicole Collings 27c17af114 Make Entity class use Model instead of Mesh 2019-08-30 17:45:22 -07:00
Nicole Collings 7b77c4b07b Armature based bone animations and Assimp importer 2019-08-26 22:21:21 -07:00
Nicole Collings 94d20adb34 Merge remote-tracking branch 'origin/master' 2019-08-24 17:40:12 -07:00
Nicole Collings 43cb70da4f Seperate Chunk, Entity, and GUI mesh related structures 2019-08-24 17:29:31 -07:00
ImgBotApp b93c46ec11
[ImgBot] Optimize images
*Total -- 76.08kb -> 55.87kb (26.56%)

/mods/default/textures/leaves_puff.png -- 2.27kb -> 0.87kb (61.66%)
/mods/default/textures/unimplemented/acacia_leaves_opaque.png -- 0.82kb -> 0.45kb (45.66%)
/mods/default/textures/unimplemented/pine_leaves_puff.png -- 1.25kb -> 0.72kb (42.2%)
/mods/default/textures/unimplemented/acacia_leaves.png -- 0.84kb -> 0.49kb (41.72%)
/mods/default/textures/unimplemented/pine_leaves_opaque.png -- 0.77kb -> 0.46kb (39.92%)
/mods/default/textures/unimplemented/pine_leaves.png -- 0.73kb -> 0.46kb (37.13%)
/mods/default/textures/unimplemented/jungle_grass.png -- 1.02kb -> 0.64kb (37.02%)
/mods/default/textures/unimplemented/jungle_leaves.png -- 0.76kb -> 0.48kb (36.69%)
/mods/default/textures/unimplemented/jungle_leaves_opaque.png -- 0.72kb -> 0.47kb (35.31%)
/mods/default/textures/unimplemented/oak_leaves_opaque.png -- 0.64kb -> 0.42kb (34.2%)
/assets/textures/container.png -- 20.22kb -> 13.81kb (31.72%)
/assets/textures/inventory.png -- 20.20kb -> 13.81kb (31.66%)
/assets/textures/font.png -- 1.29kb -> 0.93kb (27.86%)
/mods/default/textures/unimplemented/aspen_leaves.png -- 0.91kb -> 0.70kb (22.77%)
/mods/default/textures/brick.png -- 0.66kb -> 0.51kb (22.59%)
/mods/default/textures/unimplemented/aspen_log_top.png -- 0.84kb -> 0.65kb (21.82%)
/mods/default/textures/unimplemented/desert_stone.png -- 0.68kb -> 0.54kb (21.14%)
/mods/default/textures/sand.png -- 0.77kb -> 0.62kb (19.7%)
/mods/default/textures/unimplemented/acacia_bush_stem.png -- 0.59kb -> 0.48kb (18.45%)
/mods/flowers/textures/lilypad_flower.png -- 0.63kb -> 0.52kb (17.24%)
/mods/flowers/textures/lilypad.png -- 0.71kb -> 0.59kb (16.12%)
/mods/materials/textures/rock.png -- 0.54kb -> 0.46kb (15.27%)
/mods/materials/textures/flint.png -- 0.53kb -> 0.46kb (13.1%)
/mods/default/textures/unimplemented/acacia_log_top.png -- 0.84kb -> 0.73kb (12.84%)
/mods/default/textures/unimplemented/pine_log_top.png -- 0.78kb -> 0.69kb (11.43%)
/mods/default/textures/unimplemented/jungle_tree_side.png -- 0.62kb -> 0.56kb (10.34%)
/mods/default/textures/stone.png -- 0.76kb -> 0.69kb (9.24%)
/mods/default/textures/unimplemented/desert_cobblestone.png -- 0.73kb -> 0.66kb (8.85%)
/mods/default/textures/unimplemented/jungle_tree_top.png -- 0.70kb -> 0.64kb (8.36%)
/assets/textures/inventory_wheel.png -- 3.65kb -> 3.36kb (8.04%)
/assets/textures/player_front.png -- 1.12kb -> 1.03kb (7.88%)
/assets/textures/viginette.png -- 4.65kb -> 4.31kb (7.27%)
/assets/textures/inventory_wheel_slot.png -- 2.20kb -> 2.06kb (6.52%)
/mods/flowers/textures/viola.png -- 0.51kb -> 0.48kb (5.94%)
/mods/default/textures/tallgrass_5.png -- 0.49kb -> 0.48kb (1.41%)
/mods/default/textures/unimplemented/aspen_planks.png -- 0.66kb -> 0.65kb (0.89%)

Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>
2019-08-16 22:32:58 +00:00
Nicole Collings 1bc66e4d60 Fix multiplayer crash on server 2019-08-14 01:54:51 -07:00
Nicole Collings 3002cfd9aa New font, fix font kerning, implement blend color & font color. 2019-08-13 20:30:46 -07:00
Nicole Collings f572fa8167 Refactor mod texture loading & mod directories, load textures over net. 2019-08-06 19:17:54 -07:00