Licious
|
3042e83ecb
|
Removed leftover Geckolib dependency in Fabric and Forge metadata.
|
2022-05-02 10:33:55 +01:00 |
|
Hiroku
|
059bb261bf
|
Merge branch 'blockbench-formula-reader' into 'main'
Blockbench formula reader
See merge request cable-mc/pokemon-cobbled!77
|
2022-04-30 08:22:07 +00:00 |
|
Paul
|
cc990e80d0
|
Remove geckolib to merge to main
|
2022-04-30 13:25:20 +10:00 |
|
Paul
|
b1a6c85ec6
|
Fixed spawning and GUI bugs sponsored by Licious
|
2022-04-30 07:50:04 +10:00 |
|
Paul
|
7f7a9fb795
|
Finished the mappings conversion and added geckolib
|
2022-04-30 07:19:21 +10:00 |
|
Licious
|
eea4ad1d01
|
Finished Yarn remaps aside from Pokémon models.
|
2022-04-29 19:54:02 +01:00 |
|
Paul
|
94b426cb7f
|
Completed most of the work converting mappings from mojmaps to Yarn since needed for GeckoLib
|
2022-04-30 01:08:25 +10:00 |
|
Paul
|
999f12f446
|
Update Charizard model with bedrock animations, broken due to no interpreter
|
2022-04-28 22:06:45 +10:00 |
|
Paul
|
3a5cf183db
|
Fixed startup issues due to showdown
|
2022-04-27 18:33:19 +10:00 |
|
Paul
|
44faadf0c7
|
Enable showdown
|
2022-04-27 18:17:55 +10:00 |
|
Hiroku
|
4db4e1f26e
|
Merge branch '#68-challenge-pokemon' into 'main'
Challenge Pokémon using the send-out keybind
Closes #68
See merge request cable-mc/pokemon-cobbled!73
|
2022-04-25 11:40:42 +00:00 |
|
Paul
|
47aec2bb6a
|
Fix compile error from bad merge
|
2022-04-25 21:30:00 +10:00 |
|
Paul
|
c069bbf76a
|
Merge branch 'main' of gitlab.com:cable-mc/pokemon-cobbled into #68-challenge-pokemon
Conflicts:
common/src/main/kotlin/com/cablemc/pokemoncobbled/common/client/entity/PokemonClientDelegate.kt
|
2022-04-25 21:19:59 +10:00 |
|
Hiroku
|
4f0fe549f2
|
Merge branch '#50-rattata-line' into 'main'
#50 rattata line
See merge request cable-mc/pokemon-cobbled!74
|
2022-04-25 07:47:28 +00:00 |
|
Paul
|
5dbda70f06
|
Fix Raticate causing crashes because of blank hitbox
|
2022-04-25 17:36:36 +10:00 |
|
Paul
|
7ae965a61a
|
Rework singleplayer scheduling to prevent random thread-based crashes, AI improvements
|
2022-04-25 17:36:19 +10:00 |
|
Paul
|
8a0c20125d
|
Don't render party overlay when debug screen is rendering
|
2022-04-25 17:35:12 +10:00 |
|
Paul
|
0a51fafc9d
|
Completed the species JSONs for Rattata and Raticate
|
2022-04-25 10:08:20 +10:00 |
|
Paul
|
550cf4d8e1
|
Merge branch 'main' of gitlab.com:cable-mc/pokemon-cobbled into #50-rattata-line
Conflicts:
fabric/src/generated/resources/pokemoncobbled-common.accesswidener
|
2022-04-25 10:01:08 +10:00 |
|
Evan MacMillan
|
dc722d6714
|
Added Rattata and Raticate
|
2022-04-24 18:49:45 -04:00 |
|
Paul
|
0acfaffc50
|
Minor cleanup
|
2022-04-24 20:47:10 +10:00 |
|
Paul
|
4ea18fecd2
|
Fixed max HP calculation being incorrect
|
2022-04-24 20:42:07 +10:00 |
|
Paul
|
88c467863d
|
Changed the label prompting battle to be lang with keybind placeholder
|
2022-04-24 20:41:47 +10:00 |
|
Paul
|
4943f4c6c7
|
Mute the dummy battle, add |drag| handling for Whirlwind etc
|
2022-04-24 18:48:45 +10:00 |
|
Paul
|
19e95c13bf
|
Run a dummy battle on start up to improve performance of the first battle
|
2022-04-24 18:10:24 +10:00 |
|
Paul
|
5871f695a2
|
Improve battle start error handling and message construction
|
2022-04-24 18:09:06 +10:00 |
|
Paul
|
f77b65ba47
|
Fixed an issue with ally-affecting moves being selectable by the AI in single battles
|
2022-04-24 18:07:24 +10:00 |
|
Paul
|
9f2bea4e75
|
Synchronize health with the entity so that currentHealth = 0 kills the pokemon, link entity to battles
|
2022-04-24 12:00:11 +10:00 |
|
Paul
|
40396092e3
|
Pressing R while looking at a Pokémon starts a battle with it
|
2022-04-23 22:16:53 +10:00 |
|
Paul
|
e8e13fa54a
|
Added unsubscribeWhen ticker to subscriptions as a performance enhancing tool
|
2022-04-23 22:16:25 +10:00 |
|
Paul
|
4c0a109ce8
|
Merge branch 'main' of gitlab.com:cable-mc/pokemon-cobbled into #68-challenge-pokemon
|
2022-04-23 14:32:30 +10:00 |
|
Paul
|
5bc5e8a239
|
Significant work on battle building and rendering pokemon labels when they are looked at, smooth send out/recall
|
2022-04-23 14:19:44 +10:00 |
|
Hiroku
|
6522cf97b3
|
Fixed boot error caused by mismatch in architectury gradle plugin version
|
2022-04-23 04:15:25 +00:00 |
|
Hiroku
|
c186777b27
|
Merge branch '#74-shouldered-icons' into 'main'
Added shoulder indicators to party
Closes #74
See merge request cable-mc/pokemon-cobbled!71
|
2022-04-20 08:31:51 +00:00 |
|
Paul
|
76442b4055
|
Fixed pokemon state not syncing, fixed sizing of party state icons, properly handle state icons
|
2022-04-20 18:15:55 +10:00 |
|
Paul
|
302d6ff3f8
|
Merge branch 'main' of gitlab.com:cable-mc/pokemon-cobbled into #74-shouldered-icons
|
2022-04-20 17:36:35 +10:00 |
|
Hiroku
|
d78c7762ba
|
Merge branch '#77-move-learning' into 'main'
Added move learning / move relearning, updated summary GUI
Closes #77
See merge request cable-mc/pokemon-cobbled!72
|
2022-04-19 10:31:19 +00:00 |
|
Paul
|
bb8584b2d0
|
Fixed health not remaining at the same ratio after levelling up
|
2022-04-19 20:03:35 +10:00 |
|
Paul
|
5c525245fc
|
Added changing selected pokemon in summary UI, fixed max PP issue for new moves, fix benched moves not syncing
|
2022-04-18 22:20:22 +10:00 |
|
Paul
|
62967ab419
|
Added level-up moves to existing species JSONs
|
2022-04-18 17:23:53 +10:00 |
|
Paul
|
b506657da0
|
Updated summary UI assets and display and added move relearning, also added learning of moves during level-up, added /levelup and PP recovery on heal
|
2022-04-18 16:45:03 +10:00 |
|
Paul
|
b6e619da6b
|
Fixed runOnServer doing repetitive tasks instead of one-time runs, minor linting
|
2022-04-18 16:42:47 +10:00 |
|
Paul
|
e42676cbf6
|
Fixed experience message giving wrong xp value, added move learning from level up
|
2022-04-17 19:21:51 +10:00 |
|
Hiroku
|
4ef9433629
|
Merge branch '#76-healer-block' into 'main'
Added the healer block
See merge request cable-mc/pokemon-cobbled!70
|
2022-04-08 03:46:54 +00:00 |
|
Deltric
|
6bb70b5bcb
|
more changes
|
2022-04-07 22:35:54 -05:00 |
|
Deltric
|
e9464b872d
|
PR Feedback
should have addressed all PR feedback
|
2022-04-07 21:21:16 -05:00 |
|
Deltric
|
9f0f4f438d
|
tweaks
|
2022-04-06 04:56:32 -05:00 |
|
Deltric
|
1d26e1bca1
|
Added shoulder indicators to party
|
2022-04-05 05:10:00 -05:00 |
|
Deltric
|
ae70243fc9
|
Clear status with heal
|
2022-04-05 04:19:22 -05:00 |
|
Deltric
|
b268738a9d
|
Healing machine charge and render stuff and lang stuff and other stuff
|
2022-04-05 04:11:21 -05:00 |
|