Commit Graph

1723 Commits

Author SHA1 Message Date
Ethan Roseman
e9f9c737c0 Merge branch 'master' into gfx 2021-01-16 11:18:21 +09:00
Ethan Roseman
cb52c63a0a Merge branch 'ninja' of github.com:ethteck/papermario into ninja 2021-01-16 11:15:25 +09:00
Ethan Roseman
2e774ac081 add permuter settings 2021-01-16 11:15:17 +09:00
dark-samus
ff67ed4b8a <:OK:768004453440684072> again 2021-01-15 20:54:14 -05:00
dark-samus
f1aa2190d9 typedef gets formatted :( 2021-01-15 17:26:03 -05:00
dark-samus
6fa31ae20a Most PR comments 2021-01-15 17:16:41 -05:00
Alex Bates
78e3886ed9 add permuter_settings.toml 2021-01-15 22:08:39 +00:00
Alex Bates
df14cabcc5 don't link to ROM dump site 2021-01-15 21:27:47 +00:00
Alex Bates
6cf218fdc1 INSTALL.md: link to Dat O Matic page for baserom 2021-01-15 21:22:06 +00:00
Alex Bates
3ee1b76b7d resolve CONTRIBUTING mislink 2021-01-15 21:19:42 +00:00
Alex Bates
937291f77b suppress asm/nonmatchings/ in github diffs 2021-01-15 21:18:37 +00:00
dark-samus
adfa9feb31 format again 2021-01-15 15:37:54 -05:00
dark-samus
f2e7262974 delete asm 2021-01-15 15:36:28 -05:00
dark-samus
557a9db0e2 more 2021-01-15 15:35:39 -05:00
dark-samus
cfc3b88743 remove random file in asm dir 2021-01-15 13:53:13 -05:00
Alex Bates
4778ece540 Merge branch 'ninja' of github.com:pmret/papermario into ninja 2021-01-15 18:19:36 +00:00
Alex Bates
a435194cca ci: fix progress_shield.json update 2021-01-15 18:19:30 +00:00
Alex Bates
7e4e143a89 configure: add --cflags option 2021-01-15 18:18:12 +00:00
dark-samus
728f0e44d1 some more fixes 2021-01-15 12:34:27 -05:00
dark-samus
75cfb78012 remove m2c output from a5dd0 2021-01-15 12:24:19 -05:00
dark-samus
379b5157dd fix rodata 2021-01-15 12:20:18 -05:00
dark-samus
8a2bb470a9 format 2021-01-15 12:18:27 -05:00
dark-samus
2cbb8e5712 OK 2021-01-15 12:14:26 -05:00
dark-samus
857016ee03 oops 2021-01-15 12:07:49 -05:00
dark-samus
bfebc525a5 merge master 2021-01-15 12:06:43 -05:00
dark-samus
816279c3d5 more stuff 2021-01-15 12:05:05 -05:00
dark-samus
8d533d5615 stuff 2021-01-15 12:01:44 -05:00
Ethan Roseman
c918912877 Merge branch 'ninja' of github.com:ethteck/papermario into ninja 2021-01-16 02:00:15 +09:00
Ethan Roseman
1d3df1761b Diff.py update + removing make stuff 2021-01-16 02:00:00 +09:00
Alex Bates
3381039aa4 update INSTALL.md 2021-01-15 16:50:06 +00:00
Alex Bates
d12fe30ad2 fix INSTALL.md typo 2021-01-15 16:49:09 +00:00
Alex Bates
8e6b3bcb51 remove makefile 2021-01-15 16:47:06 +00:00
Alex Bates
2eae138610 ninjatō 2021-01-15 16:28:05 +00:00
Ethan Roseman
191ef16e94 update diff.py 2021-01-16 01:20:52 +09:00
Alex Bates
c5d4a5a05c pipefail 2021-01-15 13:04:28 +00:00
Alex Bates
2275b4d3ec ninja cc tools/n64crc 2021-01-15 11:36:53 +00:00
Alex Bates
61f49e23af fix cpp on macos 2021-01-15 11:26:19 +00:00
Ethan Roseman
31f3c68b83 update requirements 2021-01-15 16:22:27 +09:00
Ethan Roseman
a890c93736 Merge branch 'master' into ninja 2021-01-15 16:17:03 +09:00
Ethan Roseman
20bea3dfe9 more 2021-01-15 13:10:40 +09:00
Ethan Roseman
6fba19fd96
Merge pull request #155 from Zelllll/testfile
code_7345A0 OK and other misc functions
2021-01-14 22:22:29 -05:00
Zelllll
d2bed729be reverted name of macro 2021-01-14 21:19:49 -06:00
Ethan Roseman
47d0341710 nasty func (thanks stuck 5 help) 2021-01-15 12:03:31 +09:00
Ethan Roseman
8a0c80413c Merge branch 'master' into gfx 2021-01-15 10:43:15 +09:00
Ethan Roseman
978c891054 removing splat 2021-01-15 10:43:09 +09:00
Ethan Roseman
0469ca6417
Merge pull request #156 from pmret/n64splat-subrepo
N64splat subrepo
2021-01-14 20:35:36 -05:00
Ethan Roseman
9eaa7cbeb9 Makefile update 2021-01-15 10:27:43 +09:00
Ethan Roseman
5e12a46dd4 git subrepo clone (merge) https://github.com/ethteck/n64splat.git tools/n64splat
subrepo:
  subdir:   "tools/n64splat"
  merged:   "7574db712"
upstream:
  origin:   "https://github.com/ethteck/n64splat.git"
  branch:   "master"
  commit:   "7574db712"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
2021-01-15 10:26:06 +09:00
Ethan Roseman
86760369a5 removed submodules 2021-01-15 10:24:28 +09:00
Ethan Roseman
642f99bf32 WIP (broken) 2021-01-15 10:20:04 +09:00