Commit Graph

423 Commits

Author SHA1 Message Date
Reonu
508492a14c Update readme with more accurate config.h info 2021-07-13 19:31:13 +01:00
Reonu
b460464d86 Merge branch 'master' of https://github.com/CrashOveride95/ultrasm64 2021-07-13 17:12:08 +01:00
CrashOveride95
ba670dcdd1 Change sound_data to ASM, lowers build time significantly 2021-07-13 12:10:53 -04:00
Reonu
f74e9ae63e merged with ultrasm64 2021-07-13 17:10:12 +01:00
CrashOveride95
af36951124 Merge pull request #11 from Reonu/haveyourcake
haveyourcake (cake screen fix)
2021-07-13 12:06:51 -04:00
Reonu
a589e17a17 Refresh 14 2021-07-13 16:52:38 +01:00
CrashOveride95
a19e92c255 Merge branch 'master' of https://github.com/CrashOveride95/ultrasm64 2021-07-13 11:43:59 -04:00
CrashOveride95
3b6eb5b5e1 Merge branch 'master' of https://github.com/n64decomp/sm64 2021-07-13 11:40:46 -04:00
Reonu
5c9d94f148 merged with ultrasm64 + cleanup 2021-07-13 14:15:35 +01:00
CrashOveride95
8bd2a8bf62 Merge pull request #10 from Reonu/borderfix
fix search and replace memes
2021-07-13 08:55:05 -04:00
Cheezepin
1f3a27347b haveyourcake 2021-07-13 11:34:58 +01:00
Reonu
5622196d0d fixed search and replace meme 2021-07-13 11:29:43 +01:00
Reonu
1687179ef5 Merge pull request #16 from gheskett/expand_audio_heap
Expand Audio Heap
2021-07-13 11:23:24 +01:00
Reonu
b6cc4a4a1f fix search and replace memes 2021-07-13 04:23:26 +01:00
Reonu
7c7ab88d10 merge 2021-07-13 04:18:06 +01:00
n64
f9982e0ef5 Refresh 14 2021-07-12 23:17:54 -04:00
Reonu
bb3de5030a merged with ultrasm64 2021-07-13 04:16:55 +01:00
CrashOveride95
225c1eef55 Merge pull request #9 from Reonu/hudfix
HUD fix
2021-07-12 22:10:02 -04:00
gheskett
9be9a47b82 Expand audio heap 2021-07-12 19:16:06 -05:00
Reonu
f8cd491f6d HUD fix 2021-07-13 01:03:44 +01:00
CrashOveride95
de8ce9c6f7 reonu do good PR challenge failure
Deleted file that slipped in
2021-07-12 18:13:14 -04:00
Reonu
29864b64a1 Merge branch 'master' of https://github.com/CrashOveride95/ultrasm64 into border 2021-07-12 23:06:56 +01:00
Reonu
fd2eb663a6 Merge branch 'border' of https://github.com/Reonu/ultrasm64-extbounds into border 2021-07-12 23:06:06 +01:00
Reonu
b61837525d deleted file that slipped in 2021-07-12 23:05:56 +01:00
CrashOveride95
87a6c90bf5 Merge pull request #7 from Reonu/border
Add separate defines for console and emulator border heights
2021-07-12 17:50:05 -04:00