324 Commits

Author SHA1 Message Date
791f6bf4c3 Bunch of edits. 2025-06-09 20:50:23 -05:00
54eb43044d Finalize Pause menu and setup of settings menu. 2025-04-12 16:32:14 -04:00
6f0d7d734f Added functionality to PauseMenu, other various edits. 2025-04-10 14:57:22 -05:00
35298ec28d Putting together PauseMenu functionality. 2025-04-10 13:58:51 -04:00
1cbed8ce7f Pause Menu Visual Design Revision 1 2025-04-09 04:36:16 -05:00
79d8720282 More Pause Menu Boilerplate 2025-04-09 04:09:55 -05:00
c40c7c3cdf Merge pull request 'Various edits going live.' (#56) from edits into master
Reviewed-on: #56
2025-04-08 14:59:55 -04:00
f154c256d8 Wacky error where std::optional was not included, and it caused a problem for builds on another platform. 2025-04-08 14:57:10 -04:00
c5109c2c1b Implement basis for Pause Menu. 2025-04-07 15:17:52 -05:00
ab0fd9455c More Edits 2025-04-07 14:30:30 -04:00
b7b06cd48b Assets 2025-04-03 13:35:09 -04:00
f9e4f93aaa Add TODO notes for tile lighting stuff coming soon. 2025-04-02 15:27:58 -05:00
f82157d240 Various Edits 2025-04-01 18:57:01 -04:00
b10d1e30dc Command additions and minor fixes 2025-03-31 16:38:12 -04:00
e748bf95ae Upgrade to latest JUI with bug fixes 2025-03-31 16:37:58 -04:00
28dda7d12d Place gravel. 2025-03-31 16:37:45 -04:00
15d816f04f Added custom movement code for when player is noclipping. 2025-03-31 16:37:31 -04:00
d9d8f7f3a2 Adjusted tile pallets, added gravel. 2025-03-31 16:37:07 -04:00
0ee1ef5592 Parse tile 'solid' from json 2025-03-31 16:36:36 -04:00
0d7306b9ae Cleanup LocalWorld 2025-03-31 16:36:21 -04:00
d55a64163b Add GameSession::GetLocalPlayerEntity 2025-03-31 16:36:04 -04:00
c7f98a1be6 Add noclip member to entity 2025-03-31 16:35:44 -04:00
4538aa963b Update LocalWorld.cpp
cleanup
2025-03-29 16:54:00 -04:00
60dbd6d725 Decently-well working, doing some profiling currently. 2025-03-29 14:31:57 -04:00
5cd84258d8 Adding More Tile Functions (Non-building commit). 2025-03-28 01:26:31 -04:00
6e9224ead6 Add Tile Functions 2025-03-27 23:35:52 -04:00
1a09845770 Fixed a silly, got it working. 2025-03-27 18:18:11 -04:00
f94c8b8e72 Segfault on usage of std::function from ticc_funcs. 2025-03-27 17:44:21 -04:00
3dd9d65964 Now scoping out Item loading. 2025-03-22 15:31:58 -04:00
7d71f32d09 Refactoring tile loading procedure. 2025-03-22 15:07:50 -04:00
a53bc42a82 Re-enabling features: hotbar icons, name, plank pattern. 2025-03-22 14:07:43 -04:00
06ec0ca885 Make sure to manually reload cmake-build-debug after first build. 2025-03-22 13:53:10 -04:00
c9b037bf39 It works!!! All tiles are currently blue, and basically all tile features need to be re-implemented, however. 2025-03-22 13:39:12 -04:00
41749893a5 Few more edits for the night 2025-03-21 03:52:17 -05:00
79f77a4fcf Lots more partial progress on the data-driven refactoring. 2025-03-21 03:00:21 -05:00
e0367b971c Large Refactor, half-finished, will not compile or run currently. 2025-03-20 23:52:51 -04:00
dfb60a45c4 JSON tile metadata parse test, WIP. 2025-03-19 15:45:54 -04:00
9a10ff81d0 Building out container class, move classes to their own headers. 2025-03-19 15:45:42 -04:00
27f748ceca Include v2i_hash 2025-03-19 15:45:02 -04:00
6b37c03079 Move Vector2i custom hash to separate header file. 2025-03-19 15:44:44 -04:00
23fb2892a9 Put into namespace 2025-03-19 15:44:30 -04:00
50205fef99 Update jstick dependency 2025-03-19 15:44:16 -04:00
4553a0c8ac Add 'container w h' command 2025-03-19 15:44:00 -04:00
8072af2c49 Test Tile JSON data 2025-03-19 15:43:46 -04:00
d9de2502ea Fix data folder 2025-03-19 12:49:18 -04:00
83afdcaebc Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ClientApp/main.cpp
2025-03-19 12:48:26 -04:00
e6f67e1052 Fix data folder 2025-03-19 12:47:54 -04:00
2f19b910de Update main.cpp
Fix missing jjx include
2025-03-19 12:32:24 -04:00
13cc7f2104 Merge branch 'master' of https://git.redacted.cc/Josh/ReCaveGame 2025-03-19 11:47:26 -04:00
0dcb7d5a73 Update World.cpp
band-aid fix on chunk-server thread to prevent busy-waiting until we do it correctly with std::mutex & std::condition_variable.
2025-03-19 11:47:10 -04:00