falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
292 Commits 6 Branches 0 Tags 283 MiB
Commit Graph

292 Commits

Author SHA1 Message Date
Ethan Roseman 43320efc03
Merge pull request #19 from nanaian/vscode 
add editor dotfiles
 2020-08-15 19:25:51 -04:00
Alex Bates f64f74782b add editorconfig 2020-08-15 17:27:08 +01:00
Alex Bates c897d5caa3 add vscode editor settings and build tasks 2020-08-15 17:27:08 +01:00
Ethan Roseman 03b27e3142 Jenkins test 3 2020-08-15 00:20:15 -04:00
Ethan Roseman ea5ae7a177 Jenkins test 2 2020-08-15 00:16:19 -04:00
Ethan Roseman 507441fc30 Jenkins test 1 2020-08-15 00:12:23 -04:00
Ethan Roseman 1d3c037d9a fixing header format 2020-08-14 23:54:29 -04:00
Ethan Roseman 31725376a9
Merge pull request #11 from JoshW-7/master 
Working more on script-related functions
 2020-08-14 23:49:01 -04:00
Josh 541f8058e2
Merge branch 'master' into master 2020-08-14 20:37:33 -07:00
Ethan Roseman 2090248b90
Merge pull request #16 from nanaian/lerp 
match UpdateLerp and clean up MakeLerp
 2020-08-14 23:20:52 -04:00
Alex Bates 97d6f772ee Merge master into lerp 2020-08-15 04:13:54 +01:00
Alex Bates 2a169dc34a remove redundant casts 2020-08-15 04:12:30 +01:00
Ethan Roseman 81e3edffb4
Merge pull request #13 from pixel-stuck/master 
Fix assembler bug + misc other changes
 2020-08-14 23:08:36 -04:00
Alex Bates b6ea00038f remove UpdateLerp.s 2020-08-15 04:03:29 +01:00
Ethan Roseman e47abe496d
Merge pull request #14 from nanaian/fix-make-b 
support make -B flag
 2020-08-14 23:00:34 -04:00
Jdog 9496d860e4 Dumb mistake 2020-08-14 19:55:54 -07:00
Ethan Roseman 9a518db863 Fix hard-coded loop counter 2020-08-14 22:55:19 -04:00
Alex Bates 24a50c0de7 support make -B flag 2020-08-15 03:52:44 +01:00
Ethan Roseman 162f02c846
Merge pull request #9 from ethteck/si 
Work on script interpreter
 2020-08-14 22:51:38 -04:00
Ethan Roseman 8b703053de Add TODO 2020-08-14 22:51:23 -04:00
Jdog 58b2a01a58 Remove WIP function 2020-08-14 19:51:02 -07:00
Ethan Roseman a414ce047b Merge branch 'master' into si 2020-08-14 22:50:30 -04:00
Jdog d1898f1903 Tweaks 2020-08-14 19:50:21 -07:00
Ethan Roseman 9141ba1d13
Merge pull request #10 from nanaian/sr-structs 
update common_structs.h to match star rod database
 2020-08-14 22:40:38 -04:00
dark-samus 62827e8823 actually fix assembler bug, make sure it compiles. 2020-08-14 22:24:08 -04:00
dark-samus 50f8ca824b fix bug in assembler 2020-08-14 21:54:11 -04:00
Alex Bates dae676c8af match UpdateLerp 2020-08-15 01:49:33 +01:00
Alex Bates 0d8d3e50a9 clean up MakeLerp 2020-08-15 01:17:20 +01:00
Alex Bates 7ab624d7b1 make: remove common_structs.h rule 2020-08-15 00:57:39 +01:00
Jdog 73a39e0747 undo change to script_context struct that was experimental 2020-08-14 16:33:44 -07:00
Jdog 1a4f01fe7b Fixing some issues and including removal of .s files 2020-08-14 16:31:50 -07:00
Alex Bates c5d43629f3 make: require PM_HEADER_REBUILD=1 to watch header files 2020-08-15 00:12:41 +01:00
Alex Bates eb3ef759d7 Merge remote-tracking branch 'origin/master' into sr-structs 2020-08-14 23:59:42 +01:00
Alex Bates a2ab091516 Merge remote-tracking branch 'origin/sr-structs-ethan' into sr-structs 2020-08-14 23:55:03 +01:00
Alex Bates 4724a110a5 generate enums.h 2020-08-14 23:53:01 +01:00
Alex Bates 6c59c2fca7 swap bg_header raster/palette fields 2020-08-14 23:53:01 +01:00
Jdog c6058a8227 Fix so everything matches 2020-08-14 15:11:48 -07:00
Jdog 760e1351fb Working more on script-related functions 2020-08-14 15:05:05 -07:00
Ethan Roseman 6e44a205e9 OK 2020-08-14 17:53:45 -04:00
Alex Bates 5e6173f25b generate common_structs.h from star rod database 2020-08-14 21:10:34 +01:00
Ethan Roseman 6ad4581788 fix 2020-08-14 11:24:31 -04:00
Ethan Roseman 32a69b688a fix 2020-08-14 11:24:05 -04:00
Ethan Roseman 56ef80de67 Merge remote-tracking branch 'origin/master' into si 2020-08-14 11:23:15 -04:00
Ethan Roseman 7e0880dfdd Work on script interpreter 2020-08-14 11:18:05 -04:00
Ethan Roseman 1620b367ee
Merge pull request #6 from JoshW-7/master 
Added gCurrentScriptList and some more matching funcs
 2020-08-14 11:09:37 -04:00
Ethan Roseman bc5fa0f5bf fix master 2020-08-14 11:05:28 -04:00
Jdog 27407e07f8 Remove WIP function 2020-08-14 08:01:23 -07:00
Ethan Roseman 4dbaf81ed2
Merge pull request #7 from nanaian/load_map_bg 
match load_map_bg
 2020-08-14 10:58:16 -04:00
Ethan Roseman ee38671740
Merge pull request #8 from nanaian/update-game_status 
update game_status struct
 2020-08-14 10:57:32 -04:00
Jdog c179e51a88 Change to use ARRAY_COUNT for script list stuff 2020-08-14 07:50:44 -07:00