Sterrezo
367db9a368
Corrected subtitles for successful capture
...
Closes #1200
2024-11-26 17:53:16 +01:00
Hiroku
c95f4cb9ad
Merge branch 'implement_pokemon' into 'main'
...
Several fixes to some pokemon and redo of Magikarp jump forms to fit standards
Closes #1137
See merge request cable-mc/cobblemon!1329
2024-11-26 11:30:17 +00:00
Frank The Farmer
c0ccefd9b4
Several fixes to some pokemon and redo of Magikarp jump forms to fit standards
2024-11-26 11:30:17 +00:00
Nick
f45a1681fa
Merge branch 'pokerod-tooltip-changes' into 'main'
...
Add new tooltips for pokerods to show players how to add bait
See merge request cable-mc/cobblemon!1328
2024-11-25 21:09:40 +00:00
Plastered_Crab
12c820313a
Add lang files for adding and removing bait tooltips
2024-11-25 13:01:28 -08:00
Nick
e6b287434b
Merge branch 'off-hand-fishing-bait-changes' into 'main'
...
Changes to how offhand bait is applied to rod
See merge request cable-mc/cobblemon!1327
2024-11-25 20:13:38 +00:00
Nick
d39ee60158
Merge branch 'lucky-sea-rate-changes' into 'main'
...
Alter Luck of the Sea spawn bucket rates
See merge request cable-mc/cobblemon!1326
2024-11-25 20:12:05 +00:00
Plastered_Crab
d405ede256
Changes to how offhand bait is applied to rod
...
- only 1 bait from off hand is applied
- if bait is already on the rod when applying from offhand, bait is dropped from rod before applying bait from offhand
2024-11-25 11:29:19 -08:00
Nick
bbaf4332c6
Merge branch 'jumping-ancient-balls' into 'main'
...
Ancient Pokeball particles and animations.
See merge request cable-mc/cobblemon!1324
2024-11-25 19:20:20 +00:00
Tyzillion
954e690a20
Ancient Pokeball particles and animations.
2024-11-25 19:20:20 +00:00
Nick
0dda070c4c
Merge branch 'sound' into 'main'
...
Poke Ball sound overhaul
See merge request cable-mc/cobblemon!1319
2024-11-25 19:17:41 +00:00
Plastered_Crab
e855e0f1ae
Alter Luck of the Sea bucket rates
2024-11-25 10:13:36 -08:00
Hiroku
0515b3204b
Merge branch 'improve-dex-search' into 'main'
...
Add functionality to search by species, ability, or drops in dex
Closes #1129
See merge request cable-mc/cobblemon!1320
2024-11-25 12:00:28 +00:00
Test
049c0c308a
Add functionality to search by species, ability, or drops in dex
2024-11-25 12:00:27 +00:00
Hiroku
e424bd76b5
Merge branch 'sterr/npc-sound' into 'main'
...
Click sound in NPC dialogue now plays at the correct pitch
See merge request cable-mc/cobblemon!1325
2024-11-25 03:54:50 +00:00
Sterrezo
0443aa5109
Click sound now plays at the correct pitch. That float is in fact not the volume.
2024-11-25 04:45:44 +01:00
Hiroku
0f17d30ece
Merge branch 'Extreme-Tower-Makeover' into 'main'
...
Giving the Frozen Gimmi tower a new look & making it so Breezes sometimes...
See merge request cable-mc/cobblemon!1322
2024-11-23 10:39:20 +00:00
Hiroku
f54aed0953
Merge branch 'particle-packet-expansion' into 'main'
...
[1.6] Expand SpawnSnowstormEntityPacket capabilties to support non-posable entities at a basic level
See merge request cable-mc/cobblemon!1309
2024-11-23 10:37:18 +00:00
Slippy
2b5a16d30f
Giving the Frozen Gimmi tower a new look & making it so Breezes sometimes spawn on top instead of Evokers (Don't fall)
2024-11-23 02:11:03 -06:00
Slippy
f1ed9b010e
Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into 1.6-Bug-Testing
2024-11-23 01:58:17 -06:00
Paul
e8dcd994be
Fixed fish baits. Fished fix baits? Bished fix fates
2024-11-23 16:27:33 +10:00
Hiroku
da371fd940
Merge branch 'fishingrod-crash-fix' into 'main'
...
Fix drowned crashing game when holding fishing rod
See merge request cable-mc/cobblemon!1321
2024-11-23 05:56:47 +00:00
mia
0cdeab0800
check livingEntity instanceof Player before casting
2024-11-22 20:14:29 -05:00
Sterrezo
eca3c582aa
Added sounds for Poke Balls landing on the ground during capture, updated sounds with new iterations
2024-11-22 14:32:54 +01:00
Sterrezo
8dd09a2e14
Merge branch 'main' into sound
2024-11-22 13:16:41 +01:00
Hiroku
a96880b8ed
Merge branch 'more-npc-dakka' into 'main'
...
Added panic AI for NPCs and much more molang hooking
See merge request cable-mc/cobblemon!1303
2024-11-22 10:15:33 +00:00
Hiroku
40de8b3ab9
Merge branch 'dex-fix' into 'main'
...
Fix dex search crash + add text cursor functionality
Closes #1185
See merge request cable-mc/cobblemon!1317
2024-11-22 08:59:37 +00:00
Test
6eb814a7f0
Fix dex search crash + add text cursor functionality
2024-11-22 08:59:37 +00:00
Paul
2f2fd3b17e
Fixed a couple of molang functions, added level support and fixes to NPC spawn files
2024-11-22 17:21:20 +10:00
Hiroku
4234f9be67
Merge branch 'fishing_particles' into 'main'
...
Fishing Particles
See merge request cable-mc/cobblemon!1316
2024-11-22 06:46:43 +00:00
Tyzillion
f5766cdad4
Milliseconds? More like LITERAL TICKS. Lime disease...
2024-11-22 01:29:17 -05:00
Tyzillion
8c11ef9c00
System time? More like fishing time. Amiright?
2024-11-22 01:15:41 -05:00
Tyzillion
78ac8542f6
Added new particles to Poke fishing.
2024-11-22 00:51:55 -05:00
amo
bb574e58d8
Merge branch 'main' into particle-packet-expansion
2024-11-22 00:51:23 +00:00
amo
5c3c7b4195
🍋🟩 Chore: Oops! v2
2024-11-22 00:50:37 +00:00
Hiroku
ddec062e87
Merge branch 'experience-fix' into 'main'
...
Stops rewarding Pokemon EXP upon forfeiting NPC battles.
See merge request cable-mc/cobblemon!1278
2024-11-22 00:07:51 +00:00
Conan
3322f3ffb6
Changelog addition
2024-11-22 01:05:00 +01:00
Hiroku
ab1ec11c26
Merge branch 'sterr/bugfixes' into 'main'
...
Sound and music bugfixes
Closes #1161 and #1172
See merge request cable-mc/cobblemon!1299
2024-11-21 23:49:19 +00:00
Hiroku
36aaa97029
Merge branch 'small-bugfixes' into 'main'
...
Small bugfixes
Closes #1099 and #1156
See merge request cable-mc/cobblemon!1284
2024-11-21 23:48:39 +00:00
Hiroku
6b3443fbd2
Merge branch 'berries-tooltips' into 'main'
...
Add tooltips for Pomeg, Tamato, Grepa, Kelpsy, Hondew and Qualot berries
See merge request cable-mc/cobblemon!1308
2024-11-21 23:46:56 +00:00
Hiroku
268a1ab311
Merge branch 'feed-display-case-from-underneath' into 'main'
...
Add support for feeding display case items from underneath
Closes #1177
See merge request cable-mc/cobblemon!1307
2024-11-21 23:42:45 +00:00
Paul
40957b6eac
Added defaults to new PermissionValidator functions
2024-11-22 09:37:12 +10:00
Sterrezo
d67be68b4b
Changelog, updated break out animation (thanks Torch!), new break out sound for ancient Pokeballs
2024-11-22 00:29:52 +01:00
Hiroku
f6f34a2b10
Merge branch 'npc-no-pain-no-gain' into 'main'
...
Added NPC properties: isInvulnerable, isLeashable, and allowProjectileHits. (no pain no gain)
Closes #1179
See merge request cable-mc/cobblemon!1306
2024-11-21 23:18:28 +00:00
Hiroku
b2f71d305f
Update SpawnSnowstormEntityParticleHandler.kt
2024-11-21 23:12:05 +00:00
Hiroku
51a8c31997
Merge branch 'npc-kill-command' into 'main'
...
Added a command to delete NPCs
See merge request cable-mc/cobblemon!1315
2024-11-21 23:10:40 +00:00
Conan
67ae5ff155
Added a command to delete NPCs
2024-11-22 00:06:07 +01:00
Hiroku
9e0cf03d8e
Merge branch 'fix-mega-event-spelling-error' into 'main'
...
Fix spelling error in mega evolution event
See merge request cable-mc/cobblemon!1314
2024-11-21 22:13:25 +00:00
Conan
6a076d36f9
"isInvincible" != "isInvulnerable"
2024-11-21 20:28:54 +01:00
Sterrezo
4314a0b506
Major rework of Pokeball sound implementation and new sounds
2024-11-21 20:18:28 +01:00