Commit Graph
456 Commits
Author SHA1 Message Date
Qumoo adf63e4daf Proposed fix for Kotlin plugin 2022-02-16 14:54:06 +01:00
Paul acb70b01ae First run on setting up proper subprojects for Forge & Fabric, issues with Kotlin plugin and mixins (probably) 2022-02-16 21:46:52 +10:00
Hiroku 28a6b69f2a Merge branch 'main' into 'main'
Various Entity Behaviours

See merge request cable-mc/pokemon-cobbled!56
2022-02-15 11:17:54 +00:00
Chris Fusco 70bd5839d4 Various Entity Behaviours 2022-02-15 11:17:54 +00:00
Hiroku 6648dea8b7 Merge branch 'beam-fixes' into 'main'
Fix send-out location and Pokeball opening animation

See merge request cable-mc/pokemon-cobbled!55
2022-02-13 12:51:42 +00:00
Anne Ominous 21686694fe Fix Pokémon sending out on wrong block in negative coordinates 2022-02-13 05:45:53 -05:00
Anne Ominous c2e1c8a981 Fix Pokeball pointing wrong direction during capture 2022-02-13 05:40:31 -05:00
Paul 125c8ddc16 Merge remote-tracking branch 'origin/main' into main 2022-02-08 09:56:41 +10:00
Paul 7ef5838379 Fix encoding issue in moves jsons 2022-02-08 09:56:28 +10:00
Hiroku e01540c9a1 Merge branch '#11-shoulder-effects' into 'main'
#11 shoulder effects

Closes #11

See merge request cable-mc/pokemon-cobbled!48
2022-02-06 13:33:09 +00:00
Qumoo ea5d043de9 Missed removing one import :( 2022-02-04 00:08:21 +01:00
Qumoo c46cd3884a Missed one: shoulderEffect -> shoulderEffects 2022-02-03 23:55:12 +01:00
Qumoo fbd80f8ffd Proposed fix for Hiro's OCD (UUID.player() to UUID.getPlayer()) 2022-02-03 23:54:39 +01:00
Qumoo 1c47096818 shoulderEffect -> shoulderEffects 2022-02-03 23:52:39 +01:00
Hiroku c9b3832629 Merge branch '#52-add-pidgey-line' into 'main'
#52 add pidgey line

See merge request cable-mc/pokemon-cobbled!51
2022-02-01 23:57:39 +00:00
Qumoo c5ffcd46c9 SlowFall Potion effects resets the fall distance => Change to manually applying a different gravity 2022-02-02 00:30:13 +01:00
Qumoo 1527c275bd Switch to data class 2022-02-02 00:29:01 +01:00
Qumoo 02f9ff8bc4 Remove effects on player leave and apply them on join if the Pokemon is still ShoulderMounted 2022-02-02 00:28:52 +01:00
Qumoo 48120944f5 Use playerList#getPlayer(UUID) instead of searching the list manually 2022-02-02 00:28:16 +01:00
Qumoo d554046c25 Change to Pokemon instead of PokemonEntity² 2022-02-02 00:27:55 +01:00
Qumoo eac3f7bfde Change to Pokemon instead of PokemonEntity 2022-02-02 00:27:06 +01:00
Qumoo 677a76264a Added SlowFallEffect#onFallEnd 2022-01-30 22:08:50 +01:00
Qumoo 394d10a6fe Merge branch 'main' of https://gitlab.com/cable-mc/pokemon-cobbled into #11-shoulder-effects 2022-01-30 00:07:48 +01:00
Qumoo 165c3c56fb Moved Registry from Objects to classes, added SlowFallEffect and moved the effects to their own package 2022-01-30 00:06:33 +01:00
Qumoo abab74bdfb Move shoulderMountable to the according method 2022-01-29 21:57:53 +01:00
Qumoo 5835b6192e Add isLeft to ShoulderEffect 2022-01-29 20:11:22 +01:00
Luke 0979005fde applied animations to pidgeot & pidgeotto 2022-01-29 13:53:42 -05:00
Luke 1446946c9e pidgey progress 2022-01-29 10:10:08 -05:00
Luke 4fb154a74f updated pidgey line animations & scales 2022-01-29 07:58:42 -05:00
Luke 65baae46c3 Merge branch 'main' of https://gitlab.com/cable-mc/pokemon-cobbled into #52-add-pidgey-line 2022-01-29 07:23:58 -05:00
Paul 9c7b9efc2e Significantly improved pose transition so idles can play simultaneously, changed default transformTicks to 20 2022-01-29 16:05:10 +10:00
Luke 8614c4e7da pidgey animation progress 2022-01-29 00:49:05 -05:00
Luke 837f6968d6 updated pidgey animation 2022-01-28 20:06:00 -05:00
Luke a0a3c7f6e2 cleaned up pidgey line animations 2022-01-28 19:01:26 -05:00
Luke 8d0a73163a cleaned up pidgey line animations 2022-01-28 18:38:30 -05:00
Luke 59510d19eb cleaned up pidgey line animations 2022-01-28 18:17:57 -05:00
Qumoo fb10e9cd48 updated for ShoulderEffect test 2022-01-29 00:11:33 +01:00
Qumoo 5db3e3c0ce Add unregister by name 2022-01-29 00:11:07 +01:00
Qumoo b897b53281 Only load type and then pass to Effect to do the remaining serialization 2022-01-29 00:10:50 +01:00
Qumoo c4a31b8ec7 Add serialization to LightSourceEffect 2022-01-29 00:09:45 +01:00
Qumoo 70841252ca Made ShoulderEffect an Interface 2022-01-29 00:08:45 +01:00
Qumoo 8f3514311c add argument for EventBus 2022-01-29 00:08:00 +01:00
Luke 0617d85e3b cleaned up pidgey line animations 2022-01-28 18:00:15 -05:00
Luke a93fb939c6 added pidgey tree & rough animations 2022-01-28 09:43:52 -05:00
Paul 32eff0d98b Use spaces between keywords and parentheses you bloody primitives 2022-01-28 22:16:49 +10:00
Paul f60020ecb6 M-more gitignore 2022-01-28 19:45:00 +10:00
Paul a5fe83ea7a Corrected gitignore 2022-01-28 19:44:27 +10:00
Paul cd05135cfe Fixed move JSON encoding (Quuuuu!!!) and removed unneeded test, update gitignore 2022-01-28 19:39:50 +10:00
Paul ea45133efd Merge branch 'main' of https://gitlab.com/cable-mc/pokemon-cobbled into programatically-auto-extract-showdown-from-the-mod 2022-01-28 19:12:17 +10:00
Paul 71422bcaef Fixed showdown extraction 2022-01-28 17:55:24 +10:00