Commit Graph

504 Commits (ad029752ef5ef4f2e4a24ba8dd13520b51829ab4)

Author SHA1 Message Date
Jordan Snelling 9aa94e0b12 Fix Windows build 2: electric boogaloo 2019-11-04 15:28:20 +00:00
Nicole Collings ae286f84eb New inventory format and inventory parsing algorithm in GameGui. 2019-11-04 00:43:12 -08:00
Nicole Collings 3d5b705031 Double World Gen Queue size 2019-11-02 17:01:11 -07:00
Nicole Collings 88ecf13e2c Fix Assimp compilation 2019-11-02 17:00:50 -07:00
Nicole Collings 7cbbd6fed2 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/game/Client.cpp
2019-11-02 16:46:52 -07:00
Nicole Collings 642ae87930
Merge pull request #7 from Jordach/master
Fix Windows Build
2019-11-02 16:45:37 -07:00
Nicole Collings 352caaa268 Fix compilation on Linux 2019-11-02 16:27:13 -07:00
Nicole Collings 2d5aa93f38 Find GLEW_LIB on Unix 2019-11-02 15:58:25 -07:00
Nicole Collings 79b5430239 Merge branch 'master' of https://github.com/Jordach/Zeus_cpp
 Conflicts:
	CMakeLists.txt
2019-11-02 15:57:33 -07:00
Nicole Collings 69c3080125 Find GLEW_LIB on Unix 2019-11-02 15:56:20 -07:00
Jordan Snelling 086deeb773 Use improvements to allow for Linux compilation and Win64 compilation 2019-10-31 23:11:00 +00:00
Nicole Collings d50357badb Re-enable --mode=local command line argument with LocalServerInstance 2019-10-31 14:07:53 -07:00
Jordan Snelling e25cd710ae Complete Windows building documentation 2019-10-31 16:45:46 +00:00
Jordan Snelling 6c06d0ba8d Fix Windows x64 builds 2019-10-31 01:14:17 +00:00
Nicole Collings c6418540b3 Lua Vector Library in base
* math.round function
2019-10-30 15:46:40 -07:00
Nicole Collings 30221bd611 Right align Item Counts 2019-10-30 14:20:53 -07:00
Nicole Collings 0dc932acdf InventoryList, ItemStack, GUIInventoryList shows InventoryList contents. 2019-10-29 23:41:25 -07:00
Nicole Collings d134eb089f Optimize GUIText setText method. Reserve and don't temp construct. 2019-10-29 20:36:46 -07:00
Nicole Collings ba3770aa21 Clean up Player Class some more, Fix Wireframe, new PointedThing class.
* Refactor PointedThing class to be cleaner and support pointing at nil.
* Convert Dir into an enum class
2019-10-29 20:06:55 -07:00
Nicole Collings 8272aac9c1 GUIInventoryItems and GUIInventoryLists 2019-10-29 19:21:50 -07:00
Nicole Collings 2537b629ec Optimize the hell out of Player::findSelectedBlock 2019-10-29 00:50:19 -07:00
Nicole Collings 2fd5d7d140 Abstract Player collision logic into Collidable class.
* Optimize movement code and clean up Player logic.
* Fix zeus:default:dropped_item display_object
2019-10-29 00:31:00 -07:00
Nicole Collings a8547ab661 Make serializer ISO C++17 Compliant, Disable logging color codes on Win. 2019-10-27 19:37:40 -07:00
Nicole Collings c48f0a4427 Player set_selected_block property.
* Tweak grass sway perlin noise.
2019-10-27 19:37:11 -07:00
Nicole Collings c57b01b6e7 REALLY Fix dropped item namespaces. 2019-10-27 17:52:12 -07:00
Nicole Collings b4aafe3cef Fix dropped item namespaces. 2019-10-27 17:29:53 -07:00
Nicole Collings 2a99b7c6c9 Give Player control over GameGui, unlock mouse when in menu. 2019-10-24 20:16:39 -07:00
Nicole Collings 3a609737fe Make API throw error if registered_* isn't within mod namespace.
- Update mods to use their proper namespace.
- Fix a segfault in the RegisterBlocks function related to models.
- Seperate base blockmodels into a mod called `base`.
- Mod named `base` always loads first.
2019-10-24 18:29:21 -07:00
Nicole Collings 26904f2cfe Make API throw error if registered_* isn't within mod namespace.
- Update mods to use their proper namespace.
- Fix a segfault in the RegisterBlocks function related to models.
- Seperate base blockmodels into a mod called `base`.
- Mod named `base` always loads first.
2019-10-24 18:29:02 -07:00
Nicole Collings eaf379faa8 LuaPlayer Usertype & Bindings 2019-10-23 23:34:30 -07:00
Nicole Collings 098e5ff86d Make PlayerEntities use the Player model. 2019-10-19 14:03:07 -07:00
Nicole Collings be60f1ed4d Lua Keypress Events! 2019-10-15 00:40:16 -07:00
Nicole Collings fff712318d *Somebody* broke the bone weights.. *cough cough* 2019-10-13 22:53:34 -07:00
Nicole Collings 7ce536aea9 Broken bone based animation 2019-10-13 22:40:50 -07:00
Nicole Collings 6d5fbcb5c4 Run LuaEntity update func, Optimize remove_entity, core.__builtin table.
- Fix a bug that was causing the server to infinitely freeze up.
2019-10-11 15:13:46 -07:00
Nicole Collings c576e0c58f Move Lua Entities to Dimension, add remove_entity command. 2019-10-11 01:10:18 -07:00
Nicole Collings e2e4e3010b Resolve a bunch of CLion warnings. 2019-10-10 23:36:45 -07:00
Nicole Collings 659c63388a Local Blitz3D Models from mod /models/ directories, send over network.
- LuaEntities can now use .b3d models.
- GameObject (Block & CraftItem) models are now cached.
2019-10-10 19:55:49 -07:00
Nicole Collings 003c46ca9a Add new player model, tweak MeshGenStream variables. 2019-10-09 13:46:53 -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 60e2d9ea4e DebugGui Shows items. 2019-10-02 00:16:49 -07:00
Nicole Collings 5cb208d6fc register_item and CraftItemDef 2019-10-01 23:54:11 -07:00
Nicole Collings b0d9676f99 Commit Shelved Changes related to previous commit. 2019-10-01 16:36:42 -07:00
Nicole Collings 7d57b7d487 Seperate Dimension into ClientDimension and ServerDimension
- Experiment with lowdef rendering
- BlockModel::createCube function
- Tweak the number of threads the helper processes get
- Fix DebugGui Mesh Updates
- Optimize BlockChunk class
- Moved Mesh Generation code to LocalDimension
2019-10-01 16:33:04 -07:00
Nicole Collings 0d1cdfb724 Move Rendering the world to Dimension 2019-09-29 23:17:34 -07:00
Nicole Collings 2ad700b63d Dimension class work 2019-09-29 22:17:05 -07:00
Nicole Collings 3946d50f73 Temp 2019-09-29 22:13:15 -07:00
Nicole Collings a5d23ea036 Merge remote-tracking branch 'origin/master' 2019-09-28 16:55:38 -07:00
Nicole Collings 009d2f38ee Clear the gBuffer properly! 2019-09-28 16:55:32 -07:00