86 Commits

Author SHA1 Message Date
Hedara
b0ccddac69 Merge branch 'master' into master-to-upcoming
Conflicts:
	include/constants/expansion.h
2025-11-03 11:11:07 +01:00
Hedara
cfdbd19ea8 Start of 1.13.4 cycle 2025-11-01 21:51:24 +01:00
Hedara
f969c126b1 1.13.3 release version 2025-11-01 21:51:06 +01:00
AlexOn1ine
870b93aad9 06/10/25 Master to upcoming merge 2025-10-06 19:42:42 +02:00
Hedara
d3ba08e0bd Start of 1.13.3 cycle 2025-10-01 11:10:00 +02:00
Hedara
a54b343948 Expansion 1.13.2 release version 2025-10-01 11:09:29 +02:00
Hedara
1ec08fbe0d Merge branch 'master' into master-to-upcoming 2025-09-06 19:43:43 +02:00
Hedara
ef001df006 Start of 1.13.2 cycle 2025-09-02 16:18:32 +02:00
Hedara
c1b1fb4cdc 1.13.1 Release version 2025-09-02 16:17:05 +02:00
Hedara
2ab1bc87e0 Start of 1.14 cycle 2025-08-28 16:46:58 +02:00
Hedara
9ff4c48f77 Start of 1.13.1 cycle 2025-08-28 16:16:40 +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
637f7dff46 Start of 1.12.3 cycle 2025-07-30 20:35:16 +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
947faa97d3 Start of 1.12.2 cycle 2025-06-30 11:01:46 +02:00
Hedara
1e281547ed 1.12.1 Release commit 2025-06-30 11:01:13 +02:00
Hedara
0e968b31a9 Start of 1.13 cycle 2025-05-30 21:24:29 +02:00
Hedara
98c03315a9 Start of 1.12.1 cycle 2025-05-30 20:55:09 +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
156e0b394c Start of 1.11.4 cycle 2025-05-27 20:34:28 +02:00
Hedara
7d1833f277 1.11.3 release 2025-05-27 20:33:27 +02: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
Hedara
f0ecbce9c7 Start of 1.11.3 Cycle 2025-04-30 11:26:09 +02:00
Hedara
accb85554a Expansion 1.11.2 Release 2025-04-30 11:23:05 +02:00
AlexOn1ine
ccebebf64f 31-03-25 Master merge 2025-03-31 18:23:46 +02:00
Hedara
3615fdde29 START OF 1.11.2 CYCLE 2025-03-30 14:56:39 +02:00
Hedara
e350bea168 Expansion 1.11.1 Release 2025-03-30 14:55:51 +02:00
Hedara
8df457452a Start of 1.12 cycle 2025-02-27 14:34:58 +01:00
Hedara
55bf368866 Merge branch 'upcoming' into upcoming-to-master-merge 2025-02-27 13:11:16 +01:00
Hedara
4f6733f45d 1.11.0 Release 2025-02-27 10:07:50 +01:00
Hedara
dfff36f643 1.10.3 Release 2025-02-27 09:59:22 +01:00
Eduardo Quezada
ee1b75614d Merge branch '_RHH/master' into _RHH/upcoming 2025-01-30 22:46:06 -03:00
Eduardo Quezada
1c3cabb52a Fix typo 2025-01-30 18:46:06 -03:00
Eduardo Quezada
370cfd5bb4 Begin 1.10.3 cycle 2025-01-30 18:40:03 -03:00
Eduardo Quezada
397e98b954
Version 1.10.2 (#6144) 2025-01-30 18:38:28 -03:00
Eduardo Quezada
a50c78bb1e Merge branch '_RHH/master' into _RHH/upcoming 2025-01-01 18:34:42 -03:00
Eduardo Quezada
e040dcb0b4 Begin 1.10.2 cycle 2025-01-01 16:20:40 -03:00
Eduardo Quezada
89699939de Version 1.10.1 2025-01-01 16:17:49 -03:00
Eduardo Quezada
7ac7ab8f6f Merge branch '_RHH/master' into _RHH/upcoming 2024-12-02 13:49:43 -03:00
Eduardo Quezada
00cb7b36e1 Actually start 1.11.0 cycle 2024-12-01 15:36:39 -03:00
Eduardo Quezada
2e30e66e15 Begin 1.11.0 cycle 2024-12-01 15:33:42 -03:00
Eduardo Quezada
7e5327864e Start of 1.10.1 cycle 2024-12-01 15:27:01 -03:00
Eduardo Quezada
bd7a46f9c7 Version 1.10.0 2024-12-01 15:10:46 -03:00