Commit Graph

640 Commits (master)

Author SHA1 Message Date
Nicole Collings 0d97fdf779 Convert shaders to OpenGL 3.30 2019-09-08 11:26:07 -07:00
Nicole Collings 0a1989ad67 Remove Libraries from repository 2019-09-08 11:24:54 -07:00
Nicole Collings fc325c4c2f Try to statically compile GLEW 2019-09-04 14:21:38 -07:00
Nicole Collings 59044b8f66 Not-working userdata customization point think 2019-08-31 23:58:38 -07:00
Nicole Collings 27c17af114 Make Entity class use Model instead of Mesh 2019-08-30 17:45:22 -07:00
Nicole Collings 2070e45919 Merge remote-tracking branch 'origin/master' 2019-08-26 22:21:31 -07:00
Nicole Collings 7b77c4b07b Armature based bone animations and Assimp importer 2019-08-26 22:21:21 -07:00
Nicole Collings 88837f5a5a
Merge pull request #4 from Aurailus/imgbot
[ImgBot] Optimize images
2019-08-25 12:21:47 -07:00
ImgBotApp be6141a0f0
[ImgBot] Optimize images
*Total -- 5.99kb -> 5.83kb (2.71%)

/mods/default/textures/entity/player.png -- 4.50kb -> 4.34kb (3.53%)
/mods/default/textures/entity/rabbit.png -- 0.95kb -> 0.95kb (0.2%)
/mods/default/textures/entity/frog.png -- 0.53kb -> 0.53kb (0.18%)

Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>
2019-08-25 00:40:49 +00:00
Nicole Collings 94d20adb34 Merge remote-tracking branch 'origin/master' 2019-08-24 17:40:12 -07:00
Nicole Collings 7b9c2ab563 Replace ALL include guards with #pragma once 2019-08-24 17:39:35 -07:00
Nicole Collings 43cb70da4f Seperate Chunk, Entity, and GUI mesh related structures 2019-08-24 17:29:31 -07:00
Nicole Collings bae9ec39a3
Fix discord link in README 2019-08-21 15:38:47 -07:00
Nicole Collings fd33758917
Merge pull request #3 from Aurailus/imgbot
Accept ImgBot's optimizations
2019-08-20 02:57:14 -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 a92676fa67 Add the name property to ItemDef 2019-08-13 02:08:08 -07:00
Nicole Collings 05fae1f52c Cull some redundant files left behind from the last commit. 2019-08-13 01:52:45 -07:00
Nicole Collings 9113e6c4af Generify most definition classes, add preliminary item support. Pre-cull 2019-08-13 01:38:57 -07:00
Nicole Collings 4bd042fb72 Seperate blocks into their own lua files, move flowers into the flowers mod. 2019-08-10 14:54:44 -07:00
Nicole Collings cead4e705d Tweak some more Mapgen, add temp "water" block. 2019-08-10 14:21:13 -07:00
Nicole Collings e82ae10259 Improve MapGen 2019-08-08 00:29:12 -07:00
Nicole Collings f572fa8167 Refactor mod texture loading & mod directories, load textures over net. 2019-08-06 19:17:54 -07:00
Nicole Collings 2420706da6 Send mods over network. 2019-08-04 02:07:14 -07:00
Nicole Collings e637622aa8 Sandbox Lua files into ram, namespace them, parse conf.json, show_menu
* Lua show_menu function to show inventories. WIP
* Copy all lua mods & their files into a series of structs,
  stored in LuaMod, LuaModFile, and LuaModConfig classes.
* Sandbox SandboxedDoFile further by making it only open LuaModFiles
* Recursive mod searching which identifies conf.json as a mod root
* Read conf.json for name, description, version, and dependencies
* Organize mods to load in order of their dependencies
2019-08-03 18:18:05 -07:00
Nicole Collings d0ae343543 Update the inventory - fix the size of inventory boxes. 2019-08-01 02:19:57 -07:00
Nicole Collings 8c2c842373 Inventory Test - New Art assets & Game Scene GUI
* New tool textures
* Net material textures
2019-07-31 22:42:07 -07:00
Nicole Collings 9885744c94 Finish moving existing GUI elements to new system 2019-07-28 02:07:36 -07:00
Nicole Collings ec4d198229 Menus Part 1 - Refactored TextEntity class to GUIText class.
- Move MenuScene and ConnectScene elements to new GUI Components
2019-07-27 23:51:29 -07:00
Nicole Collings 4db2351408 Menus Part 1 - Refactored TextureRect class to GUIRect class.
- Made mouse not lock immediately upon game opening.
2019-07-27 13:19:23 -07:00
Nicole Collings 758054fa17 Finish final 3 Codacy bugfixes. 2019-07-24 18:00:28 -07:00
Nicole Collings 13a42d55d0 Add helper function do display IP addresses in string form. 2019-07-24 12:33:26 -07:00
Nicole Collings 9dd2764aa0 Optimize MeshGenStream's logic 2019-07-24 00:55:18 -07:00
Nicole Collings f413b06138
Update README.md 2019-07-24 00:25:41 -07:00
Nicole Collings f603161afa
Update README.md 2019-07-24 00:16:34 -07:00
Nicole Collings 15e9b15f9f
Update README.md 2019-07-24 00:08:47 -07:00
Nicole Collings 044338981c
Update README.md 2019-07-24 00:07:35 -07:00
Nicole Collings 580f93b99a
Fix some info 2019-07-24 00:06:20 -07:00
Nicole Collings 137c5e0a4b
Add a commit frequency badge 2019-07-24 00:02:56 -07:00
Nicole Collings c3d6c9ad83
Add discord badge to readme 2019-07-23 23:57:06 -07:00
Nicole Collings 7ac21a60ef Merge remote-tracking branch 'origin/master' 2019-07-23 23:26:06 -07:00
Nicole Collings 7bdb99b51e Codacy "Code Style" bugfixes. 2019-07-23 23:25:38 -07:00
Nicole Collings 427fef04c9 Codacy "Security" bugfixes. 2019-07-23 22:25:13 -07:00
Nicole Collings 50dae1a828 Codacy "Performance" bugfixes. 2019-07-23 22:13:56 -07:00
Nicole Collings e8dae4c526 Codacy "Error Prone" bugfixes. 2019-07-23 22:09:13 -07:00
Nicole Collings a314dd131e
Merge pull request #2 from codacy-badger/codacy-badge
Add a Codacy badge to README.md
2019-07-23 20:37:00 -07:00
The Codacy Badger 588f82e1b8 Add Codacy badge 2019-07-24 03:33:59 +00:00
Nicole Collings eb66677a0b More Codacy bugfixes. 2019-07-23 20:31:39 -07:00
Nicole Collings 7b821d7b4a Hopefully fix a long standing memory leak with MeshGenStream 2019-07-23 20:02:37 -07:00