ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 20:24:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,899 Commits 1 Branch 0 Tags 235 MiB
2414283bb7
Commit Graph

26 Commits

Author SHA1 Message Date
Eduardo Quezada
6a57dcdc4c Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20221216 
# Conflicts:
#	src/data.c
#	src/data/pokemon_graphics/front_pic_anims.h
 2022-12-16 19:19:23 -03:00
GriffinR
dc24fde7f6 Sync calcrom fixes 2022-11-27 17:33:09 -05:00
ultima-soul
0312c5be8b Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-27 21:38:26 -08:00
ultima-soul
3ed51d6d91 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-21 10:40:26 -08:00
GriffinR
f81565163e Retire OK bot 2021-11-21 11:48:50 -05:00
GriffinR
ec97a21f95 Fix calcrom's handling of 0s 2021-11-17 15:04:42 -05:00
GriffinR
57be596ce4 Fix calcrom partial doc becoming negative 2021-11-10 13:14:11 -05:00
GriffinR
1a69eb33e8 Add newlines around calcrom output 2021-10-29 20:27:58 -04:00
GriffinR
ceb871e3fa Process calcrom options first 2021-10-14 10:15:08 -04:00
GriffinR
2f6928f016 Make calcrom data info optional 2021-10-14 09:52:33 -04:00
ultima-soul
02c9e040df Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-08-11 16:33:10 -07:00
GriffinR
1860b7682f Allow symbols branch on forks 2021-08-11 17:19:21 -04:00
GriffinR
5098fbf7bb Fix symbols branch commit message, limit to upstream 2021-08-11 17:09:03 -04:00
PikalaxALT
52512cfbe1 Use merge commit message for symbols branch 2021-07-16 12:15:53 -04:00
GriffinR
2f1a997440 Use PR title for symbols branch commits 2021-07-08 00:49:27 -04:00
PikalaxALT
5ccac26f26 Port symfile implementation from Ruby, FireRed 2021-06-16 11:03:23 -04:00
ExpoSeed
579ff8aeaf newline 2021-04-03 00:38:15 -05:00
ExpoSeed
77d5699072 new workflow 2021-04-03 00:26:55 -05:00
GriffinR
ba1e006a64 Move webhook env vars, drop unnecessary secrets 2021-03-07 22:40:09 -05:00
GriffinR
fd42e02af4 Move webhook event check to workflow 2021-03-07 17:35:56 -05:00
GriffinR
1dc12890d1 Update event name in webhook 2021-03-07 15:33:14 -06:00
GriffinR
c05f529a19 Replace Travis CI with Github workflow 2021-03-07 15:33:14 -06:00
ExpoSeed
94bfc31629 Eliminate most of PR template 2020-10-02 11:24:39 -05:00
ExpoSeed
933e180dd6 Remove breaking change line 2020-09-27 18:09:35 -05:00
ExpoSeed
70f7d4f256 More concise pull request template 2020-09-27 17:59:21 -05:00
PikalaxALT
46d748a219
Create pull_request_template.md 2020-09-27 17:40:30 -04:00