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
hedara90
66a5ad5258
Updated label workflow ( #6729 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-30 14:01:45 +02:00
Hedara
accb85554a
Expansion 1.11.2 Release
2025-04-30 11:23:05 +02:00
Hedara
2210e2d410
Merge branch 'master' into upcoming-master
2025-04-09 11:06:38 +02:00
psf
2e6c62ff54
Add CONTRIBUTING.md and STYLEGUIDE.md ( #6340 )
...
Co-authored-by: HackMD <37423+hackmd-hub[bot]@users.noreply.github.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-04-01 15:38:59 +02:00
hedara90
d039950f6c
Update labels.yml
2025-03-31 19:24:56 +02:00
Hedara
e350bea168
Expansion 1.11.1 Release
2025-03-30 14:55:51 +02:00
hedara90
8d94edaaa0
Added workflow for labels check ( #6488 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-03-28 21:21:17 +01:00
Hedara
4f6733f45d
1.11.0 Release
2025-02-27 10:07:50 +01:00
Eduardo Quezada
397e98b954
Version 1.10.2 ( #6144 )
2025-01-30 18:38:28 -03:00
psf
c02b7ba828
Codify new expansion release schedule ( #5916 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2025-01-13 16:52:49 -03:00
Eduardo Quezada
89699939de
Version 1.10.1
2025-01-01 16:17:49 -03:00
psf
93e733820c
Added instructions in PR template to make crediting people more clear ( #5755 )
2024-12-04 10:54:39 -05:00
psf
91c35aede3
Added scope document and made changes to pull request template ( #5706 )
2024-12-02 12:09:48 -08: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
pkmnsnfrn
f41fdbff6d
First pass at scope doc and updated PR tempalte
2024-11-21 12:59:51 -08:00
Eduardo Quezada
3205f377d5
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-21 08:18:44 -03:00
Eduardo Quezada
89e8bc5c4c
Add changelog header in PR template to aid automation ( #5539 )
...
* Add changelog header in PR template to aid automation
* Bullet points
* Finished the statement
2024-10-19 14:00:04 -03:00
Eduardo Quezada
ee9c6d4912
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-17 00:16:01 -03:00
Eduardo Quezada
9ed153ff93
Merge branch '_RHH/master' into _RHH/pr/master/pretSync20241015
2024-10-15 22:22:52 -03:00
Eduardo Quezada
80447bee8e
Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015
2024-10-15 20:56:56 -03:00
GriffinR
6d24d8a78f
Fix libpng installation for workflow on Ubuntu 24.04
2024-10-11 13:29:16 -04:00
Eduardo Quezada
ee00c251ae
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-08 14:52:12 -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
0f8b2a1ba8
Merge branch '_RHH/master' into _RHH/pr/master/pretSync20240909
2024-10-04 10:23:58 -03:00
Eduardo Quezada
5130ea9da3
Merge branch '_RHH/master' into _RHH/upcoming
2024-09-28 11:45:49 -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
f720916633
CI fix attempt
2024-09-15 02:25:12 -03:00
Skye Chappelle
a75be4124d
Update pull_request_template.md to include Discord username update
2024-09-10 23:39:41 -04:00
Eduardo Quezada
6ac18a6fe5
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-20 08:00:05 -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
Martin Griffin
25f7f431fa
Remove agbcc ( #4994 )
2024-08-11 22:06:33 +02: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
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
leo60228
566ad6d869
Don't try to deploy to GitHub Pages if it's not enabled ( #4809 )
2024-06-25 11:10:52 +02:00
leo60228
e925c51391
Convert docs/ folder to mdBook ( #4684 )
...
* Convert docs/ folder to mdBook
* INSTALL.md Markdown fixes (also affects GitHub web)
* Don't try to rewrite bare links in HTML attributes
* lowercase anchors in fix_links.py
2024-06-03 13:34:39 -04:00
Eduardo Quezada
767a1c7937
Version 1.8.4 ( #4639 )
...
* Version 1.8.4
* Missing labels
2024-05-27 09:06:34 -04:00
Eduardo Quezada
7e43916e57
Version 1.8.3 ( #4499 )
...
* Moved changelogs to folders by minor version
* Version 1.8.3
2024-05-06 14:44:37 -04:00
Eduardo Quezada
ab5c2d9161
Version 1.8.2 ( #4394 )
2024-04-15 17:47:50 -04:00
Eduardo Quezada
024848a9e9
Version 1.8.1 (hotfix) ( #4303 )
2024-03-24 16:07:49 -03:00
