Sara
/
basic-game-framework
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity
198 Commits
2 Branches
0 Tags
583 KiB
Commit Graph

198 Commits (092adc18aa6cb6045d339b09ff230df175938cf8)

Author SHA1 Message Date
Sara 092adc18aa Merge branch 'development' into fixed-indenting 2023-07-17 14:48:49 +00:00
Sara a741f3c473 Merge pull request 'Don't require a ':' character after every key in scene files' (#19) from dont-require-colon-in-scene into development 
Reviewed-on: #19
 2023-07-17 14:48:07 +00:00
Sara bbfedc727a Merge branch 'development' into dont-require-colon-in-scene 2023-07-17 14:48:00 +00:00
Sara 8915e57f9d fixed indenting style to fit new requirements 
now using expanded (space) 4-wide tabs
 2023-07-17 16:44:10 +02:00
Sara 56956f9330 _parse_key will now return 1 if the key DOES have arguments 2023-07-17 00:43:50 +02:00
Sara 3dd5b82cb0 parse_key now detects if the key has arguments or not, parse config will not parse nonexistent values 2023-07-17 00:41:15 +02:00
Sara 1ae19b5d04 adjusted _parse_key to also allow for configs without arguments 2023-07-17 00:38:49 +02:00
Sara baf75c9c78 no longer requiring at least one colon in a scene config element 
This now allows for `player;` instead of requiring `player:;`
 2023-07-17 00:36:37 +02:00
Sara b025e81c54 Merge pull request 'key listeners are now only triggered if their value changed' (#18) from key-repeat-events into development 
Reviewed-on: #18
 2023-07-16 21:41:21 +00:00
Sara 3f5346b0e8 Merge branch 'development' into key-repeat-events 2023-07-16 21:41:15 +00:00
Sara 03a6b65603 Merge pull request 'fixed aabb aabb collision detection and solving' (#17) from broken-physics into development 
Reviewed-on: #17
 2023-07-16 21:40:44 +00:00
Sara 5ee5292e88 key listeners are now only triggered if their value changed 2023-07-16 23:38:36 +02:00
Sara 41f84bb52c reversed direction of aabb-aabb collision solver terms 2023-07-16 21:32:33 +02:00
Sara 5185f5062b solve_aabb_aabb now incorporates sprite position in all calculations 2023-07-16 21:23:59 +02:00
Sara 7950e45632 reordered terms in _rect_overlap 2023-07-16 21:14:44 +02:00
Sara 0dc35bd9d9 fixed typos and mismatched statements in aabb-aabb collision 2023-07-16 20:53:41 +02:00
Sara 763c43aed6 removed leftover debug log in scene 2023-07-16 18:58:30 +02:00
Sara 415a0d5c97 removed input_disconnect_all from load_scene_additive 2023-07-16 17:42:17 +02:00
Sara bd2e5cbcd0 loading a scene now disconnects all input 2023-07-16 17:40:55 +02:00
Sara 25feb8f95f added input_disconnect_all 2023-07-16 17:40:15 +02:00
Sara deeaad06e1 Merge pull request 'world-format' (#14) from world-format into main 
Reviewed-on: #14
 2023-07-16 11:56:37 +00:00
Sara 5b91584b00 Merge branch 'main' into world-format 2023-07-16 11:55:24 +00:00
Sara b387dee9c6 first whitespace of a line is now skipped when processing arguments 2023-07-16 13:46:53 +02:00
Sara 19401f1f47 added scene file validation 2023-07-16 13:33:47 +02:00
Sara 25c5f83fe4 added scene parsing 2023-07-16 02:23:15 +02:00
Sara 351c9ba713 removed undefined declaration of physics_update 2023-07-16 00:38:44 +02:00
Sara f9236e4182 moved definitions of INPUT_LISTENER_TYPE_T and input_listener_t to input.c 2023-07-16 00:38:36 +02:00
Sara f0d76713c2 renamed function delegates ending with _t to end with _fn 2023-07-16 00:38:06 +02:00
Sara 6085dbaed0 added scene.h 2023-07-16 00:31:20 +02:00
Sara 33c1a5e9d2 changed the way objects are notified of destruction, simplified game.c preset 2023-07-16 00:31:13 +02:00
Sara 14a81b0f2a removed preset initialization functions 2023-07-15 20:15:25 +02:00
Sara 30defc0db8 Merge pull request 'Allow the world to grow as required by the number of objects being spawned' (#12) from dynamic-size-world into main 
Reviewed-on: #12
 2023-07-12 00:53:04 +00:00
Sara ec50000130 un-negated uses of object_is_valid that shouldn't be, and negated ones that should be 2023-07-12 02:52:04 +02:00
Sara 0698121853 object_is_valid now confirms that an object is not null and is active 2023-07-12 02:49:36 +02:00
Sara 8a6a0e7493 physics.c: can_collide now checks for object_is_valid before comfirming other variables 2023-07-12 02:47:31 +02:00
Sara 78c0e3a9c0 object_is_valid now takes a constant pointer 2023-07-12 02:46:26 +02:00
Sara 59de57fe3a simplified error checking, out of memory now results in an immediate crash when trying to expand world 2023-07-12 02:44:21 +02:00
Sara 5e001bc345 object_is_valid now confirms if an object is valid, as opposed to if an object is invalid 2023-07-12 02:43:53 +02:00
Sara 3e3f322529 _find_free_object now returns the index of the found object / make_object now allocates the object if the found slot is NULL 2023-07-12 02:38:26 +02:00
Sara 30d4e4c39a replaced initialization code of _world_objects.objects with new_list 2023-07-12 02:29:33 +02:00
Sara a139e4f3bb now initializing newly expanded world space with nullptrs 2023-07-12 02:28:13 +02:00
Sara 6a52f2795d object_is_valid now does not attempt to validate internals if object is NULL 2023-07-12 02:25:32 +02:00
Sara d915047bd1 removed uses of world_num_objects from world.c and replaced them with _world_objects.num 2023-07-12 02:25:11 +02:00
Sara c1fa6e2956 now creating world array with 16 elements if world array length is 0 2023-07-12 02:19:32 +02:00
Sara 544f18e9c6 added error when failing to expand world 2023-07-12 02:16:05 +02:00
Sara e6b66884ec added expandable world objects array 2023-07-12 02:07:29 +02:00
Sara 3ed5755e52 physics.h no longer depends on g_objects being public, or WORLD_NUM_OBJECTS being constant 2023-07-12 02:07:08 +02:00
Sara a5c6a7eceb added objecadded object_is_valid 2023-07-12 02:06:40 +02:00
Sara 1eb8ab2fd9 WIP: world array is now an array of pointers to objects 2023-06-28 08:54:22 +02:00
Sara a18d5599b4 Merge remote-tracking branch 'origin' into dynamic-size-world 2023-06-28 08:52:35 +02:00