|
|
6f138825d9
|
Merge remote-tracking branch 'codemann/OWMain' into overworld_kara
WIP, Broken, Do Not Use
|
2022-09-18 17:36:49 -07:00 |
|
codemann8
|
c209abd2a5
|
Fixed Sprite Author in credits to have same gap as other groups
|
2022-07-31 09:06:35 -05:00 |
|
codemann8
|
7c7664224e
|
Merged DR v1.0.1.0
|
2022-07-08 05:32:08 -05:00 |
|
codemann8
|
04948c72f6
|
Adding Catobat to OWR credits
|
2022-05-17 08:04:37 -05:00 |
|
aerinon
|
a0ebf72d59
|
Lifting normal pots increases location count
Pot despawn protection
Hud updates
|
2022-03-04 15:24:22 -07:00 |
|
codemann8
|
b20f9ddd67
|
Merged DR v0.5.1.7
|
2022-01-06 02:13:05 -06:00 |
|
aerinon
|
c88a301708
|
Merge branch 'master' into DRMain
# Conflicts:
# tables.asm
|
2022-01-05 14:26:48 -07:00 |
|
Thomas Prescott
|
c416bfa917
|
update credits
|
2022-01-03 12:29:04 -08:00 |
|
|
|
b2043ef15e
|
Adjust credits to match layout of base randomizer fork
|
2022-01-03 12:26:15 -08:00 |
|
Thomas Prescott
|
2a3d6fae58
|
update credits
|
2022-01-03 13:55:03 -06:00 |
|
codemann8
|
2215b16240
|
Merge branch 'DRMain' into OWMain
|
2021-10-21 21:26:38 -05:00 |
|
aerinon
|
27654b9ac9
|
Merge remote-tracking branch 'baserom/master' into DRMain
# Conflicts:
# hooks.asm
# newhud.asm
# utilities.asm
|
2021-10-21 14:15:54 -06:00 |
|
|
|
42002ae839
|
Merge branch 'main' into overworld_kara
|
2021-08-26 08:44:15 -07:00 |
|
Thomas Prescott
|
bd16b9ff92
|
Add Pleasure to credits
Credit the creator of the website logo
|
2021-08-21 07:43:23 -05:00 |
|
|
|
b663bb982f
|
Merge branch 'OWMain' into overworld_kara
|
2021-07-23 15:42:41 -07:00 |
|
codemann8
|
11099f53b0
|
Merging DRMain
|
2021-07-23 15:49:10 -05:00 |
|
aerinon
|
15337a1382
|
Collection Rate moved to arbline marco
|
2021-07-23 09:14:43 -07:00 |
|
KatDevsGames
|
df7ce30bbe
|
Merge pull request #137 from ardnaxelarak/main
Fix drawing C/P indicator
|
2021-07-18 13:25:36 -05:00 |
|
|
|
59affe8b93
|
Adjust things for replacing sword stats with bomb stats
|
2021-07-17 12:11:25 -07:00 |
|
|
|
a2547e9810
|
Minor credits fixes
|
2021-07-16 15:29:01 -07:00 |
|
codemann8
|
0cd7986318
|
Merge branch 'DRMain' into OWMain
|
2021-07-14 00:06:51 -05:00 |
|
aerinon
|
641ec0ffa0
|
Minor fix to credits
Default to AgaDoor to Std/Open state
|
2021-07-13 10:51:01 -07:00 |
|
|
|
8d92e39451
|
Fix extra space in credits
|
2021-07-12 02:13:08 -07:00 |
|
|
|
12bc26bd5a
|
Fix extra space in credits
|
2021-07-12 02:10:12 -07:00 |
|
codemann8
|
6cd0d15abf
|
Merge branch 'DRMain' into OWMain
|
2021-07-07 19:11:36 -05:00 |
|
aerinon
|
aee82fa319
|
Merge branch 'master' into DRMain
# Conflicts:
# LTTP_RND_GeneralBugfixes.asm
# events.asm
# hooks.asm
# stats.asm
# stats/creditsnew.asm
# stats/statConfig.asm
# swordswap.asm
# utilities.asm
|
2021-07-07 11:15:11 -07:00 |
|
|
|
d960103e86
|
Merge branch 'main' into overworld_kara
|
2021-07-07 09:15:29 -07:00 |
|
|
|
7022b8768a
|
Merge branch 'OWMain' of github.com:codemann8/z3randomizer into overworld_kara
|
2021-07-06 19:00:52 -07:00 |
|
|
|
d4e1337471
|
Add bombs-placed counter to stat screen
|
2021-07-05 17:56:56 -07:00 |
|
codemann8
|
6f7f9d2a39
|
Adding OW Rando credits
|
2021-07-04 11:38:24 -05:00 |
|
codemann8
|
f2f53e8999
|
Adding OW Rando credits
|
2021-07-04 11:29:21 -05:00 |
|
spannerisms
|
00c59c791f
|
damage/magic stats
|
2021-07-03 09:25:33 -04:00 |
|
|
|
2fec3f7484
|
Merge commit 'f403ca10da9e009599a531be8cdcd20a61b4801c' of github.com:spannerisms/z3randomizer into overworld_kara
|
2021-07-01 23:05:48 -07:00 |
|
|
|
01abf889d7
|
Merge branch 'main' into overworld_kara
|
2021-07-01 23:02:23 -07:00 |
|
spannerisms
|
f403ca10da
|
boss icons
|
2021-06-30 07:15:37 -04:00 |
|
KatDevsGames
|
69ec104027
|
Merge pull request #131 from Bonta0/chestturns
Credits: Add chest turns counter
|
2021-06-28 11:47:01 -05:00 |
|
aerinon
|
e9aec2ba86
|
Merge branch 'master' into DRMain
# Conflicts:
# LTTP_RND_GeneralBugfixes.asm
# hooks.asm
|
2021-06-22 13:12:07 -06:00 |
|
Bonta
|
1531f7a8e2
|
Credits: Display chest turns
|
2021-06-22 02:32:06 +02:00 |
|
Thomas Prescott
|
3d7e12a760
|
Update creditsnew.asm
Add Bonta and Emosaru to the Special Thanks section
|
2021-06-12 16:15:28 -05:00 |
|
aerinon
|
842bb043e6
|
Merge branch 'master' into DRMain
# Conflicts:
# LTTP_RND_GeneralBugfixes.asm
# catfish.asm
# compasses.asm
# darkworldspawn.asm
# hooks.asm
# inventory.asm
# newitems.asm
# shopkeeper.asm
# stats.asm
# tables.asm
Adn some updates from DR
|
2021-05-13 12:11:40 -06:00 |
|
Thomas Prescott
|
03c0eb0475
|
Fix msu1 in credits
%smallcredits() can't have numbers, so we need to remove the 1 from MSU1
|
2021-05-06 21:45:10 -05:00 |
|
Thomas Prescott
|
08abf980eb
|
fix
|
2021-04-26 00:34:33 -05:00 |
|
Thomas Prescott
|
1efb19b88d
|
update credits
|
2021-04-26 00:32:56 -05:00 |
|
spannerisms
|
c179bfcb64
|
credits update
add color (thanks synack)
add warning and errors for misalignment
|
2021-04-15 02:19:16 -04:00 |
|
spannerisms
|
12decaab45
|
ah that wouldn't work
|
2021-04-13 19:26:24 -04:00 |
|
spannerisms
|
975dd10db5
|
remove padding
|
2021-04-13 19:24:19 -04:00 |
|
spannerisms
|
44445b51ce
|
autospacing
|
2021-04-13 00:00:34 -04:00 |
|
spannerisms
|
c9340e5aa8
|
Update creditsnew.asm
|
2021-04-12 22:48:21 -04:00 |
|
spannerisms
|
e9584597c4
|
new credits
|
2021-04-12 22:45:19 -04:00 |
|
