 JazzMcNade
|
01ac831c24
|
Fixed soft locking after a switch event
|
2024-03-09 18:01:49 -06:00 |
|
|
JazzMcNade
|
adcccfee02
|
Fixed a bug in which during a forced switch event, the player would be requested to input actions on non-switching slots.
|
2024-03-07 23:56:47 -06:00 |
|
|
JazzMcNade
|
a97e8c819d
|
Switch menu tiles are now vertically offset from the lowest active pokemon tiles
|
2024-03-07 00:42:49 -06:00 |
|
|
JazzMcNade
|
4eeaf5102f
|
Added support for Ally Switch
|
2024-03-06 01:19:23 -06:00 |
|
|
JazzMcNade
|
d15307a809
|
The target menu now displays if a target is valid or not. Multitargeting is supported as well.
|
2024-02-25 17:13:42 -06:00 |
|
|
JazzMcNade
|
935fd53b70
|
Fixed pokemon positioning in doubles/triples. Fixed positioning in portraits/targeting. Added triples as a selectable battleType.
|
2024-02-24 14:00:52 -06:00 |
|
|
JazzMcNade
|
db33633406
|
Added sendout locations for doubles and triples first pass.
|
2024-02-23 02:12:19 -06:00 |
|
|
JazzMcNade
|
49095f73d5
|
Fainted Pokemon no longer display on the target selection. Added the ability to cancel the previous action in a double battle.
|
2024-02-22 00:17:20 -06:00 |
|
|
JazzMcNade
|
2ffe107789
|
Added primitive targeting. Fixed an issue in which the client would attempt to give orders to a fainted slot.
|
2024-02-18 23:47:01 -06:00 |
|
|
JazzMcNade
|
f2f6c3d0ef
|
Added UI endpoint to initiate a double battle. Added primitive battleFormat selection for BattleChallengePacket
|
2024-02-14 00:35:24 -06:00 |
|
 Nick
|
4217938ada
|
Merge branch 'move-animations' into 'main'
Simplistic move animations
See merge request cable-mc/cobblemon!871
|
2024-02-10 22:51:29 +00:00 |
|
 Hiroku
|
4c5f88db06
|
Simplistic move animations
|
2024-02-10 22:51:29 +00:00 |
|
|
Hiroku
|
cfd743c4c0
|
Merge branch 'armor_trims' into 'main'
oops
See merge request cable-mc/cobblemon!872
|
2024-02-10 02:11:35 +00:00 |
|
 Lily
|
1bbfc6dce5
|
Merge branch 'main' into armor_trims
|
2024-02-09 21:06:33 -05:00 |
|
|
Lily
|
6f2235c751
|
i swear if this doesn't work
|
2024-02-09 21:04:59 -05:00 |
|
|
Hiroku
|
50a0f2d858
|
Merge branch 'armor_trims' into 'main'
Added Automaton armor trim
See merge request cable-mc/cobblemon!868
|
2024-02-10 01:37:25 +00:00 |
|
|
Hiroku
|
27210512f6
|
Oops
|
2024-02-10 01:25:08 +00:00 |
|
|
Hiroku
|
53aa124de6
|
Merge branch 'main' into 'armor_trims'
# Conflicts:
# CHANGELOG.md
|
2024-02-10 01:24:45 +00:00 |
|
 Apion
|
a18b54849f
|
Merge branch 'FetusAnimsUpdate' into 'main'
Many updates, asset changes, and refactors for the fossil machine
See merge request cable-mc/cobblemon!863
|
2024-02-10 01:24:04 +00:00 |
|
|
Hiroku
|
c868c63a5f
|
Merge branch 'whatsy/evo_stone_blocks' into 'main'
added nether fire stone ore
See merge request cable-mc/cobblemon!867
|
2024-02-10 01:23:41 +00:00 |
|
|
Lily
|
31df7c92f4
|
remove leftovers from trim materials
|
2024-02-09 20:00:36 -05:00 |
|
|
Hiroku
|
3b65d1967e
|
Merge branch 'main' into 'whatsy/evo_stone_blocks'
# Conflicts:
# CHANGELOG.md
|
2024-02-10 00:16:06 +00:00 |
|
|
Paul
|
f30b15003f
|
Remove lingering oceanic trim references
|
2024-02-10 10:05:10 +10:00 |
|
|
Hiroku
|
c4c1b7ac27
|
Merge branch 'main' into 'armor_trims'
# Conflicts:
# CHANGELOG.md
|
2024-02-09 23:56:54 +00:00 |
|
|
Paul
|
ea9287cfb5
|
Fixed langs on interaction GUIs
|
2024-02-10 09:55:31 +10:00 |
|
|
Hiroku
|
02f845af5c
|
Merge branch 'amo/sendout-upgrade' into 'main'
Added generic bedrock entity system, updated molang for fix, added test evo...
See merge request cable-mc/cobblemon!869
|
2024-02-09 23:11:04 +00:00 |
|
|
Paul
|
3bb3a00cef
|
Renamed InteractionGUICreationEvent to PokemonInteractionGUICreationEvent
|
2024-02-10 08:28:31 +10:00 |
|
|
Paul
|
f1ae4163c9
|
Cleaned up transition portion of PokemonRender#render and removed glow effect we don't want anymore
|
2024-02-10 08:27:31 +10:00 |
|
|
Paul
|
05957f2106
|
Renamed GenericBedrockModelRepository to GenericBedrockEntityModelRepository for clarity
|
2024-02-10 08:03:50 +10:00 |
|
|
Paul
|
4b9ea1d4cd
|
Use an entity renderer for GenericBedrockEntities, obviously
|
2024-02-10 08:03:12 +10:00 |
|
|
Lily
|
78dff75db9
|
Update CHANGELOG.md
|
2024-02-09 16:46:56 -05:00 |
|
|
Lily
|
dbab6404a1
|
Update CHANGELOG.md
|
2024-02-09 16:45:48 -05:00 |
|
|
Paul
|
e5c4240ae0
|
Merge remote-tracking branch 'origin/main' into amo/sendout-upgrade
# Conflicts:
# CHANGELOG.md
# forge/src/main/kotlin/com/cobblemon/mod/forge/client/CobblemonForgeClient.kt
|
2024-02-09 20:22:27 +10:00 |
|
|
Paul
|
317112f9bb
|
Cleanup
|
2024-02-09 19:38:32 +10:00 |
|
|
Paul
|
58fda2e261
|
Changelog
|
2024-02-09 16:22:22 +10:00 |
|
|
Paul
|
3b442d387a
|
licenses good, pipeline errors bad
|
2024-02-09 16:04:53 +10:00 |
|
|
Paul
|
2b575c888f
|
Disable evo effect since it's not done yet
|
2024-02-09 14:15:58 +10:00 |
|
|
Paul
|
6e5e572412
|
Fixed some ball effects occurring even when snap-recalling before send out completes
|
2024-02-09 14:14:55 +10:00 |
|
|
Lily
|
ce87d0dc48
|
Merge branch 'main' into whatsy/nether_fire_stone
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/item/group/CobblemonItemGroups.kt
|
2024-02-08 23:10:14 -05:00 |
|
|
Lily
|
d43c91129c
|
implemented nether fire stone ore
|
2024-02-08 23:02:26 -05:00 |
|
|
Lily
|
d66b9c8d3b
|
removed unused assets, oceanic pattern to be redone/possibly scrapped
|
2024-02-08 22:51:05 -05:00 |
|
|
JazzMcNade
|
dc37b381a0
|
Review Changes: Refactored part of setStack into its own function
|
2024-02-07 21:17:56 -06:00 |
|
|
Lily
|
1206aaaf13
|
some updated textures
|
2024-02-07 21:13:12 -05:00 |
|
|
JazzMcNade
|
95bcb9a7b8
|
Most of the requested review changes
|
2024-02-06 23:28:15 -06:00 |
|
|
Lily
|
c7d879ec57
|
removed custom trim materials, added automaton and oceanic trim patterns
|
2024-02-06 19:03:37 -05:00 |
|
|
Nick
|
d5752982d7
|
Merge branch 'crystal_block' into 'main'
internal changes to tumblestones
See merge request cable-mc/cobblemon!865
|
2024-02-06 00:41:19 +00:00 |
|
|
Lily
|
f1439ec724
|
internal changes to tumblestones
|
2024-02-05 19:18:53 -05:00 |
|
|
Nick
|
0cac5714ac
|
Merge branch 'sherd_updates' into 'main'
added a missing sherd + added sherds to the vanilla ingredients tab
See merge request cable-mc/cobblemon!864
|
2024-02-05 22:45:46 +00:00 |
|
|
Lily
|
8529bb119f
|
added a missing sherd + added sherds to the vanilla ingredients tab
|
2024-02-05 17:24:44 -05:00 |
|
|
JazzMcNade
|
b68b3ad55e
|
Fossil Machine now stores return items of natural materials fed via hopper. Return items can be retrieved via hopper or by breaking the machine. Restoration Tank block can now be place on hoppers.
|
2024-02-04 18:35:23 -06:00 |
|