Commit Graph

161 Commits

Author SHA1 Message Date
Trevor Edris
b475d1ce87
Parallelize CI jobs and cache build tools (#9528) 2026-03-16 08:50:49 +01:00
grintoul
8c812e0e1a
Remove need to run make clean when switching between frlg and emerald (#9406) 2026-03-08 09:49:26 +01:00
Hedara
150649546e Expansion 1.15.0 2026-02-28 22:13:30 +01:00
Hedara
beb9825fef Merge branch 'upcoming' into expansion-release 2026-02-28 22:00:41 +01:00
Hedara
d6f59caeaf Expansion 1.14.4 2026-02-28 21:44:20 +01:00
Hedara
0c447063e1 Merge branch 'master' into master-merge
Conflicts:
	data/battle_anim_scripts.s
	include/battle_util.h
	include/constants/expansion.h
	src/battle_anim_dark.c
	src/battle_anim_effects_1.c
	src/battle_anim_normal.c
	src/battle_hold_effects.c
	src/battle_script_commands.c
	src/battle_util.c
	src/debug.c
2026-02-04 12:46:59 +01:00
Hedara
2d17ad27f9 Expansion 1.14.3 release 2026-02-01 17:13:23 +01:00
cawtds
97e83ebe6a
Add FRLG (#7423) 2026-01-28 17:41:12 +01:00
AlexOn1ine
f8266b828b 26/01/26 Master to upcoming merge 2026-01-26 19:35:43 +01:00
Eduardo Quezada
89da62b02d
Remove trailing whitespace - Master (#9011) 2026-01-25 10:12:41 +01:00
Hedara
addb11cfa2 Merge branch 'master' into master-to-upcoming
Conflicts:
	include/constants/expansion.h
	src/battle_script_commands.c
2026-01-02 11:49:03 +01:00
Hedara
64d40d3c14 Expansion 1.14.2 release 2026-01-02 10:41:18 +01:00
AlexOn1ine
a1948b7c40 01/01/26 Master to upcoming merge 2026-01-01 10:24:19 +01:00
hedara90
c0d4f0e45f
Use release instead of LTO in CI (#8706)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-12-31 00:13:23 +00:00
AlexOn1ine
23cefec579 08/12/25 master to upcoming merge 2025-12-08 18:15:19 +01:00
Gudf
cb66c35709
Enable 3-color text (#8191)
Some checks are pending
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
2025-12-08 12:27:13 +01:00
Raymond Dodge
fc25d943a7
Add a ci step that checks that documentation md files are mentioned in docs/SUMMARY.md (#8439) 2025-12-05 10:20:23 +01:00
Raymond Dodge
b5f27b5668
Update mdbook to v0.5.1 (#8437) 2025-12-05 10:02:42 +01:00
Hedara
905c580b08 Expansion 1.14.1 2025-12-01 17:35:59 +01:00
Hedara
da5a2ca70c 1.14.0 release 2025-11-30 16:00:23 +01:00
Hedara
66ea9ac406 1.13.4 release version 2025-11-30 15:41:43 +01:00
hedara90
459b3cbb2f
Adjust label workflow to only run if PR is approved (#8183)
Some checks are pending
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
Co-authored-by: Hedara <hedara90@gmail.com>
2025-11-09 22:21:55 +01:00
Raymond Dodge
d1428d7966
Update mdbook to v0.5.0-beta.1 (#8133) 2025-11-05 17:05:01 +01:00
grintoul
6bcf9823c5
Lock mdbook to v0.4.35 to fix docs not building (#8130)
Some checks are pending
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
2025-11-03 21:58:03 +01:00
Hedara
f969c126b1 1.13.3 release version 2025-11-01 21:51:06 +01:00
psf
5b5b813c1d
Updated PR template to make existing credit policy clearer (#7864)
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2025-10-08 13:53:25 -04:00
Hedara
a54b343948 Expansion 1.13.2 release version 2025-10-01 11:09:29 +02:00
Hedara
c1b1fb4cdc 1.13.1 Release version 2025-09-02 16:17:05 +02:00
Hedara
7056aaba6e Expansion version 1.13.0 2025-08-28 16:15:09 +02:00
Hedara
acf7f0c6e1 Merge branch 'upcoming' into expansion-release 2025-08-28 16:13:58 +02:00
Hedara
d812b58064 Expansion version 1.12.3 2025-08-28 15:49:29 +02:00
AlexOn1ine
bc73f4654b merge master 31/07/25 2025-08-01 12:18:11 +02:00
Hedara
d8059ce3d1 1.12.2 release version 2025-07-30 20:34:43 +02:00
AlexOn1ine
aa9ff53b81 master to upcoming merge 2025-07-02 10:05:31 +02:00
Hedara
1e281547ed 1.12.1 Release commit 2025-06-30 11:01:13 +02:00
hedara90
502c73dc9b
Fix 01_battle_engine_bugs.yaml (#7242) 2025-06-28 13:24:24 -07:00
DizzyEggg
8e7274f3fc
lto support (#7182) 2025-06-26 15:53:14 +02:00
psf
fd90802a37
Fixed CI issue introduced 7046 (#7072) 2025-06-07 09:51:47 +02:00
psf
7263bb1886
Update CI to ignore allcontributors commits (#7046) 2025-06-02 15:41:05 +02:00
Hedara
efa2fb3be7 Expansion 1.12.0 2025-05-30 20:53:32 +02:00
Hedara
09ee1d0b2d Merge branch 'upcoming' into expansion-1.11.4 2025-05-30 20:45:19 +02:00
Hedara
acb4a9cf62 Expansion 1.11.4 2025-05-30 20:15:56 +02:00
Hedara
9d80ad530d Merge branch 'master' into master-to-upcoming
Conflicts:
	Makefile
	data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
	data/maps/MtChimney/scripts.inc
	data/maps/MtPyre_Summit/scripts.inc
	data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
	include/constants/event_objects.h
	include/constants/expansion.h
	src/battle_script_commands.c
	src/battle_util.c
	src/field_screen_effect.c
2025-05-28 14:26:15 +02:00
Hedara
7d1833f277 1.11.3 release 2025-05-27 20:33:27 +02:00
Hedara
90aed43c27 Merge branch 'master' into master-upcoming
Conflicts:
	.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
	.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
	.github/ISSUE_TEMPLATE/03_feature_requests.yaml
	.github/ISSUE_TEMPLATE/04_other_errors.yaml
	.github/pull_request_template.md
	src/battle_controller_player.c
	src/battle_main.c
	src/battle_script_commands.c
	src/battle_util.c
	src/data/graphics/pokemon.h
	src/data/pokemon/species_info/gen_9_families.h
	test/battle/ability/flower_veil.c
	test/battle/ability/sweet_veil.c
	test/battle/ability/synchronize.c
	test/battle/ability/water_bubble.c
	test/battle/move_effect/fell_stinger.c
	test/battle/move_effect/level_damage.c
	test/battle/move_effect/magic_room.c
	test/battle/move_effect/me_first.c
	test/battle/move_effect/sky_drop.c
	test/battle/move_effect/smack_down.c
	test/battle/move_effect/wish.c
	test/battle/move_flags/ignore_type_if_flying_and_ungrounded.c
2025-05-22 15:41:08 +02:00
hedara90
e9ba4b5db0
Added type: documentation to required labels for the label check (#6957)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-05-22 00:45:25 -07:00
psf
b8b73bf219
Add CREDITS.md & FEATURES.md, rewrite README.md & INSTALL.md (#6700) 2025-05-17 19:33:22 +02:00
Hedara
1abfa7acfa Merge branch 'master' into master-upcoming
Conflicts:
	include/battle.h
	include/constants/battle_string_ids.h
	src/battle_ai_util.c
	src/battle_main.c
	src/battle_util.c
	test/battle/ai/ai.c
2025-05-12 18:21:35 +02:00
hedara90
5f86fd7de6
Changed github CI to use arm-none-eabi-gcc (#6829)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-05-12 16:38:03 +01:00
Hedara
0eeba00d1b Merge branch 'master' into master-upcoming-2025-04-30
Conflicts:
	include/battle.h
	include/constants/expansion.h
	include/graphics.h
	src/battle_bg.c
	src/battle_util.c
	src/data/graphics/battle_terrain.h
	src/data/graphics/pokemon.h
	src/pokeblock_feed.c
	src/pokemon_sprite_visualizer.c
2025-04-30 15:22:37 +02:00