Lily
|
1bf01a2826
|
more bar stuff
|
2023-11-30 15:16:32 -05:00 |
|
Lily
|
4d1bf677a1
|
bar color update
|
2023-11-29 21:49:06 -05:00 |
|
Lily
|
069f56acfd
|
gholdengo/gimmighoul are basically done, gilded chests still unfinished
|
2023-11-29 20:32:20 -05:00 |
|
Lily
|
19cdc8fbef
|
Merge remote-tracking branch 'origin/gimmighoul_gholdengo' into gimmighoul_gholdengo
|
2023-11-27 17:31:27 -05:00 |
|
Lily
|
1408b94f06
|
started on gilded chests
|
2023-11-27 17:31:17 -05:00 |
|
Paul
|
de081dc514
|
Added aspects support for int range features
|
2023-11-27 11:53:06 +10:00 |
|
Lily
|
1538f12934
|
more gimmighoul changes
|
2023-11-14 20:59:10 -05:00 |
|
Paul
|
857f67604c
|
Fixed some logic in held item event + gimmighoul item
|
2023-11-14 19:30:27 +10:00 |
|
Paul
|
ae49e3f977
|
Fixed gold materials data registry not being loaded
|
2023-11-14 19:18:45 +10:00 |
|
Lily
|
ec01a03820
|
pushed some stuff idk what to put here
|
2023-11-14 00:47:15 -05:00 |
|
Lily
|
96cc3671da
|
Merge branch 'held_item_event' into gimmighoul_gholdengo
|
2023-11-13 18:36:09 -05:00 |
|
Lily
|
ad7c9c560c
|
add an event for updating a pokemon's held item
|
2023-11-13 18:33:45 -05:00 |
|
Tyzillion
|
ee15ff6b35
|
Corrected Gimmighoul chest and roaming size.
|
2023-11-13 16:49:00 -05:00 |
|
Tyzillion
|
ca83103703
|
Bling, bling, every time I come around your city.
|
2023-11-13 16:33:07 -05:00 |
|
Tyzillion
|
1aeb894b09
|
Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into gimmighoul_gholdengo
|
2023-11-13 13:42:38 -05:00 |
|
Lily
|
8e9ab26963
|
json files for gold and netherite materials (doesnt work in-game yet)
|
2023-11-13 18:09:34 +00:00 |
|
Paul
|
44b4fbcfe3
|
Minor license thing
|
2023-11-13 20:04:29 +10:00 |
|
Paul
|
42cc1dd8a9
|
Upgraded species features so they can be synced and rendered in summary screen
|
2023-11-13 19:39:17 +10:00 |
|
Hiroku
|
9999a04692
|
Merge branch 'status-complete' into 'main'
added tab completion for Statuses
See merge request cable-mc/cobblemon!774
|
2023-11-13 06:29:19 +00:00 |
|
MoeBoy76
|
6901f3e43d
|
added tab completion for Statuses
|
2023-11-13 17:07:22 +11:00 |
|
Hiroku
|
3b94b6660c
|
Merge branch 'new_battle_fix' into 'main'
New 100+ Battle languages fixed
See merge request cable-mc/cobblemon!771
|
2023-11-12 08:55:05 +00:00 |
|
jeffw773
|
dc46c96ecf
|
Fixed merge conflicts
|
2023-11-12 00:33:00 -08:00 |
|
Hiroku
|
55861a249e
|
Merge branch 'augh-u-rite' into 'main'
More Augurite Usage
Closes #687
See merge request cable-mc/cobblemon!754
|
2023-11-12 03:28:42 +00:00 |
|
Hiroku
|
f00a569d9d
|
Merge branch 'main' into 'augh-u-rite'
# Conflicts:
# CHANGELOG.md
|
2023-11-12 02:40:29 +00:00 |
|
Hiroku
|
aaa5484752
|
Update CHANGELOG.md [skip-ci]
|
2023-11-12 01:38:44 +00:00 |
|
Hiroku
|
c6e82ebfb9
|
Merge branch 'fix-405-recall-visual-bug' into 'main'
Fix visual Pokemon recall bug
Closes #415 and #405
See merge request cable-mc/cobblemon!750
|
2023-11-12 01:37:19 +00:00 |
|
Hiroku
|
365844ae2e
|
Merge branch 'battle_text_fail_block' into 'main'
Added -fail and -block handlers to ShowdownInterpreter as well as added around...
See merge request cable-mc/cobblemon!753
|
2023-11-12 01:33:22 +00:00 |
|
Hiroku
|
c18c1f39fb
|
Merge branch 'main' into 'battle_text_fail_block'
# Conflicts:
# CHANGELOG.md
|
2023-11-12 01:09:42 +00:00 |
|
Hiroku
|
1fd2aa06ae
|
Merge branch 'EXP-Item-Pokemon-Select' into 'main'
Exp Candies - Party Pokemon Select
Closes #692
See merge request cable-mc/cobblemon!757
|
2023-11-11 22:55:31 +00:00 |
|
Hiroku
|
931852bd36
|
Merge branch 'alolanRatataFix' into 'main'
Fixed alolan Rattata animations
Closes #695
See merge request cable-mc/cobblemon!768
|
2023-11-11 19:48:25 +00:00 |
|
Waldleufer
|
272f429f59
|
Fixed alolan Rattata animations
|
2023-11-11 19:48:24 +00:00 |
|
Hiroku
|
6a5c6d2b17
|
Merge branch 'licious/190' into 'main'
Conditional held item consumption
Closes #190
See merge request cable-mc/cobblemon!767
|
2023-11-11 12:37:16 +00:00 |
|
Hiroku
|
618453caaa
|
Update CHANGELOG.md
|
2023-11-11 11:53:18 +00:00 |
|
Hiroku
|
e1d048ec9d
|
Merge branch 'main' into 'licious/190'
# Conflicts:
# CHANGELOG.md
|
2023-11-11 11:52:37 +00:00 |
|
Lily
|
d69310e52c
|
re-do the way the other stats screen draws stuff
|
2023-11-10 20:15:40 -05:00 |
|
Hiroku
|
26ebd23d14
|
Merge branch 'sound' into 'main'
Added cries to the Beldum line, tweaked Pikachu and Raichu cries
See merge request cable-mc/cobblemon!766
|
2023-11-11 01:07:05 +00:00 |
|
Lily
|
a0f89274d1
|
started work on SummaryValue properties (CW: messy, incomplete systems)
|
2023-11-10 18:57:11 -05:00 |
|
Paul
|
b446415200
|
Fixed minor position error in new pokeball animations
|
2023-11-11 09:45:47 +10:00 |
|
jeffw773
|
ed8fe19dc1
|
Fixed redundancies, added shared langs for a few moves, and fixed red formatting for fail lang.
|
2023-11-10 15:30:11 -08:00 |
|
dhi_holo
|
e674b042d0
|
Nerfed Obsidian
reduced crafting to output 1 because it makes more sense
|
2023-11-11 08:49:21 +10:00 |
|
dhi_holo
|
53abb58ae6
|
Merge branch 'main' into augh-u-rite
|
2023-11-11 08:47:01 +10:00 |
|
Sterrezo
|
17fed9662c
|
Merge branch 'main' into sound
|
2023-11-10 21:38:28 +01:00 |
|
Sterrezo
|
74dd2a6c0d
|
Added cries to the Beldum line, tweaked Pikachu and Raichu cries
|
2023-11-10 21:38:11 +01:00 |
|
Lily
|
02067929a2
|
add advancement for obtaining a fossil item
|
2023-11-10 18:46:31 +00:00 |
|
Lily
|
0bc3e8465b
|
finish list of fossil machine fuels
|
2023-11-10 18:37:01 +00:00 |
|
Stephen White
|
7505ce15e3
|
Merge remote-tracking branch 'upstream/main' into fix-405-recall-visual-bug
|
2023-11-10 12:27:43 -04:00 |
|
Lily
|
0ebf5712b9
|
add item tag for fossil items
|
2023-11-10 16:04:02 +00:00 |
|
Lily
|
4020e28da9
|
add recipes to fossil machine blocks
|
2023-11-10 15:37:13 +00:00 |
|
Charzard4261
|
30ba97ea69
|
Merge remote-tracking branch 'origin/EXP-Item-Pokemon-Select' into EXP-Item-Pokemon-Select
|
2023-11-10 14:15:20 +00:00 |
|
Charzard4261
|
5fee2df9f7
|
Added a missing POKEMON_INTERACT trigger in PokemonSelectingItem, when successfully using an Item on a Pokemon out of battle.
|
2023-11-10 14:14:53 +00:00 |
|