Skip to content

Commit

Permalink
v2.8.3
Browse files Browse the repository at this point in the history
  • Loading branch information
smell-of-curry committed Dec 21, 2023
1 parent 8737446 commit e83694f
Show file tree
Hide file tree
Showing 750 changed files with 5,575 additions and 3,290 deletions.
62 changes: 11 additions & 51 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,52 +1,12 @@
**Update v2.8.1**
**Update v2.8.3**

- Updated Pokemon Animation Controller, to correctly animate per pokemon.
- Added new Backpack Model and animation
- Added new Applin Model
- Added new Arceus Animations
- Fixed Blaziken Animations
- Fixed Clefairy Animations
- New Eevee Model
- Fixed Ho-Oh Animations
- Added new Iron Moth Model
- Added new Jolteon Model
- Added new larvesta Model
- Added new Latios Model
- Added new Magcargo Model
- Added new Mankey Model
- Added new Quaquaval Model
- Added new Munchlax Model
- Added new Primeape Model
- Added new Pikachu Model
- Added new Mankey Model
- Added new Slither Wing Model
- Added new Vaporeon Model
- Added new Volcarona Model
- Added new Xurkitree Model
- Added new Professor Oak Model
- Pokemon now have dynamic animation rendering
- Added new icons to FontGlyph
- Added 3 new Bird shrines
- Added some new sounds and replaced broken ones
- Added new orb textures
- Added lots of new Shiny textures
- Redone the entire previous UI Rendering for the hud screen. Now is dynamic and has property saving.
- Added toedscool, tapukoko, toedscruel
- New ampharos Model
- new Chinchou model
- New electrode model
- new Gardevoir Model
- New kiela Model
- New Lanturn Model
- New Moltres model
- New Pidgey fly animation
- New ralts animation
- New tapukoko Model
- New voltorb Model
- New zapdos Model
- Fixed Zubat model
- Fixed battle logs text
- Fixed currency render
- Removed text on phone
- Changed var size for sidebar
- Added attack animations to pokemon
- Added new Ground Idle, Air Idle, and Water Idle Animations
- Update animations for all pokemon.
- Added Flaffy Model
- Added Mareep Model
- Added Miltank Model
- Added Natu Model
- Added Shiny Butterfree texture
- Added detective Pikachu texture
- Added shiny Quxly and shiny Quaxwell texture
- Fixed some offsets for chest server form
16 changes: 13 additions & 3 deletions animation_controllers/pokemon.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,26 @@
"initial_state": "default",
"states": {
"default": {
"animations": ["idle"],
"animations": [
{
"ground_idle": "query.is_on_ground"
},
{
"air_idle": "!query.is_on_ground && !query.is_in_water"
},
{
"water_idle": "query.is_in_water"
}
],
"transitions": [
{
"walking": "query.modified_move_speed >= 0.01 && query.is_on_ground && !query.is_in_water"
},
{
"swimming": "q.is_in_water"
"swimming": "query.modified_move_speed >= 0.01 && q.is_in_water"
},
{
"flying": "q.can_fly && !query.is_on_ground && !query.is_in_water"
"flying": "query.modified_move_speed >= 0.01 && q.can_fly && !query.is_on_ground && !query.is_in_water"
},
{
"sleeping": "q.is_sleeping"
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/abra.animation.json
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
}
}
},
"animation.abra.idle": {
"animation.abra.ground_idle": {
"loop": true,
"animation_length": 2,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/absol.animation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"format_version": "1.8.0",
"animations": {
"animation.absol.idle": {
"animation.absol.ground_idle": {
"loop": true,
"animation_length": 1,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/aerodactyl.animation.json
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@
}
}
},
"animation.aerodactyl.idle": {
"animation.aerodactyl.ground_idle": {
"loop": true,
"animation_length": 2.25,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/aipom.animation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"format_version": "1.8.0",
"animations": {
"animation.aipom.idle": {
"animation.aipom.ground_idle": {
"loop": true,
"animation_length": 1,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/alakazam.animation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"format_version": "1.8.0",
"animations": {
"animation.alakazam.idle": {
"animation.alakazam.ground_idle": {
"loop": true,
"animation_length": 2,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/ambipom.animation.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
}
}
},
"animation.ambipom.idle": {
"animation.ambipom.ground_idle": {
"loop": true,
"animation_length": 1,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/ampharos.animation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"format_version": "1.8.0",
"animations": {
"animation.ampharos.idle": {
"animation.ampharos.ground_idle": {
"loop": true,
"animation_length": 2.25,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/applin.animation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"format_version": "1.8.0",
"animations": {
"animation.model.idle": {
"animation.model.ground_idle": {
"loop": true,
"animation_length": 4,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/arbok.animation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"format_version": "1.8.0",
"animations": {
"animation.arbok.idle": {
"animation.arbok.ground_idle": {
"loop": true,
"animation_length": 2,
"override_previous_animation": true,
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/arcanine.animation.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
}
}
},
"animation.arcanine.idle": {
"animation.arcanine.ground_idle": {
"loop": true,
"animation_length": 1,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/arceus.animation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"format_version": "1.8.0",
"animations": {
"animation.arceus.idle": {
"animation.arceus.ground_idle": {
"loop": true,
"animation_length": 2,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/ariados.animation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"format_version": "1.8.0",
"animations": {
"animation.ariados.idle": {
"animation.ariados.ground_idle": {
"loop": true,
"animation_length": 1,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/armaldo.animation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"format_version": "1.8.0",
"animations": {
"animation.armaldo.idle": {
"animation.armaldo.ground_idle": {
"loop": true,
"animation_length": 1,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/articuno.animation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"format_version": "1.8.0",
"animations": {
"animation.articuno.idle": {
"animation.articuno.ground_idle": {
"loop": true,
"bones": {
"body": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/axew.animation.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
}
}
},
"animation.axew.idle": {
"animation.axew.ground_idle": {
"animation_length": 45.66667,
"bones": {
"torso": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/azelf.animation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"format_version": "1.8.0",
"animations": {
"animation.azelf.idle": {
"animation.azelf.ground_idle": {
"loop": true,
"animation_length": 1,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/azumarill.animation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"format_version": "1.8.0",
"animations": {
"animation.azumarill.idle": {
"animation.azumarill.ground_idle": {
"loop": true,
"animation_length": 2.5,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/azurill.animation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"format_version": "1.8.0",
"animations": {
"animation.azurill.idle": {
"animation.azurill.ground_idle": {
"loop": true,
"animation_length": 1.75,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/bastiodon.animation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"format_version": "1.8.0",
"animations": {
"animation.bastiodon.idle": {
"animation.bastiodon.ground_idle": {
"loop": true,
"animation_length": 1,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/bayleef.animation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"format_version": "1.8.0",
"animations": {
"animation.bayleef.idle": {
"animation.bayleef.ground_idle": {
"loop": true,
"animation_length": 2,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/beedrill.animation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"format_version": "1.8.0",
"animations": {
"animation.beedrill.idle": {
"animation.beedrill.ground_idle": {
"loop": true,
"animation_length": 1,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/bellossom.animation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"format_version": "1.8.0",
"animations": {
"animation.bellossom.idle": {
"animation.bellossom.ground_idle": {
"loop": true,
"animation_length": 1,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/bibarel.animation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"format_version": "1.8.0",
"animations": {
"animation.bibarel.idle": {
"animation.bibarel.ground_idle": {
"loop": true,
"animation_length": 1,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/bidoof.animation.json
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@
}
}
},
"animation.bidoof.idle": {
"animation.bidoof.ground_idle": {
"loop": true,
"animation_length": 2,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/blastoise.animation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"format_version": "1.8.0",
"animations": {
"animation.blastoise.idle": {
"animation.blastoise.ground_idle": {
"loop": true,
"animation_length": 2,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/blaziken.animation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"format_version": "1.8.0",
"animations": {
"animation.blaziken.idle": {
"animation.blaziken.ground_idle": {
"loop": true,
"animation_length": 2,
"override_previous_animation": true,
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/braixen.animation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"format_version": "1.8.0",
"animations": {
"animation.braixen.idle": {
"animation.braixen.ground_idle": {
"loop": true,
"animation_length": 2,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/brionne.animation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"format_version": "1.8.0",
"animations": {
"animation.brionne.idle": {
"animation.brionne.ground_idle": {
"loop": true,
"animation_length": 2,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/buizel.animation.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
}
}
},
"animation.buizel.idle": {
"animation.buizel.ground_idle": {
"loop": true,
"animation_length": 1,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/bulbasaur.animation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"format_version": "1.8.0",
"animations": {
"animation.bulbasaur.idle": {
"animation.bulbasaur.ground_idle": {
"loop": true,
"animation_length": 2,
"override_previous_animation": true,
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/buneary.animation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"format_version": "1.8.0",
"animations": {
"animation.buneary.idle": {
"animation.buneary.ground_idle": {
"loop": true,
"animation_length": 1,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/butterfree.animation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"format_version": "1.8.0",
"animations": {
"animation.butterfree.idle": {
"animation.butterfree.ground_idle": {
"loop": true,
"animation_length": 1,
"bones": {
Expand Down
2 changes: 1 addition & 1 deletion animations/pokemon/caterpie.animation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"format_version": "1.8.0",
"animations": {
"animation.caterpie.idle": {
"animation.caterpie.ground_idle": {
"loop": true,
"animation_length": 1,
"bones": {
Expand Down
Loading

0 comments on commit e83694f

Please sign in to comment.