Paul
|
80b8cebb19
|
Fully integrated smooth animation transitioning into move animations
|
2023-11-25 17:19:19 +10:00 |
|
Paul
|
b339081128
|
Merge remote-tracking branch 'origin/improved-transformed-parts' into move-animations
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/scheduling/SchedulingFunctions.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityState.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharizardModel.kt
|
2023-11-24 10:09:32 +10:00 |
|
Paul
|
3eccac861f
|
Migrated regular pose transitioning over to being a primary animation
|
2023-11-20 15:24:34 +10:00 |
|
Paul
|
7a85b0b690
|
Fixed dedicated transition animations not resetting the primary animation portion
|
2023-11-20 14:49:28 +10:00 |
|
Paul
|
1fe223c772
|
Comments are good
|
2023-11-20 11:57:46 +10:00 |
|
Paul
|
d89ccc110e
|
Merge remote-tracking branch 'origin/main' into improved-transformed-parts
|
2023-11-20 11:57:40 +10:00 |
|
Paul
|
72c337195a
|
Added the concept of a primary animation
|
2023-11-20 11:54:35 +10:00 |
|
Hiroku
|
b72af84c8c
|
Merge branch 'tooltip-fix' into 'main'
Tooltip fix
See merge request cable-mc/cobblemon!788
|
2023-11-20 00:32:18 +00:00 |
|
miasmus
|
a5ee270b8b
|
account for tooltips with only 1 element
|
2023-11-19 19:00:05 -05:00 |
|
miasmus
|
c08ef4247d
|
doing it this way cause the other way was bad
|
2023-11-19 18:24:47 -05:00 |
|
Hiroku
|
b1d11e8c22
|
Merge branch 'HOLDY2' into 'main'
Fixed some minor errors in the newly added dropps
See merge request cable-mc/cobblemon!787
|
2023-11-19 22:05:02 +00:00 |
|
Waldleufer
|
c1fb1379a9
|
Fixed some minor errors in the newly added dropps
|
2023-11-19 22:05:02 +00:00 |
|
Hiroku
|
5a220e0ef0
|
Merge branch 'implement_pokemon' into 'main'
Implemented Drifloon line and minor asset updates.
See merge request cable-mc/cobblemon!786
|
2023-11-19 22:01:03 +00:00 |
|
Hiroku
|
b379fc62b1
|
Merge branch 'Waldleufer/cry_checker_script' into 'main'
cry audio checker script
See merge request cable-mc/cobblemon!785
|
2023-11-19 21:55:53 +00:00 |
|
Waldleufer
|
d442e4e956
|
cry audio checker script
|
2023-11-19 21:55:53 +00:00 |
|
Tyzillion
|
bb22c22db9
|
added "implemented": true to the species.json for the new Pokemon implemented.
|
2023-11-19 10:33:58 -05:00 |
|
Tyzillion
|
e109a1d59f
|
Implemented Drifloon line, Updated Dodrio textures, updated aegislash_shiny texture, Updated models for Geodude line. Added emissives for Noctowl.
|
2023-11-18 22:12:23 -05:00 |
|
Hiroku
|
b34f8a045d
|
Merge branch 'null-safety-time' into 'main'
Fix to NullPointerException in PokemonOnShoulderHandler
Closes #677
See merge request cable-mc/cobblemon!783
|
2023-11-18 04:26:38 +00:00 |
|
Paul
|
866db464c4
|
Merge remote-tracking branch 'origin/main' into improved-transformed-parts
# Conflicts:
# CHANGELOG.md
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BeldumModel.kt
# common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
|
2023-11-18 13:40:36 +10:00 |
|
JPAKx4
|
4f79b9f8a7
|
Fix to https://gitlab.com/cable-mc/cobblemon/-/issues/677
|
2023-11-17 21:30:49 -06:00 |
|
Hiroku
|
b30a67651e
|
Merge branch 'VillagerCropInteractionFix' into 'main'
Fix for villagers not being able to pick and plant mint seeds, vivichoke seeds...
Closes #647
See merge request cable-mc/cobblemon!760
|
2023-11-18 01:43:10 +00:00 |
|
JazzMcNade
|
a1398e9495
|
Fixed capitalization.
|
2023-11-17 19:22:42 -06:00 |
|
Hiroku
|
ac03c68f41
|
Merge branch 'defaultIssueTemplate' into 'main'
Added a default Issue Template
See merge request cable-mc/cobblemon!769
|
2023-11-17 22:16:35 +00:00 |
|
Nick
|
0eb4b43b49
|
Merge branch 'updated-showdown' into 'main'
Updated Showdown version to latest master from Smogon
Closes #542
See merge request cable-mc/cobblemon!764
|
2023-11-17 21:18:05 +00:00 |
|
Hiroku
|
b49376dba5
|
Updated Showdown version to latest master from Smogon
|
2023-11-17 21:18:03 +00:00 |
|
Nick
|
81f6e7b786
|
Merge branch 'shuckle_milk' into 'main'
Added ability for Shuckles to be milked for Berry Juice
See merge request cable-mc/cobblemon!770
|
2023-11-17 21:17:28 +00:00 |
|
Plastered_Crab
|
574ee1ae4a
|
Added ability for Shuckles to be milked for Berry Juice
|
2023-11-17 21:17:27 +00:00 |
|
Nick
|
07a83f54a2
|
Merge branch 'HOLDY-lite' into 'main'
It's holding time
See merge request cable-mc/cobblemon!777
|
2023-11-17 19:41:59 +00:00 |
|
Jordan
|
6f3b530d7b
|
It's holding time
|
2023-11-17 19:41:59 +00:00 |
|
Nick
|
4b86dc1e58
|
Merge branch 'ability-optional-arguments' into 'main'
Implement method to properly handle showdown ability instructions with optional arguments.
Closes #499
See merge request cable-mc/cobblemon!778
|
2023-11-17 19:30:45 +00:00 |
|
JMMCP
|
bb141aee50
|
Implement method to properly handle showdown ability instructions with optional arguments.
|
2023-11-17 19:30:45 +00:00 |
|
Nick
|
acb473c01f
|
Merge branch 'Waldleufer/fixUndergroundSpawningAlgorithm' into 'main'
Underground Spawning Algorithm Improvements
See merge request cable-mc/cobblemon!737
|
2023-11-17 18:37:02 +00:00 |
|
Waldleufer
|
a8dc3f40a4
|
Underground Spawning Algorithm Improvements
|
2023-11-17 18:37:02 +00:00 |
|
Nick
|
b55f11628d
|
Merge branch 'Waldleufer/spawnSpreadsheetToCodeAutomation' into 'main'
Validated and corrected all Spawnfiles
See merge request cable-mc/cobblemon!755
|
2023-11-17 18:27:17 +00:00 |
|
Waldleufer
|
150c03d4f5
|
Validated and corrected all Spawnfiles
|
2023-11-17 18:27:17 +00:00 |
|
Nick
|
1c092588f4
|
Merge branch 'HealingWishUnfaintPostBattleFix' into 'main'
HealingWishUnfaintPostBattleFix
See merge request cable-mc/cobblemon!779
|
2023-11-17 18:19:11 +00:00 |
|
Hiroku
|
b34ca3d42b
|
Merge branch 'HealthBarUpdateOnDamageFix' into 'main'
Fix for health bars not updating when a pokemon takes damage from commit 132a43c5
See merge request cable-mc/cobblemon!775
|
2023-11-17 05:04:34 +00:00 |
|
Hiroku
|
e608dc84ae
|
Merge branch 'mongodb-timestamp' into 'main'
Added timestamp to MongoDB store to signify when the save was created.
See merge request cable-mc/cobblemon!781
|
2023-11-16 14:49:52 +00:00 |
|
navneetset
|
c987a5ba19
|
Added timestamp to MongoDB store to signify when the save was created.
|
2023-11-16 14:08:18 +01:00 |
|
Hiroku
|
d65090ce10
|
Merge branch 'main' into 'main'
Issue #699 - Fixed typo in Coba Berry tooltip.
See merge request cable-mc/cobblemon!780
|
2023-11-16 11:09:45 +00:00 |
|
Michael
|
206ec25a99
|
Issue #699 - Fixed typo in Coba Berry tooltip.
|
2023-11-16 03:22:47 -05:00 |
|
JazzMcNade
|
ccd376c055
|
Refactoring
|
2023-11-14 22:19:40 -06:00 |
|
JazzMcNade
|
6214fb1b97
|
The handleDamageInstruction inner dispatch is now placed at the head of the queue to make sure it stays ahead of the handleFaintInstruction dispatch.
|
2023-11-13 01:13:27 -06:00 |
|
JazzMcNade
|
a65cee3e24
|
Fix for health bars not updating when a pokemon takes damage from commit 132a43c5
|
2023-11-13 00:51:50 -06:00 |
|
Hiroku
|
9999a04692
|
Merge branch 'status-complete' into 'main'
added tab completion for Statuses
See merge request cable-mc/cobblemon!774
|
2023-11-13 06:29:19 +00:00 |
|
MoeBoy76
|
6901f3e43d
|
added tab completion for Statuses
|
2023-11-13 17:07:22 +11:00 |
|
Waldleufer
|
1a0135c1fd
|
Added a feature request issue template.
|
2023-11-12 10:25:44 +01:00 |
|
Waldleufer
|
23dab6546f
|
Added requested changes
|
2023-11-12 10:25:16 +01:00 |
|
Hiroku
|
3b94b6660c
|
Merge branch 'new_battle_fix' into 'main'
New 100+ Battle languages fixed
See merge request cable-mc/cobblemon!771
|
2023-11-12 08:55:05 +00:00 |
|
jeffw773
|
dc46c96ecf
|
Fixed merge conflicts
|
2023-11-12 00:33:00 -08:00 |
|