Commit Graph

107 Commits (0a8aac2325e0256cd31557eba268fa29e76d1c73)

Author SHA1 Message Date
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
Sara 61f9de5256 remove mouse listener min delta param 2023-04-20 22:57:51 +02:00
Sara fb6b76f0cf removed add_*_listener return types / added scroll input event type 2023-04-20 22:57:10 +02:00
Sara 85182ed22c added more by-name asset lookup options 2023-04-20 22:55:05 +02:00
Sara 6c46754e35 added ibm plex mono regular 2023-04-20 22:54:33 +02:00
Sara 37dd03a5bb removed old tilemap ase file 2023-04-20 10:12:29 +02:00
Sara 38ceb9275d added button image for nineslicing 2023-04-20 10:11:18 +02:00
Sara 2777969bdb started keeping a todolist 2023-04-20 10:11:00 +02:00
Sara 6d27dd4c12 added font file and arbitrary memory asset types 2023-04-20 10:10:27 +02:00
Sara bd5481dd93 modified testing tilemap 2023-04-11 08:12:11 +02:00
Sara 6fc06012b6 updated ui input function 2023-04-11 08:11:56 +02:00
Sara 8d644c6d4c reordered spritesheet loading to be more userfriendly 2023-04-11 08:11:21 +02:00
Sara c22c090c42 increased default tilemap size to 128 2023-04-11 08:10:46 +02:00
Sara 783c545244 increased max drawcmd count 2023-04-11 08:08:59 +02:00
Sara 3196f8dacc renamed project in CMake 2023-04-11 08:08:38 +02:00
Sara 89cc8b9969 fixed out of bounds write in load_tilemap 2023-04-11 08:07:26 +02:00
Sara 34593e0701 added comments to render-related structs 2023-04-10 16:57:59 +02:00
Sara 9dbb5a1566 further fixes to render ordering 2023-04-10 16:57:45 +02:00
Sara 3e8eef4200 added debug render frame flag 2023-04-10 16:57:09 +02:00
Sara 96ffaf5f9e added ui layers and made all layers relative to sprites at zero 2023-04-10 16:56:30 +02:00
Sara 4b080adfde added more controls and generalized tile previews 2023-04-10 16:55:33 +02:00
Sara f4ccfd43a7 removed draw_ functions and replaced with just update_ 2023-04-10 16:54:05 +02:00
Sara 94d39e2913 reworked tileset 2023-04-10 16:53:23 +02:00
Sara c9c5cf4935 fixed bad condition causing incorrect ordering on ui 2023-04-10 13:27:12 +02:00
Sara 307732dd05 new tilemap 2023-04-10 00:15:37 +02:00
Sara e6a011c12b got my shit in order regarding tilemaps 2023-04-10 00:14:53 +02:00
Sara 544e604349 updated includes 2023-04-08 00:26:52 +02:00