Commit Graph

16 Commits

Author SHA1 Message Date
theo3 c99408c849 merge + fix 2021-04-20 21:24:44 -07:00
octorock 58445541d2 Convert .inc files into .s files and include them in linker.ld 2021-03-24 23:42:47 +01:00
theo3 1c99c78d74 Merge 2021-03-22 01:27:45 -07:00
theo3 f0d610f385 fix entity.c search prototypes, add documentation 2021-03-21 22:04:04 -07:00
theo3 bd50d449de collapse TUs 2021-03-21 20:51:08 -07:00
notyourav 8b81269271 Merge branch 'master' into ply 2021-03-17 20:23:01 -07:00
theo3 af98f5f9a3 several more player functions done 2021-03-15 21:24:10 -07:00
Henny022p a563bfbc28 more cleanup 2021-03-15 23:40:11 +01:00
theo3 e251d79ffd quick fix 🙂 2021-03-13 01:14:46 -08:00
theo3 d9f7ad89ad resolve sfx calls 2021-02-28 20:56:06 -08:00
theo3 0aa3c18d08 more symbols 2021-02-28 15:07:06 -08:00
theo3 14cdc506c4 Merge remote-tracking branch 'upstream/master' into proxy_naming 2021-02-26 14:55:35 -08:00
theo3 cca3f69d18 tmp 2021-02-26 14:48:30 -08:00
theo3 31f324e3a7 clang-format pass and workflow 2021-02-19 15:11:40 -08:00
theo3 be1598afbb fileScreen.c OK 2021-02-03 17:38:27 -08:00
theo3 b9e07c1202 begin player.c and new nonmatching macro
merge

fix
2021-01-16 16:57:51 -08:00