69 Commits

Author SHA1 Message Date
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
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
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
Eduardo Quezada
7010080465 Merge branch '_RHH/upcoming' into _RHH/pr/master/1.10.0 2024-12-01 14:28:12 -03:00
Eduardo Quezada
6fe935f1b8 Version 1.9.4 2024-12-01 14:04:13 -03:00
Eduardo Quezada
ee00c251ae Merge branch '_RHH/master' into _RHH/upcoming 2024-10-08 14:52:12 -03:00
Eduardo Quezada
541ca2619b Start 1.9.4 cycle 2024-10-08 14:47:32 -03:00
Eduardo Quezada
a76f7fe92e
Version 1.9.3 (#5485)
* Version 1.9.3

* Updated to latest master
2024-10-08 14:45:09 -03:00
Eduardo Quezada
6116b8b04e Start 1.9.3 cycle 2024-09-16 11:57:41 -03:00
Eduardo Quezada
889a02d263
Version 1.9.2 (#5357)
* Version 1.9.2

* Apply suggestions from code review

Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>

* Updated to latest master

* Updated to latest master

* Fix last PR

* Corrected order + Pumpkaboo/Gourgeist credits

---------

Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2024-09-16 12:12:34 -03:00
Eduardo Quezada
becb2fcac8 Start 1.9.2 cycle 2024-08-19 18:29:48 -04:00
Eduardo Quezada
a11f03ed9d
Version 1.9.1 (#5199)
* Version 1.9.1

* Added 5195

* Apply suggestions from code review

Co-authored-by: hedara90 <90hedara@gmail.com>

* Added 5196 and 5207

---------

Co-authored-by: hedara90 <90hedara@gmail.com>
2024-08-19 18:25:39 -04:00
Eduardo Quezada
4082adf5b1 Start 1.10.0 cycle 2024-08-01 17:07:50 -04:00
Eduardo Quezada
512c44b698 Start 1.9.1 cycle 2024-08-01 17:04:48 -04:00
Eduardo Quezada
7ec24b89c8 Merge branch '_RHH/upcoming' into _RHH/pr/master/1.9.0 2024-08-01 16:58:19 -04:00
Eduardo Quezada
483121dfc0
Version 1.8.6 (#5005) 2024-08-01 19:52:29 -04:00
Eduardo Quezada
0613af5604 Untag 2024-07-10 09:47:35 -04:00
Eduardo Quezada
c0eb9af2e6
Version 1.8.5 (#4921)
* Version 1.8.5

* Updated up to PR 4926 (squash)

* Fixed descriptions (squash)

* Updated up to PR4939 (squash)
2024-07-10 09:44:55 -04:00
Eduardo Quezada
069161b716 Untag release 2024-05-27 09:31:06 -04:00
Eduardo Quezada
767a1c7937
Version 1.8.4 (#4639)
* Version 1.8.4

* Missing labels
2024-05-27 09:06:34 -04:00