JPAK
b9675ef25c
Wrap PlayerRenderer properly now.
2025-02-07 20:29:08 -06:00
apion
e25802ab74
Changed bird controller so movement is dependent on pitch and roll
2025-02-07 18:46:55 -05:00
Paul
fdc9d48bd6
Reworking generic liquid controller
2025-02-03 18:54:33 +10:00
Paul
74dcbc3e17
Added optional player animations to riding (Lapras as example)
2025-02-01 19:09:51 +10:00
Paul
832999850e
Wait put that back
2025-02-01 17:35:42 +10:00
Paul
93b0f40c80
Added vehicle land controller (REVAVROOOOM)
2025-02-01 17:35:14 +10:00
Paul
d1928f5b43
Added fall_to_flight controller and polished gliding on Gliscor
2025-02-01 10:22:55 +10:00
Paul
5374fe251d
Merge branch 'main' into means-of-transportation
...
# Conflicts:
# common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json
# common/src/main/resources/data/cobblemon/species/generation1/charizard.json
# common/src/main/resources/data/cobblemon/species/generation1/lapras.json
# common/src/main/resources/data/cobblemon/species/generation4/bidoof.json
# common/src/main/resources/data/cobblemon/species/generation4/gliscor.json
2025-01-31 20:55:59 +10:00
Hiroku
36169db388
Merge branch 'feature/save-file-juggling' into 'main'
...
old and temp files for everyone
See merge request cable-mc/cobblemon!1484
2025-01-31 07:46:10 +00:00
Paul
1900999a74
Changelogging [skip-ci]
2025-01-31 17:41:56 +10:00
Hiroku
ab16814cd2
Merge branch 'fix-setpageondefaultdialoguepage' into 'main'
...
fix: calling setPages() when initializing the dialogue so default pages can have their timeout scheduled
Closes #1406
See merge request cable-mc/cobblemon!1504
2025-01-31 07:41:29 +00:00
Hiroku
9f622fcd74
Merge branch 'pc-box-2-fix' into 'main'
...
Fix PC opening on Box 2
See merge request cable-mc/cobblemon!1505
2025-01-31 07:40:16 +00:00
Hiroku
956e2c43b8
Merge branch 'feat-winners-and-losers' into 'main'
...
feat: set winners and losers on PokemonBattle end
See merge request cable-mc/cobblemon!1501
2025-01-31 07:37:14 +00:00
Hiroku
130f87c9f7
Merge branch 'strip-stripped-log' into 'main'
...
remove apricorn_stripped_log and apricorn_stripped_log_top as never used
See merge request cable-mc/cobblemon!1502
2025-01-31 07:27:54 +00:00
gbassinello
22b4e8c75f
chore: changelog lines
2025-01-31 01:44:50 -03:00
gbassinello
c19a3ca444
feat: set winners and losers on battle end
2025-01-31 01:44:50 -03:00
Polymeta
a006eb5dcc
revert previous attempt and fix camera mode
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-01-31 01:44:50 -03:00
gbassinello
ed419e7e53
fix: removing activeDialogues from the DialogueManager map using the correct key (player uuid)
2025-01-31 01:44:50 -03:00
Hiroku
bff2387b4d
Merge branch 'feature/particle-fixes' into 'main'
...
revert previous attempt and fix camera mode
See merge request cable-mc/cobblemon!1506
2025-01-31 04:02:00 +00:00
Polymeta
41544efeba
revert previous attempt and fix camera mode
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-01-30 23:15:08 +00:00
Paul
e6e6c9f7f6
Merge remote-tracking branch 'origin/main'
2025-01-31 08:31:31 +10:00
Paul
22d8e39db3
back to snapshots
2025-01-31 08:31:17 +10:00
Hiroku
bfdf1e9e6c
Merge branch 'fix-activedialoguesmapkey' into 'main'
...
fix: removing activeDialogues from the DialogueManager map using the correct key (player uuid)
Closes #1405
See merge request cable-mc/cobblemon!1503
2025-01-30 22:19:22 +00:00
BuildTools
c3fccfde09
Fix PC opening on Box 2 because default value for 'box' in OpenPCPacket was '1' instead of '0'
2025-01-30 21:48:18 +02:00
gbassinello
4bb8d43a6e
fix: calling setPages() when initializing the dialogue so default pages can have their timeout scheduled
2025-01-30 13:50:18 -03:00
gbassinello
fda4b67776
fix: removing activeDialogues from the DialogueManager map using the correct key (player uuid)
2025-01-30 13:34:52 -03:00
Xander Forrest
f1ee9d45de
remove apricorn_stripped_log and apricorn_stripped_log_top as never used
2025-01-28 19:39:28 +00:00
Polymeta
01f7d13e3f
update tag and preset list [skip-ci]
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-01-26 21:32:32 +00:00
Paul
d85e30f3a6
But what if we didn't break the yarn mapping
2025-01-26 22:15:17 +10:00
Paul
e6f147bd94
Changelog [skip-ci]
1.6.1
2025-01-26 09:34:42 +10:00
Paul
c66de51e39
Snapnoshot
2025-01-26 08:53:26 +10:00
Hiroku
7d552735f3
Merge branch 'implement_pokemon' into 'main'
...
Wobbuffix (and charcadet)
See merge request cable-mc/cobblemon!1500
2025-01-25 22:32:19 +00:00
Carmendar
94c42e7e2c
Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon
2025-01-25 16:27:21 -06:00
Carmendar
ef4690d4fe
Wobbuffet -w-
2025-01-25 16:26:48 -06:00
Polymeta
433c0ff345
Merge remote-tracking branch 'refs/remotes/origin/lang-updates'
2025-01-25 21:00:42 +00:00
FrankTheFarmer
59d42fb328
Updated Charcadet's eye height. Git being dumb
2025-01-26 06:19:18 +10:00
Gustavo Puerari
17d6837e34
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 42.1% (2695 of 6391 strings)
Translation: Cobblemon/Mod
Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/pt_BR/
2025-01-25 10:01:29 +00:00
Carmendar
34b4337849
Updated Eiscue Noice lang
2025-01-25 03:14:00 -06:00
Paul
392e8663be
Merge remote-tracking branch 'origin/main'
2025-01-25 14:29:28 +10:00
Paul
578ff37705
More tweaks to bucket jumps for luck of the sea enchants
2025-01-25 14:29:18 +10:00
Hiroku
77406f91a3
Merge branch '1.6.1-spawns' into 'main'
...
Fixes to some spawns and tags.
See merge request cable-mc/cobblemon!1498
2025-01-25 02:08:20 +00:00
Polymeta
9bf526e93e
deleted typo'd amoonguss file
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-01-25 02:00:33 +00:00
Veraxiel
29b763ef19
Updated spawns and tags.
2025-01-24 20:40:50 -05:00
Polymeta
938b7a7a94
flip UVs to make particle sprite point the other direction
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-01-25 01:38:00 +00:00
Paul
f920639e3f
Protect luck of the sea adjustments against custom buckets
2025-01-25 11:35:10 +10:00
Paul
ea499a935e
Updated fishing bucket rates
2025-01-25 11:02:58 +10:00
Hiroku
1dbe5eb944
Merge branch 'npc-hide-nametag' into 'main'
...
Added hideNameTag field for NPCs
See merge request cable-mc/cobblemon!1488
2025-01-25 00:47:59 +00:00
Paul
dba0bae810
Corrected luck of the sea bucket weights and simplified calculation code
2025-01-25 10:37:19 +10:00
Paul
8c04081af5
Fixed uncaught exception from fishing reeling in blocked entity spawns
2025-01-25 10:00:50 +10:00
Hiroku
d7de4b2463
Merge branch 'test/fix_targeting_variant' into 'main'
...
Fix default form in battle targeting
Closes #1376
See merge request cable-mc/cobblemon!1496
2025-01-24 22:58:15 +00:00