jackowes
1ffb60d9d8
Test out keeping an entity at a certain distance in the field. Both a spring method and a field surface normal method.
2026-08-02 01:30:19 -05:00
jackowes
6bb878b937
cleanup after squashening
2026-08-01 13:26:45 -05:00
jackowes
83ffcede88
squash merge main
2026-08-01 13:24:28 -05:00
jackowes
b2d40bc41c
sdf tests
2026-08-01 13:03:31 -05:00
jackowes
3fccb07dba
First attempt at sticking force with gravity
2025-09-29 22:20:53 -05:00
jackowes
46dd628b16
sticking force whack but orientation seems fine. Maybe needs to be a bit more responsive? Sticking force likely needs to only apply when a certain distance away from it?
2025-09-28 22:45:42 -05:00
jackowes
676f5e63bd
pause on that
2025-09-28 15:29:00 -05:00
jackowes
6dd2d3aada
starting again
2025-09-28 15:28:56 -05:00
jackowes
e4e0846a24
Smooth out transition to rollables. Transition from rollables to non rollables is broken.
2025-09-28 15:27:12 -05:00
jackowes
7d70af44ba
WIP multi passenger rolling support (it works but will likely need a better smoothing function eventually)
...
Still to do:
- zero driver rotx and roty when mounting.
- Fix the odd camera transition when going from rollable to non rollable (kick out of rollable camera logic earlier probably)
- position logic for freelook camera is wrong in reverse 3rd person.
2025-09-27 23:59:39 -05:00
jackowes
7c8fcdcd48
Freelook support (position logic for 3rd person no view bob still needs fixed
2025-09-27 11:54:23 -05:00
jackowes
67684ff9e8
Merge branch 'main' into orientation-refactor
...
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/air/BirdBehaviour.kt
2025-09-24 21:32:45 -05:00
jackowes
7144aa8dce
split orientations
2025-09-24 21:31:14 -05:00
Polymeta
8ad443a4c5
Merge branch 'riding-behaviour-tweaks-four' into 'main'
...
Quick riding tweaks
See merge request cable-mc/cobblemon!1873
2025-09-24 21:31:07 +00:00
Jackson Bowes
0d1f9a0093
Quick riding tweaks
2025-09-24 21:31:07 +00:00
Polymeta
7587344cb4
Merge branch 'NavigationAndWanderTargetImprovements' into 'main'
...
NavigationAndWanderTargetImprovements
Closes #1693
See merge request cable-mc/cobblemon!1872
2025-09-24 21:24:48 +00:00
JPAKx4
7c3b17d841
Fix crash when you zoom in using a pokedex and begin rolling
2025-09-24 14:27:11 -05:00
jackowes
6801035c1d
messing around with some temp changes
2025-09-23 20:18:22 -05:00
JazzMcNade
2ba8062915
clean up
2025-09-23 01:36:14 -05:00
JazzMcNade
edc298bf64
Fixed water walkers targeting lava surfaces and vice versa
2025-09-23 01:32:57 -05:00
JazzMcNade
aa1158fcfe
Fixed null exception , fixed water walkers being unable to rise up in water.
2025-09-23 01:01:48 -05:00
JazzMcNade
ab40ae81c4
Merge branch 'main' into NavigationAndWanderTargetImprovements
2025-09-22 20:37:21 -05:00
dhi_holo
b5df1878ed
Update furfrou.json
...
Now can use shears from anything
2025-09-22 21:30:43 +10:00
dhi_holo
800965cb40
Tag!
...
Added support for the Brushes and Fertilizer item tags in the Interactions (brushes interaction tested with More Brushes and a small datapack to confirm correct behaviours)
2025-09-22 21:20:43 +10:00
Polymeta
b00f1d9352
fix typo in pokemon interactions
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-09-22 10:53:31 +01:00
Polymeta
a588cfadf8
Merge branch 'riding-scrape' into 'main'
...
Riding scrape
See merge request cable-mc/cobblemon!1869
2025-09-22 09:29:38 +00:00
Polymeta
43321d8872
licenses
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-09-22 10:07:19 +01:00
Hiroku
a5ea584b75
Merge branch 'held-item-datapack' into 'main'
...
Implemented user-driven held item effects
See merge request cable-mc/cobblemon!1811
2025-09-22 08:10:13 +00:00
Crater
6a9edc2e67
Implemented user-driven held item effects
2025-09-22 08:10:13 +00:00
Test
12377deff7
Merge branch 'dynlight-refactor' into 'main'
...
Number pushing and Dynlight betterments
See merge request cable-mc/cobblemon!1864
2025-09-22 07:47:42 +00:00
Paul
737ddd973b
Tiny cleanup stuff dw about it [skip-ci]
2025-09-22 15:16:25 +10:00
Test
d749b04261
fix cyclizar mount idle
2025-09-22 05:14:50 +00:00
Landon Wills
a62e5a6571
Revert Golurk changes
2025-09-21 18:54:27 -04:00
Landon Wills
0ec337ee6c
Scrape riding updates
2025-09-21 18:20:32 -04:00
Carmendar
08ea9378de
Dewgong ready to scrape.
2025-09-21 16:57:07 -05:00
Carmendar
c2bd21ab96
Merge branch 'main' into implement_pokemon
2025-09-21 11:42:32 -05:00
Paul
5db8ccfad4
Fixed various things about aprijuice ride boosts
2025-09-21 22:39:55 +10:00
Polymeta
aa206d386a
Merge branch 'stop-the-disco-spin' into 'main'
...
Fixed Pokémon spinning a bunch when re-calculating a path to a moving target, closes #1703
Closes #1703
See merge request cable-mc/cobblemon!1868
2025-09-21 10:11:11 +00:00
Paul
a235af6c01
Fixed fliers taking fall damage upon landing without a passenger, fixed rarely flying pokemon joining a herd and launching into space
2025-09-21 19:24:23 +10:00
Carmendar
a666a74a32
Slaking jump seat fix.
2025-09-21 03:22:51 -05:00
Carmendar
c285120ff4
Merge branch 'main' into implement_pokemon
2025-09-21 03:17:33 -05:00
Paul
dbd2890120
oop
2025-09-21 18:09:17 +10:00
Carmendar
a5db46cdc5
Rhyhorn line ready for scrape & ride overlays for Slaking.
2025-09-21 01:17:58 -05:00
Carmendar
765cf9b96a
Send in the bulls. (Tauros is ready to scrape.)
2025-09-21 01:12:38 -05:00
Paul
efe7952869
Fixed Pokémon spinning a bunch when re-calculating a path to a moving target, closes #1703
2025-09-21 14:29:30 +10:00
Carmendar
9e434de285
Implemented spicy chicken legs animations.
2025-09-20 22:11:22 -05:00
Carmendar
712fe2c250
Merge branch 'main' into implement_pokemon
2025-09-20 22:09:16 -05:00
Hiroku
5db5a2ed35
Merge branch 'root-bone-animations-in-riding' into 'main'
...
Root bone animations in riding
See merge request cable-mc/cobblemon!1866
2025-09-21 02:15:02 +00:00
Paul
49c96e6fc8
Merge remote-tracking branch 'origin/main'
2025-09-21 10:46:21 +10:00
Paul
d56c9a3f5a
put da aprijuice recipes back
2025-09-21 10:42:53 +10:00