Commit Graph
3248 Commits
Author SHA1 Message Date
tyzillion b60f7ba22e Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into implement_pokemon
# Conflicts:
#	CHANGELOG.md
2023-06-15 21:09:28 -04:00
Paul 89bb983925 Restore changelog work overwritten by last merge 2023-06-16 11:02:15 +10:00
Hiroku de2dc38778 Merge branch 'added-sounds' into 'main'
Added cries for Gen 5-7 starters

See merge request cable-mc/cobblemon!491
2023-06-16 01:00:56 +00:00
Sterrezo fbcaa7353f Added cries for Gen 5-7 starters 2023-06-16 01:00:56 +00:00
Hiroku abf4f97f00 Merge branch 'interpreter_refactory' into 'main'
Battle window improvements and interpreter refactory

See merge request cable-mc/cobblemon!492
2023-06-16 00:56:37 +00:00
Hiroku a0736e550d Merge branch 'ys/waterlog-pc' into 'main'
implement waterloggable pc

See merge request cable-mc/cobblemon!496
2023-06-15 22:16:26 +00:00
Yaseen ea46a2973f implement waterloggable pc 2023-06-15 22:16:26 +00:00
Hiroku 26a9d8d07f Merge branch 'ys/draw-triangles-fix' into 'main'
Fix for stats hexagon

See merge request cable-mc/cobblemon!497
2023-06-15 22:09:08 +00:00
Yaseen 71bba4296b Fix for stats hexagon 2023-06-15 22:09:08 +00:00
Licious eb26ffa7ca Fixed being locked out of healing machines if it goes boom during use. 2023-06-15 22:45:21 +01:00
Hiroku 57a7dccd37 Merge branch 'tooltip-changes' into 'main'
Tooltip changes

See merge request cable-mc/cobblemon!494
2023-06-15 21:19:22 +00:00
Licious 5fa56177fc Tooltip changes 2023-06-15 21:19:22 +00:00
Hiroku d68d630175 Merge branch 'french-toast-is-better' into 'main'
Implement toast API

Closes #288

See merge request cable-mc/cobblemon!489
2023-06-15 10:06:04 +00:00
Licious 662ae77944 Implement toast API 2023-06-15 10:06:04 +00:00
Nick 469fb8dd52 Merge branch 'loot-table-appending' into 'main'
Implemented LootTable injection

Closes #217

See merge request cable-mc/cobblemon!490
2023-06-13 17:21:40 +00:00
Licious 371f2ac08a Implemented LootTable injection 2023-06-13 17:21:39 +00:00
Segfault Guy 3d20d7635b Add color to important langs. Refactor lang construction for -item, -enditem, and more. Broadcast ability activations. 2023-06-13 12:20:17 -04:00
Segfault Guy f67f8007fb Condense battle lang construction and fix lang inconsistencies 2023-06-13 10:34:00 -04:00
Segfault Guy a1516ecf10 Tweak dispatch timing to improve battle window flow 2023-06-13 10:30:31 -04:00
Segfault Guy 6c2ae912d1 Refactor all interpreter handlers to use BattleMessage system 2023-06-13 10:30:31 -04:00
DoctorWafflePhD c80ef7a8c0 Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon 2023-06-10 16:43:06 -05:00
DoctorWafflePhD 7bdc302583 Implemented Venipede, Whirlipede, and Scolipede. 2023-06-10 16:32:22 -05:00
DoctorWafflePhD 8de2a12323 Implemented sleeping bubbles onto the sleeping particle. 2023-06-10 07:07:43 -05:00
tyzillion 6004c153d3 Broke up with Validate Animations.
- ValidateAnimations.kt removed
Pipeline restored.
2023-06-09 23:58:13 -04:00
DoctorWafflePhD ac96ad3720 Implemented updated Falinks. 2023-06-09 01:03:38 -05:00
DoctorWafflePhD a06793616d Tweaked the sleeping particle a bit, and tweaked the position of the sleep locator on Vivillon and Bonsly. 2023-06-09 00:44:24 -05:00
DoctorWafflePhD 97f545bd4e Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon 2023-06-09 00:35:29 -05:00
Paul a267b63df2 Fixed Falinks torso name replacement insanity I wanna unalive 2023-06-09 15:35:05 +10:00
Paul ea9d961fd8 Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon 2023-06-09 09:00:48 +10:00
Paul 51396f94b1 Merge remote-tracking branch 'origin/main' into implement_pokemon 2023-06-09 08:59:25 +10:00
tyzillion 412dc73d9d "Sir, know why I pulled you over? No? Let me see your license. No? Well then I am gonna have to fail your pipeline. Sit tight."
Cacnea crash fixed and license updated.
2023-06-08 17:57:48 -04:00
DoctorWafflePhD c605e2d030 Tweaked the sleeping particle & made it exist on a special "particles" animation file so that any model may use it without having to edit every sleeping animation to include particle data. 2023-06-08 10:51:37 -05:00
DoctorWafflePhD d5c93b60a9 Implemented a proof-of-concept sleeping particle. Currently it only applies to Vivillon. 2023-06-07 11:44:13 -05:00
Hiroku 54c591b51f Merge branch 'maven-deployment' into 'main'
Add new maven deployment job

See merge request cable-mc/cobblemon!488
2023-06-07 07:57:55 +00:00
Paul 620ef585ce Changelog for trading completed. Closes #92 2023-06-07 17:56:07 +10:00
Paul 9601cf49ce Merge remote-tracking branch 'origin/main' into trading 2023-06-07 17:55:13 +10:00
Paul 56088e3a40 Make Nick happy 2023-06-07 17:52:56 +10:00
Nick 5b8149ce82 Add new maven deployment job 2023-06-06 21:02:46 -07:00
DoctorWafflePhD 7d8c6aef8e Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon 2023-06-06 21:57:02 -05:00
DoctorWafflePhD 3c593ea3ed Implemented (not-yet-officially-approved) Bonsly animations and made it a tad larger. Fixed a small issue with Cetitan's model rendering both mouths at once. Fixed a pivot point issue on Charcadet. Fixed an incorrectly-registered quirk on Alolan Exeggutor. 2023-06-06 21:39:10 -05:00
DoctorWafflePhD 5a7732588d Implemented Cetoddle and Cetitan. Touched up Glimmora's size. 2023-06-06 13:03:27 -05:00
DoctorWafflePhD 25488ae972 Implemented Bouffalant, and Cinderace remodel. Added missing "implemented" keys to Bonsly and Sudowoodo's species files. 2023-06-05 20:22:14 -05:00
tyzillion 4bf9733fe6 Implemented Cacnea, Cacturne, Nickit, Theivul, Duskull, Dusclops, and Dusknoir. 2023-06-05 21:19:45 -04:00
tyzillion 0672aebd61 Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon 2023-06-05 21:18:52 -04:00
Waffle 5db7d6380f Bonsly, Sudowoodoo, Glimmet, & Glimmora implemented. 2023-06-05 19:38:01 -05:00
Waffle 7f90a6ffec Huntail now uses the same "slithering" behavior as Ekans when on land. Doduo and Dodrio now walk significantly faster. 2023-06-05 19:36:52 -05:00
Waffle d45f0e382b Fixed incorrect hitbox and scaling of Kricketot and Kricketune. Kricketune is now shoulder-mountable. 2023-06-05 14:27:01 -05:00
tyzillion fab6d6e82d Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into implement_pokemon
# Conflicts:
#	CHANGELOG.md
2023-06-04 20:34:33 -04:00
Hiroku 332981a198 Update CHANGELOG.md [skip-ci] 2023-06-04 22:49:31 +00:00
Hiroku 5c026d7494 Merge branch 'add-persistent-data-to-pokemon' into 'main'
add Pokemon Persistent Data

See merge request cable-mc/cobblemon!484
2023-06-04 22:47:59 +00:00