Paul
|
60df079794
|
Improve performance of berry tree rendering by only rendering berries when they are on-screen
|
2023-08-12 18:43:50 +10:00 |
|
apion
|
1924862fcb
|
Fixed renderer again (please let this be the last time) and fixed pecha clipping
|
2023-08-12 00:45:00 -04:00 |
|
apion
|
dba3de83fa
|
Updated script to grab tint index values from asset repo, fixed renderer (Hiroku) and updated colors (again)
|
2023-08-11 19:48:09 -04:00 |
|
apion
|
df30a209a5
|
Once again, synced the mature tree model, berry textures, and berry geographies for berries 1-24 from the asset repo
|
2023-08-10 21:30:01 -04:00 |
|
apion
|
0fea0966c0
|
Added berry geographies
|
2023-08-10 19:53:25 -04:00 |
|
apion
|
727fc969fa
|
Hopefully fixed rendered?
|
2023-08-10 19:30:17 -04:00 |
|
apion
|
c17ae13578
|
Fixed typo
|
2023-08-10 16:17:45 -04:00 |
|
apion
|
8e09051bf7
|
Synced some textures from the asset repo, BerryBlockRenderer changes.
|
2023-08-10 15:58:27 -04:00 |
|
apion
|
4f03643840
|
Synced models for berries 12-24 to asset repo
|
2023-08-09 19:43:42 -04:00 |
|
apion
|
6cdab8f296
|
Updated models for berries 1-12 to the ones from the asset repo, add tints for berries 1-12
|
2023-08-09 16:28:57 -04:00 |
|
apion
|
fc1bade1d1
|
Fixed a few model typos, made berry foliage colors fall back to leaf colors
|
2023-08-09 14:31:39 -04:00 |
|
apion
|
544efc80d5
|
Update all berry data to come from the GDrive spreadsheets
|
2023-08-08 12:19:30 -04:00 |
|
apion
|
43fe97a6fe
|
Added a growth factor to berries affected by their current biome. Also added script to generate berry data from spreadsheet data
|
2023-08-08 12:02:25 -04:00 |
|
nlingebretson
|
965196da2e
|
Added placement data for berry trees 1-14
|
2023-08-06 13:36:35 -05:00 |
|
Paul
|
72c4cc0992
|
Undid battle debug stuff because I forgot, again
|
2023-08-05 17:10:47 +10:00 |
|
Paul
|
b0838e88fd
|
Put berries in the agriculture tab instead
|
2023-08-05 17:09:52 +10:00 |
|
Paul
|
925d7ce2dc
|
Added berry interaction + bag item effects, berry eat sound hook, berry eating lang, berries to creative tab
|
2023-08-05 17:08:00 +10:00 |
|
Paul
|
a4000a6c0f
|
Merge remote-tracking branch 'origin/main' into berry
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt
# common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
|
2023-08-04 11:19:50 +10:00 |
|
Licious
|
2e67e804a7
|
Merge branch 'healing-items' into 'main'
Added healing items / bag items
See merge request cable-mc/cobblemon!333
|
2023-07-31 12:01:18 +00:00 |
|
Landon
|
de58d11f9e
|
Added healing items / bag items
|
2023-07-31 12:01:17 +00:00 |
|
Paul
|
ede62cc049
|
Fixed some Pokémon having eyelids blending into their eyes in GUIs (gross)
|
2023-07-25 21:01:05 +10:00 |
|
Hiroku
|
ee92206b43
|
Merge branch '323-broken-spawn-file-spawns-random-species' into 'main'
Fixed name typos in the spawn_pool_world files result in any pokemon spawning
Closes #323
See merge request cable-mc/cobblemon!570
|
2023-07-25 09:29:33 +00:00 |
|
selfdot
|
e47dbd7b71
|
Fixed name typos in the spawn_pool_world files result in any pokemon spawning
|
2023-07-25 09:29:33 +00:00 |
|
Hiroku
|
3548ee1172
|
Merge branch '355-switch-menu-retains-species-name' into 'main'
Changed battle switch menu to show pokemon display name
Closes #355
See merge request cable-mc/cobblemon!571
|
2023-07-24 21:45:06 +00:00 |
|
David Sadler
|
e20eb6963f
|
Changed battle switch menu to show pokemon display name
|
2023-07-24 19:37:58 +01:00 |
|
Licious
|
0d8589daad
|
Merge branch 'ai-improvements' into 'main'
Various AI pathing improvements
See merge request cable-mc/cobblemon!568
|
2023-07-24 10:55:57 +00:00 |
|
Hiroku
|
69fd7f5b99
|
Various AI pathing improvements
|
2023-07-24 10:55:57 +00:00 |
|
Hiroku
|
52a6a51d5e
|
Merge branch 'main' into 'main'
Add player data store factory
See merge request cable-mc/cobblemon!565
|
2023-07-23 21:37:48 +00:00 |
|
Pedro Souza
|
7583e865ee
|
Add player data store factory
|
2023-07-23 21:37:47 +00:00 |
|
Hiroku
|
651ed9cbcf
|
Merge branch 'missing_messages' into 'main'
Missing messages
See merge request cable-mc/cobblemon!566
|
2023-07-23 21:33:26 +00:00 |
|
Lily
|
d45a654433
|
Missing messages
|
2023-07-23 21:33:26 +00:00 |
|
Hiroku
|
a69042d892
|
Merge branch 'ghost-bug-item-dupe-fix' into 'main'
Ghost bug item dupe fix
See merge request cable-mc/cobblemon!567
|
2023-07-21 23:28:01 +00:00 |
|
MoeBoy76
|
9007a75d69
|
Ghost bug item dupe fix
|
2023-07-21 23:28:01 +00:00 |
|
Hiroku
|
bbf9836212
|
Merge branch 'pc-upgrade-moar-ram' into 'main'
PC Recipe Update
See merge request cable-mc/cobblemon!559
|
2023-07-20 21:54:43 +00:00 |
|
dhi_holo
|
0b08044298
|
PC Recipe Update
|
2023-07-20 21:54:42 +00:00 |
|
Hiroku
|
e53aa10f79
|
Merge branch 'added-sounds' into 'main'
Renamed cries for the new system, added cries for Gen 9 starters and evos, made all ambients blank
See merge request cable-mc/cobblemon!564
|
2023-07-20 21:54:33 +00:00 |
|
Sterrezo
|
1393904bc0
|
Renamed cries for the new system, added cries for Gen 9 starters and evos, made all ambients blank
|
2023-07-20 21:54:33 +00:00 |
|
Paul
|
90d51385b3
|
Nicknaming fixes
|
2023-07-18 19:09:31 +10:00 |
|
Hiroku
|
960454794d
|
Merge branch 'cry-more' into 'main'
Implemented improved Pokémon cry system for battles and sendout, migrated Treecko and Pidgeot to it
See merge request cable-mc/cobblemon!563
|
2023-07-18 07:29:11 +00:00 |
|
Hiroku
|
0648185b38
|
Implemented improved Pokémon cry system for battles and sendout, migrated Treecko and Pidgeot to it
|
2023-07-18 07:29:11 +00:00 |
|
Lily
|
f6cbadff61
|
mulch can now be used on berry trees and removed using a shovel
|
2023-07-17 20:05:10 -04:00 |
|
Lily
|
e10e048e2c
|
Merge remote-tracking branch 'origin/main' into berry
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonBlockEntities.kt
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonBlocks.kt
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt
|
2023-07-16 20:18:05 -04:00 |
|
Licious
|
efb202070c
|
Merge branch 'main-patch-ce51' into 'main'
add mulch to creative inventory
See merge request cable-mc/cobblemon!560
|
2023-07-16 18:09:08 +00:00 |
|
Lily
|
23fdda700c
|
add mulch to creative inventory
|
2023-07-16 16:40:31 +00:00 |
|
Licious
|
67251d3724
|
Merge branch 'shedninja-ball-fix' into 'main'
make Shedninja be in the actualy Pokeball consumed when evolving from Nincada
See merge request cable-mc/cobblemon!558
|
2023-07-14 22:07:23 +00:00 |
|
MoeBoy76
|
9fba594ca5
|
make Shedninja be in the actualy Pokeball consumed when evolving from Nincada
|
2023-07-15 07:50:21 +10:00 |
|
Licious
|
967e714c37
|
Uncomment code used for debug.
|
2023-07-14 10:10:22 +01:00 |
|
Nick
|
8fac0e0697
|
Merge branch 'healing-machine-fixes' into 'main'
Healing machine rendering fixes
See merge request cable-mc/cobblemon!555
|
2023-07-13 21:42:42 +00:00 |
|
Licious
|
cdde54c483
|
Healing machine rendering fixes
|
2023-07-13 21:42:42 +00:00 |
|
Nick
|
59ea3bb3f4
|
Merge branch 'party-swap-click-sound' into 'main'
Add missing sound to the party swap icon.
Closes #350
See merge request cable-mc/cobblemon!554
|
2023-07-13 21:39:34 +00:00 |
|