Commit Graph

35 Commits

Author SHA1 Message Date
Eduardo Quezada 28a71ea9b5 Compare on CI 2025-02-15 19:34:59 -03:00
Eduardo Quezada 0ffa449964 Fixed CI 2025-01-13 11:30:31 -03:00
Eduardo Quezada d8b92f98cd Merge remote-tracking branch '_pret_origin/master' into pret_multilanguage 2025-01-12 17:40:40 -03:00
GriffinR 6d24d8a78f Fix libpng installation for workflow on Ubuntu 24.04 2024-10-11 13:29:16 -04:00
Skye Chappelle a75be4124d Update pull_request_template.md to include Discord username update 2024-09-10 23:39:41 -04:00
Eduardo Quezada 70bad62f9b Merge remote-tracking branch '_pret_origin/master' into multilanguage/sync
# Conflicts:
#	Makefile
#	data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
#	data/maps/OldaleTown/scripts.inc
#	data/maps/Route110_TrickHousePuzzle7/scripts.inc
#	data/maps/Route110_TrickHousePuzzle8/scripts.inc
#	data/scripts/roulette.inc
#	data/tilesets/graphics.inc
#	data/tilesets/metatiles.inc
#	graphics/trainer_card/0star_fr.pal
#	graphics/trainer_card/four_stars_fr.pal
#	graphics/trainer_card/frlg/0star.pal
#	graphics/trainer_card/frlg/blue.pal
#	graphics/trainer_card/frlg/bronze.pal
#	graphics/trainer_card/frlg/card.png
#	graphics/trainer_card/frlg/four_stars.pal
#	graphics/trainer_card/frlg/gold.pal
#	graphics/trainer_card/frlg/green.pal
#	graphics/trainer_card/frlg/one_star.pal
#	graphics/trainer_card/frlg/silver.pal
#	graphics/trainer_card/frlg/three_stars.pal
#	graphics/trainer_card/frlg/two_stars.pal
#	graphics/trainer_card/one_star_fr.pal
#	graphics/trainer_card/three_stars_fr.pal
#	graphics/trainer_card/two_stars_fr.pal
#	src/battle_message.c
#	src/battle_tent.c
#	src/berry_blender.c
#	src/berry_tag_screen.c
#	src/data/bard_music/length_table.h
#	src/data/credits.h
#	src/data/items.h
#	src/data/pokemon/pokedex_orders.h
#	src/data/region_map/region_map_entries.h
#	src/easy_chat.c
#	src/field_region_map.c
#	src/graphics.c
#	src/item.c
#	src/item_menu.c
#	src/menu_specialized.c
#	src/pokedex.c
#	src/pokedex_cry_screen.c
#	src/pokemon_jump.c
#	src/pokenav_conditions_search_results.c
#	src/pokenav_match_call_gfx.c
#	src/pokenav_ribbons_list.c
#	src/shop.c
#	src/trade.c
#	src/trainer_card.c
#	src/wireless_communication_status_screen.c
2024-07-05 18:38:49 -04:00
Eduardo Quezada e26a0629ae English as proper default 2024-07-05 07:31:42 -04:00
Eduardo Quezada 8b20a44738 Disabled non-working spanish compile for now 2024-07-03 14:47:38 -04:00
Eduardo Quezada 23e0fec9ad Initial Spanish (can't compile yet) 2024-07-01 23:07:26 -04:00
Eduardo Quezada e803d400a3 Italian Compare in CI 2024-07-01 13:46:00 -04:00
Eduardo Quezada 3424047ce2 French: OK 2024-06-29 21:41:10 -04:00
Eduardo Quezada b5b50bcc1c CI fix attempt 2024-06-22 09:07:21 -04:00
Eduardo Quezada dbc45c78fe Updated CI to not do compare for now 2024-06-22 08:37:01 -04:00
GriffinR dc24fde7f6 Sync calcrom fixes 2022-11-27 17:33:09 -05:00
Eduardo Quezada c05c6bfe24 (90/654) 2022-08-02 15:44:28 -04:00
Eduardo Quezada 4e137fb43c (55/654) src/battle_message.c and adjustments to Makefile 2022-08-02 10:01:19 -04: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
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
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