Paul
034bd2eec6
Only use strict walking pathing when the hitbox is small
2025-11-19 19:16:02 +10:00
Polymeta
a24be04d68
Merge branch 'ihatebugtypes1.7' into 'main'
...
sacrificing Bugsy for the sake of the release
Closes #1771 and #1768
See merge request cable-mc/cobblemon!2000
2025-11-19 07:32:27 +00:00
Segfault Guy
0d878d57b7
Merge remote-tracking branch 'origin/main' into ihatebugtypes1.7
2025-11-19 00:55:42 -05:00
Paul
08880e2294
Fixed instance of check for diagonal validation on non pokemon
2025-11-19 12:52:20 +10:00
Paul
1c45654930
Update the changed-default root variables on 1.7 installation
2025-11-19 12:33:36 +10:00
Hiroku
dae3acb5a0
Merge branch 'i-dont-know-what-to-call-this-branch' into 'main'
...
Small fixes
See merge request cable-mc/cobblemon!2007
2025-11-19 02:30:20 +00:00
Hiroku
7bb6f8a12e
Merge branch 'damage-formula' into 'main'
...
Add attack to damage formula
See merge request cable-mc/cobblemon!2011
2025-11-19 02:18:25 +00:00
lion
b25f3ca3f6
Add attack to damage formula
2025-11-19 02:18:25 +00:00
Hiroku
610b762188
Merge branch 'nut-rition' into 'main'
...
Food Tweaks
See merge request cable-mc/cobblemon!2010
2025-11-19 02:00:41 +00:00
Hiroku
c4c954c898
Merge branch 'Meta&Jet-fixes' into 'main'
...
Metagross fix and Jet handling tweak.
See merge request cable-mc/cobblemon!2009
2025-11-19 01:49:19 +00:00
Segfault Guy
10b70a0e3f
Merge remote-tracking branch 'origin/main' into ihatebugtypes1.7
2025-11-18 20:20:46 -05:00
Segfault Guy
af437f9d3e
Merge branch 'ihatebugtypes1.7' of https://gitlab.com/cable-mc/cobblemon into ihatebugtypes1.7
2025-11-18 20:14:21 -05:00
Segfault Guy
ca5a96e979
Fix berry chomp sfx not playing for unrestricted berries when full.
2025-11-18 20:11:02 -05:00
dhi_holo
a2936ebcff
Berry Reorganisation
...
Reordered berries as Vera requested
2025-11-19 11:10:15 +10:00
Carmendar
81e5d830c6
Metagross walks once more & Jet handling expression tweak.
2025-11-18 18:38:02 -06:00
dhi_holo
4b09714ed5
Merge branch 'main' into nut-rition
2025-11-19 10:27:33 +10:00
Polymeta
fa4a4c7e51
Merge branch 'farming-simulator-2025' into 'main'
...
Allow villagers to plant hearty rice
See merge request cable-mc/cobblemon!2008
2025-11-19 00:25:29 +00:00
dhi_holo
493b8bbecf
Seasoning Tweaks
...
values are now what they should be, hopefully
2025-11-19 10:23:56 +10:00
Guilherme Pereira
9b519daff1
allow villagers to plant hearty rice
2025-11-18 21:02:10 -03:00
Guilherme Pereira
a5ba3e7084
buff roots
2025-11-18 19:23:38 -03:00
Guilherme Pereira
6d2d146543
sync combat behaviour
2025-11-18 19:17:13 -03:00
Landon
22d93cb92c
Merge branch 'navigator-performance' into 'main'
...
Performance optimizations for pathfinding
See merge request cable-mc/cobblemon!2006
2025-11-18 18:41:03 +00:00
Paul
5281dbd81c
Performance optimizations for pathfinding
2025-11-19 03:02:52 +10:00
Segfault Guy
8b863070fe
addressing MR comments
2025-11-18 11:20:07 -05:00
Paul
da1064772d
Fixed rattata cry crash
2025-11-19 01:59:00 +10:00
Landon
8ca1957a60
Merge branch 'ai-scrape' into 'main'
...
Scraped AI and Behaviors
See merge request cable-mc/cobblemon!1994
2025-11-18 12:51:11 +00:00
lion
cbab2b7e5c
Scraped AI and Behaviors
2025-11-18 12:51:10 +00:00
Landon
c47bd604d5
Merge branch 'wrong-land-shark' into 'main'
...
Prevent sharpedo from trying to swim on land
See merge request cable-mc/cobblemon!2003
2025-11-18 12:21:59 +00:00
Polymeta
63776ca7a0
added missing food colours and remove debug annotation
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-11-18 11:56:32 +00:00
Polymeta
c66c7170f6
Merge branch 'juice-tweaks' into 'main'
...
Fixed apricorn stat changes only applying when points are already assigned to that stat, adjusted flavour floor
See merge request cable-mc/cobblemon!2004
2025-11-18 10:00:03 +00:00
Paul
fb0bfb2d19
Merge remote-tracking branch 'origin/main'
2025-11-18 19:42:15 +10:00
Landon
0d87de157a
Merge branch 'implement_pokemon' into 'main'
...
Implemplemenation
See merge request cable-mc/cobblemon!2002
2025-11-18 09:35:33 +00:00
Paul
4189da0cc7
Merge remote-tracking branch 'origin/main'
2025-11-18 19:33:17 +10:00
Paul
662ccdc268
Removed unrefined sinister tea seasonings
2025-11-18 19:29:54 +10:00
Hiroku
6779995680
Merge branch 'evo_particles_fix' into 'main'
...
Claire Obscure Particles: Expedition 33
See merge request cable-mc/cobblemon!1997
2025-11-18 09:26:28 +00:00
Landon
c4b6cc7c00
Merge branch 'slowpoke-dex-fix' into 'main'
...
Fixed some dex display issues and fixed slowpoke appearance in dex
See merge request cable-mc/cobblemon!2001
2025-11-18 09:24:09 +00:00
Paul
07ef404518
Fixed apricorn stat changes only applying when points are already assigned to that stat, adjusted flavour floor
2025-11-18 19:13:04 +10:00
Landon Wills
4c8a8351ac
Prevent sharpedo from trying to swim on land
2025-11-18 04:06:57 -05:00
Carmendar
17f5ed03d0
poser/species tweaks.
2025-11-18 02:46:11 -06:00
Paul
a3d3c987bc
Fixed some dex display issues and fixed slowpoke appearance in dex
2025-11-18 18:34:46 +10:00
Carmendar
6db0567f03
Merge branch 'main' into implement_pokemon
2025-11-18 02:02:32 -06:00
Segfault Guy
3e89499588
Fix SocketShowdownService and custom showdown data registration.
2025-11-18 02:09:39 -05:00
Segfault Guy
7982034964
Fix missing optional ability activation langs.
2025-11-18 02:02:19 -05:00
Jackson Bowes
ac3628d907
Merge branch 'ufo-turning-and-head-rot-fix' into 'main'
...
Fix various bugs with riding.
See merge request cable-mc/cobblemon!1998
2025-11-18 00:32:11 -06:00
Segfault Guy
4a1e0020f7
remove redundant bag item
2025-11-18 01:10:12 -05:00
Segfault Guy
3c1486e45b
Implement volatile status curing berries and patch fullness conflict with restoration berries.
2025-11-18 00:36:11 -05:00
jackowes
4563770835
- fix nonJumping horses from falling through to Tpose when trying to jump. The in_air flag checks for the player.jumping flag so its true for a moment. Block this from being true when horse has no jump.
2025-11-17 23:00:13 -06:00
dhi_holo
c49eed3aaf
Initial value tweaks
2025-11-18 14:59:28 +10:00
jackowes
cc80f69c47
- Fix jet bug/mishap
...
- Fixed ride sounds not working in multiplayer
- Made the velocity threshold lower for ridesounds so that they can be heard in more 'normal' situations.
- Revert player head rotation changes for rollables.
2025-11-17 22:56:30 -06:00
Landon
128366f9c2
Merge branch '1.7-spawns-update' into 'main'
...
Updated spawns for Marill, Bidoof, Rufflet, and Tadbulb lines.
See merge request cable-mc/cobblemon!1996
2025-11-18 04:43:51 +00:00