Commit Graph

183 Commits (0dc35bd9d9e771350512318b991af5fe9384bb2a)

Author SHA1 Message Date
Sara 44a4b6928c engine now uses displaymode to automatically start at desktop size 2023-05-11 21:09:49 +02:00
Sara 4d4547551c make_spritesheet now works with number of tiles on x and y rather than tile width and height 2023-05-11 21:09:23 +02:00
Sara 6fb60c254d renamed input_*down functions to input_get_*down 2023-05-11 21:08:13 +02:00
Sara 0a37a3278d renamed input_event to input_notify_event to clarify the function 2023-05-11 21:07:07 +02:00
Sara 22d0200d84 input internal variables and functions are now static and static inline respectively 2023-05-11 21:05:46 +02:00
Sara 664e4561a0 removed testing code from game.c and player.h/player.c' (#4) merge cleanup-testing-code into main
Reviewed-on: #4
removed all testing code and assets, as well as cleanup and organization
2023-05-11 17:52:39 +00:00
Sara 0894e9be27 removed todo file 2023-05-11 19:50:29 +02:00
Sara a6d63a1eef removed testing assets 2023-05-11 19:50:25 +02:00
Sara dfcc030f4d removed player.c and player.h
these were for testing anyway
2023-05-11 19:50:14 +02:00
Sara ce8cf1a0ea removed load_game() because of redundancy with start_game 2023-05-11 19:49:58 +02:00
Sara 1e184d43c7 world objects and input are now managed in engine.c rather than game.c 2023-05-11 19:49:40 +02:00
Sara f7696c4ea8 moved world functionality to corelib 2023-05-11 19:49:03 +02:00
Sara b72d4ef88a added better game world representation (#2)
Reviewed-on: Sara/sim-game#2
2023-05-08 10:17:28 +00:00
Sara 9f9cc446fe switched testing player controller to wasd (from arrows) 2023-05-07 17:55:22 +02:00
Sara 8f7792c673 removed all references of ui module
since this is now a separate branch/pr
2023-05-07 17:55:08 +02:00
Sara 0bdfba4d11 added -DCMAKE_EXPORT_COMPILE_COMMANDS to debug and release build scripts 2023-05-07 17:54:14 +02:00
Sara 2a2ea2c784 compile_commands.json is now ignored 2023-05-07 16:10:08 +02:00
Sara 1021d04013 fixed nan issue in player 2023-05-07 16:09:19 +02:00
Sara 1034fff697 removed compile_commands.json 2023-05-07 16:09:10 +02:00
Sara 7fc3439c9c removed breakpoint from debug script 2023-05-07 16:08:25 +02:00
Sara d28305920f added inline to static functions 2023-05-06 00:05:05 +02:00
Sara 76dbc26787 added breakpoint at main for debug 2023-05-06 00:01:56 +02:00
Sara a55bf84aef engine internal functions are now static inline 2023-05-05 23:27:08 +02:00
Sara 182cfc66cb added delta_time to engine.c 2023-05-05 23:26:30 +02:00
Sara cc08588b17 internal asset functions are now static 2023-05-05 23:23:41 +02:00
Sara 64b8dbcbf3 removed one use of memcpy and replaced with *a = *b 2023-05-05 23:23:04 +02:00
Sara 2457858399 changed many of the functions to now be static 2023-05-05 23:22:32 +02:00
Sara ee2dd74566 added updated game to test world 2023-05-05 23:20:38 +02:00
Sara 6afac70411 added player to test world 2023-05-05 23:20:23 +02:00
Sara 465551e981 replaced tilemap with world 2023-05-05 23:20:07 +02:00
Sara 851714810c changed to single build directory and now using debug and build sh scripts 2023-05-05 23:19:38 +02:00
Sara 3a4c037aa7 removed tilemap.csv 2023-05-05 23:18:11 +02:00
Sara f076c061b6 Merge remote-tracking branch 'origin/main' into worlds 2023-05-05 22:20:16 +02:00
Sara b898fd5b31 added return in guard clause for empty drawcmd buffer
draw(cmd) had a bug causing the first drawcmd in every frame to be added twice, for text this would cause a double free
2023-05-05 22:17:28 +02:00
Sara 2b927259a8 draw(cmd) is now no longer in declared in header 2023-05-05 22:14:30 +02:00
Sara 750b30aa89 no_sprite is now a #define for a all-zero sprite 2023-05-05 22:14:01 +02:00
Sara 5e082fde44 Merge pull request 'added rudimentary text render functions' (#1) from text-rendering into main
Reviewed-on: http://165.227.128.221:3000/Sara/sim-game/pulls/1
2023-04-26 06:39:14 +00:00
Sara 3a5ec4a0d1 finished basic text rendering 2023-04-26 00:34:11 +02:00
Sara 3c3c565bfa finished text scaling code 2023-04-23 00:47:49 +02:00
Sara 5686c17fee started work on text rendering 2023-04-21 00:27:05 +02:00
Sara 55311d0bb8 fixed translation issue with ninesliced images 2023-04-21 00:26:36 +02:00
Sara 38e6908dc3 added -lm arg to CMakeLists 2023-04-21 00:26:03 +02:00
Sara 4c4851546f now quitting sdl-ttf correctly 2023-04-21 00:25:28 +02:00
Sara a5d9d5ec96 updated font asset handling 2023-04-21 00:25:05 +02:00
Sara 57c507bb00 renamed font to ui_font 2023-04-21 00:23:12 +02:00
Sara e178dcd919 started keeping todo list 2023-04-20 23:04:21 +02:00
Sara dd40766fca added ninesliced and text rendering commands 2023-04-20 23:04:04 +02:00
Sara 70d6ca6571 updated tilemap 2023-04-20 23:00:36 +02:00
Sara d31c044d98 renamed tilemap.png to tileset.png 2023-04-20 23:00:10 +02:00
Sara b9d0d70e5a removed C++ dependencies and reverted tilemap, engine and game files to C source files 2023-04-20 22:59:34 +02:00