11 Commits

Author	SHA1	Message	Date
Alex Bates	4f2261c5d9	resolve conflicts with master	2020-08-20 17:02:57 +01:00
Alex Bates	fbbbf83d22	add NON_MATCHING	2020-08-19 02:45:26 +01:00
alex	c52ad332cc	Merge branch 'master' into coverage	2020-08-19 02:00:00 +01:00
Alex Bates	05d0eff2b1	remove commented INCLUDE_ASM macros	2020-08-19 01:55:56 +01:00
Alex Bates	728c879b9f	resolve clang-tidy errors	2020-08-19 01:35:11 +01:00
Alex Bates	7498c2dc1c	require directory as string in INCLUDE_ASM macro	2020-08-17 22:10:44 +01:00
Alex Bates	e40b05d9c5	rename types (#20)	2020-08-16 04:19:00 +01:00
Ethan Roseman	7e0880dfdd	Work on script interpreter	2020-08-14 11:18:05 -04:00
Alex Bates	78d23805e0	wip: update game_status struct ... Non-matching right now, I probably made an alignment/sizing error somewhere - proofreading would be appreciated.	2020-08-14 05:08:55 +01:00
Ethan Roseman	7d5c31a6e6	Cleanup, starting trigger functions	2020-08-13 01:03:47 -04:00
Ethan Roseman	0782fa07a3	Refactoring stuff	2020-08-12 21:56:23 -04:00