Landon Wills
3061ba69e2
Riding momentum is maintained when window is not active
2025-04-11 03:17:26 -04:00
Landon Wills
741e38d606
Fix issue where same-species pokemon will sync animations on multiplayer environments
2025-04-11 02:01:28 -04:00
Landon Wills
02f2c072c9
Fix issues with pre-animation logic
2025-04-11 01:29:49 -04:00
Polymeta
c54849f415
Merge branch 'implement_pokemon' into 'main'
...
Few mons added for testing
See merge request cable-mc/cobblemon!1595
2025-04-10 13:46:35 +00:00
Frank The Farmer
d44e625e9d
Few mons added for testing
2025-04-10 13:46:35 +00:00
Polymeta
6a74d5982a
Merge branch 'more-riding-tweaks' into 'main'
...
Riding tweaks / fixes
See merge request cable-mc/cobblemon!1594
2025-04-10 09:13:32 +00:00
Landon Wills
03905c77d2
Add license
2025-04-10 03:12:53 -04:00
Landon Wills
da9558f5f9
Fix camera riding momentum not occurring when in chat or screens
2025-04-10 01:40:44 -04:00
Landon Wills
5c65dffac8
Improve rendering of ridden pokemon substantially on low or inconsistent FPS
2025-04-09 23:36:21 -04:00
Landon Wills
b67b37c99e
Fix some issues with merge
2025-04-09 22:54:23 -04:00
Landon Wills
fbb7ee31c5
Merge branch 'refs/heads/main' into water-mount-behaviours
2025-04-09 22:38:45 -04:00
Polymeta
d3ef26976b
Merge branch 'composite-behaviour-refactor' into 'main'
...
Composite behaviour refactor
See merge request cable-mc/cobblemon!1584
2025-04-09 15:58:55 +00:00
Landon Wills
dac01a3730
Fix issue with crashing on packet decode before player is initialized
2025-04-09 03:30:55 -04:00
Landon Wills
ddb05768e4
Remove redundant riding behaviour, rename ride style option from misc to composite
2025-04-09 03:17:31 -04:00
Polymeta
5374940d24
Merge branch 'spicy-molang' into 'main'
...
Added `spawn_pokemon` and `attempt_wild_battle` as available MoLang functions
Closes #1237
See merge request cable-mc/cobblemon!1586
2025-04-09 07:13:00 +00:00
Spicy
1fd6a660dd
Added spawn_pokemon and attempt_wild_battle as available MoLang functions
2025-04-09 07:13:00 +00:00
Landon Wills
fd45934775
Fix issue with canRide condition, remove duplicate riding config in aerodactyl
2025-04-09 03:09:04 -04:00
Polymeta
5e0ffd8bd3
Merge branch 'josh/item-molang-fixes' into 'main'
...
Small fixes for molang functions related to item rendering.
See merge request cable-mc/cobblemon!1590
2025-04-08 16:02:48 +00:00
Josh
b4b315360d
Small fixes for molang functions related to item rendering.
2025-04-08 16:02:48 +00:00
Polymeta
a44c70648b
actually return held item to player again
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-04-08 16:07:20 +01:00
Polymeta
c41b0cdca2
Merge branch 'negative-config-values' into 'main'
...
Allow negative numbers in config GUI
See merge request cable-mc/cobblemon!1588
2025-04-08 12:01:45 +00:00
lion
88f743ee48
Allow negative numbers in config GUI
2025-04-08 12:01:44 +00:00
Polymeta
15b9afacf8
remove client logic from common code MoLang functions
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-04-08 12:59:36 +01:00
Polymeta
babcf7430b
don't error when heldItem nbt is not present
...
Closes #1505
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-04-08 11:38:05 +01:00
Polymeta
3439ca2011
[skip-ci] fix tag docs formatting
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-04-08 10:55:48 +01:00
Polymeta
6539f3dea1
Merge branch 'josh/3d-wearable-items' into 'main'
...
Start of wearable item implementation.
See merge request cable-mc/cobblemon!1579
2025-04-08 09:16:24 +00:00
Landon Wills
1677598ec0
Merge branch 'refs/heads/main' into water-mount-behaviours
...
# Conflicts:
# common/src/main/java/com/cobblemon/mod/common/mixin/client/CameraMixin.java
2025-04-08 01:36:01 -04:00
Landon
fcde1eb171
Merge branch 'hitbox-and-hit' into 'main'
...
Position hitbox on client to be accurate to the locator and make looking at...
See merge request cable-mc/cobblemon!1589
2025-04-08 03:26:26 +00:00
Josh
a30a5644df
Okay, this is it this time for real
2025-04-07 23:03:30 -04:00
JPAK
a5672a38b9
Switch to using delegates to position riders.
2025-04-07 21:37:42 -05:00
JPAK
3b14ea319b
Position hitbox on client to be accurate to the locator and make looking at stuff align to the camera.
2025-04-07 21:12:01 -05:00
Landon Wills
57e2765f90
Clean up some method signatures in CameraMixin
2025-04-07 21:57:20 -04:00
Josh
a090c90831
Merge branch 'main' into josh/3d-wearable-items
2025-04-07 20:55:41 -04:00
Josh
5dcc9ba46d
Edit CHANGELOG.md
2025-04-07 21:21:05 +00:00
Josh
f8e4ea70df
Removed debug models.
2025-04-07 17:09:15 -04:00
Josh
5dc1c749f3
Replaced WearableItemModel enum with WearableItem class. Instances of this class should have a corresponding 3D model in models/item/wearable/
2025-04-07 16:35:46 -04:00
Polymeta
3accfa29b7
Merge branch 'josh/joint-transform-command' into 'main'
...
Changed command "changejointscale" into "transformmodelpart". Allows you to easily add model transformations in-game.
See merge request cable-mc/cobblemon!1587
2025-04-07 17:18:56 +00:00
Josh
1af1569f63
Updated CHANGELOG.md
2025-04-07 11:13:27 -04:00
Polymeta
dbd2f5d340
Merge branch 'implement_pokemon' into 'main'
...
Implemented many pokemon
See merge request cable-mc/cobblemon!1585
2025-04-07 09:35:47 +00:00
Frank The Farmer
86bf413f00
Implemented many pokemon
2025-04-07 09:35:46 +00:00
Landon
f13e7d03a1
Merge branch 'camera-changes-third-person' into 'main'
...
Riding Third Person Camera
See merge request cable-mc/cobblemon!1582
2025-04-07 02:51:07 +00:00
Jordan
4a025ac65e
Riding Third Person Camera
2025-04-07 02:51:07 +00:00
Josh
8a0c98c9ab
Renamed command to transformmodelpart
2025-04-06 18:58:13 -04:00
Josh
36c5fe2419
Properly display name of model part.
2025-04-06 18:52:15 -04:00
Josh
0c79d102cf
Changed changejointscale command into transformpartcommand with can cahnge the position rotation and scale of any joint on a model.
2025-04-06 18:31:39 -04:00
Polymeta
b14b25ae19
Merge branch 'SaferSendouts' into 'main'
...
Safer sendouts
See merge request cable-mc/cobblemon!1458
2025-04-06 20:58:09 +00:00
Josh
bd8f644b9a
Add scaling as an option when creating transformedParts
2025-04-06 10:56:10 -04:00
Josh
7c84cdb05d
transformedParts must add to the model part rather than replacing it with set()
2025-04-06 10:54:00 -04:00
Landon Wills
0293c0e811
Update licenses
2025-04-06 04:02:10 -04:00
Landon
125975e25f
Merge branch 'item-with-components-swap' into 'main'
...
Fixed not being able to swap held item of the same type, but have different components.
See merge request cable-mc/cobblemon!1580
2025-04-06 05:42:42 +00:00