mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
Compare commits
89 Commits
6.2.4
...
whirlIslan
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5657d28c78 | ||
|
|
984d30d912 | ||
|
|
5fde2bbc1a | ||
|
|
743367f514 | ||
|
|
f6fb6ff545 | ||
|
|
fdd672c0de | ||
|
|
7a2978a329 | ||
|
|
0e42591bfd | ||
|
|
028c6d1442 | ||
|
|
9f95e6a263 | ||
|
|
bf06c26344 | ||
|
|
f9f6f35236 | ||
|
|
804578f4e3 | ||
|
|
234f22e78e | ||
|
|
84d1fe3d86 | ||
|
|
d1c0e4eaf9 | ||
|
|
39d3c159b1 | ||
|
|
6a3b607690 | ||
|
|
c2954b8e84 | ||
|
|
0a7f0cbbef | ||
|
|
b547813995 | ||
|
|
46e7636c65 | ||
|
|
7cc97fb7b9 | ||
|
|
49bf30987f | ||
|
|
83efcd1b35 | ||
|
|
de9029eb1b | ||
|
|
3415c85618 | ||
|
|
de8f9603dc | ||
|
|
5e07802681 | ||
|
|
099af82e47 | ||
|
|
c03fc60c05 | ||
|
|
c473e6ee72 | ||
|
|
d9be9d17f5 | ||
|
|
479cfd07fd | ||
|
|
0a59474542 | ||
|
|
17ca4dcd69 | ||
|
|
950c942b20 | ||
|
|
d2e5dfb8cd | ||
|
|
a674134c62 | ||
|
|
92818790b9 | ||
|
|
f6f85fab1b | ||
|
|
2ae331fd14 | ||
|
|
b89420afd7 | ||
|
|
5085a89614 | ||
|
|
db8f0d6d3e | ||
|
|
57d0118ee9 | ||
|
|
fd053345b1 | ||
|
|
5034855f98 | ||
|
|
4cdd6878fb | ||
|
|
a19b64ebea | ||
|
|
0e8e7da039 | ||
|
|
d22e6b0208 | ||
|
|
a6dc5167d1 | ||
|
|
c846150afd | ||
|
|
81489ec8e6 | ||
|
|
28d3ffc074 | ||
|
|
56b0e44d88 | ||
|
|
e4b56e26d7 | ||
|
|
2929da60ed | ||
|
|
a1f024acfc | ||
|
|
27dbc23898 | ||
|
|
7cb2daa9ae | ||
|
|
3675a9e361 | ||
|
|
c7f1fafdc0 | ||
|
|
1e325366d2 | ||
|
|
f70c2cfde4 | ||
|
|
47c68bad06 | ||
|
|
6db39eed0f | ||
|
|
73cb1ade0e | ||
|
|
b96b8393f4 | ||
|
|
7952fbb76d | ||
|
|
be46d62c87 | ||
|
|
fe857f1fae | ||
|
|
113a0f829d | ||
|
|
c2ea737a19 | ||
|
|
425b00c317 | ||
|
|
17aa9c7cb8 | ||
|
|
b2efd78631 | ||
|
|
1379b219f2 | ||
|
|
ef919ee44b | ||
|
|
e186c4b668 | ||
|
|
5e30a12118 | ||
|
|
090b065a9c | ||
|
|
4ec7496fee | ||
|
|
63e3d6970c | ||
|
|
36094cbaac | ||
|
|
0a07063d6b | ||
|
|
e15582deef | ||
|
|
142de56b03 |
7
.gitignore
vendored
7
.gitignore
vendored
@@ -1,8 +1,5 @@
|
|||||||
Graphics/Battlers/*
|
|
||||||
Graphics/Battlers_resized/*
|
|
||||||
Graphics/CustomBattlers/*
|
|
||||||
Graphics/Battlers/*
|
|
||||||
Graphics/Pokemon/FusionIcons/*
|
Graphics/Pokemon/FusionIcons/*
|
||||||
Data/SPRITE_CREDS
|
Data/sprites/*
|
||||||
Data/VERSION
|
Data/VERSION
|
||||||
|
|
||||||
BIN
Audio/BGM/eusine.mp3
Normal file
BIN
Audio/BGM/eusine.mp3
Normal file
Binary file not shown.
BIN
Audio/BGM/gym_kanto.mp3
Normal file
BIN
Audio/BGM/gym_kanto.mp3
Normal file
Binary file not shown.
BIN
Audio/BGM/police_interrogation.mp3
Normal file
BIN
Audio/BGM/police_interrogation.mp3
Normal file
Binary file not shown.
BIN
Audio/ME/Pkmn get.ogg
Normal file
BIN
Audio/ME/Pkmn get.ogg
Normal file
Binary file not shown.
BIN
Audio/ME/coloseum_theme..mp3
Normal file
BIN
Audio/ME/coloseum_theme..mp3
Normal file
Binary file not shown.
BIN
Audio/ME/rocketQuest.ogg
Normal file
BIN
Audio/ME/rocketQuest.ogg
Normal file
Binary file not shown.
BIN
Audio/ME/spotted_police.mp3
Normal file
BIN
Audio/ME/spotted_police.mp3
Normal file
Binary file not shown.
BIN
Audio/SE/CARBINK.ogg
Normal file
BIN
Audio/SE/CARBINK.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/DIANCIE.ogg
Normal file
BIN
Audio/SE/DIANCIE.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Elevator end.ogg
Normal file
BIN
Audio/SE/Elevator end.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Elevator moving.ogg
Normal file
BIN
Audio/SE/Elevator moving.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Elevator moving_short.ogg
Normal file
BIN
Audio/SE/Elevator moving_short.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Flee.WAV
Normal file
BIN
Audio/SE/Flee.WAV
Normal file
Binary file not shown.
BIN
Audio/SE/Pika.wav
Normal file
BIN
Audio/SE/Pika.wav
Normal file
Binary file not shown.
BIN
Audio/SE/Pkmn get.ogg
Normal file
BIN
Audio/SE/Pkmn get.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/whistle.ogg
Normal file
BIN
Audio/SE/whistle.ogg
Normal file
Binary file not shown.
@@ -115,6 +115,7 @@ with their respective authors' consent
|
|||||||
Hankiro (Oak backsprite) http://s296.photobucket.com/user/Hankiro/media/ProfOakBackSprite.png.html
|
Hankiro (Oak backsprite) http://s296.photobucket.com/user/Hankiro/media/ProfOakBackSprite.png.html
|
||||||
SailorVicious (Prof. Elm OW sprite) https://www.deviantart.com/sailorvicious
|
SailorVicious (Prof. Elm OW sprite) https://www.deviantart.com/sailorvicious
|
||||||
OceansLugiaSpirit (Koga OW sprite) http://oceanslugiaspirit.deviantart.com/
|
OceansLugiaSpirit (Koga OW sprite) http://oceanslugiaspirit.deviantart.com/
|
||||||
|
Wolfang62: https://www.deviantart.com/wolfang62/art/Wimpod-Sprite-Overworld-836704744
|
||||||
|
|
||||||
Battle sprites:
|
Battle sprites:
|
||||||
Custom graphics:
|
Custom graphics:
|
||||||
@@ -131,6 +132,9 @@ Kiwikelly
|
|||||||
TCGrunler#4583
|
TCGrunler#4583
|
||||||
elupsis
|
elupsis
|
||||||
|
|
||||||
|
### Battle type icons ###
|
||||||
|
audreyeyeyeye https://www.deviantart.com/audreyeyeyeye/art/Pokemon-Type-Icons-FREE-TO-USE-909562921
|
||||||
|
|
||||||
### Public tileset graphics ###
|
### Public tileset graphics ###
|
||||||
Jorginho (OutsideEmerald)
|
Jorginho (OutsideEmerald)
|
||||||
ThatsSoWitty (Cave) http://thatssowitty.deviantart.com/art/The-Public-Pokemon-Tileset-281342410
|
ThatsSoWitty (Cave) http://thatssowitty.deviantart.com/art/The-Public-Pokemon-Tileset-281342410
|
||||||
@@ -202,6 +206,7 @@ Marin Better maps script https://www.pokecommunity.com/showthread.php?t=41129
|
|||||||
barafanatic Safari Zone improvements
|
barafanatic Safari Zone improvements
|
||||||
M3rein Easy Questing System
|
M3rein Easy Questing System
|
||||||
bo4p5687 Multisave
|
bo4p5687 Multisave
|
||||||
|
Vizualise In-battle type icons (adapted from) https://github.com/Vizualyse/PokemonInfiniteFusion-EnemyTypesMod
|
||||||
|
|
||||||
|
|
||||||
#### Data sources ###
|
#### Data sources ###
|
||||||
|
|||||||
2
Data/.idea/.gitignore
generated
vendored
2
Data/.idea/.gitignore
generated
vendored
@@ -2,7 +2,7 @@
|
|||||||
/shelf/
|
/shelf/
|
||||||
/workspace.xml
|
/workspace.xml
|
||||||
# Datasource local storage ignored files
|
# Datasource local storage ignored files
|
||||||
/../../../../../../../../../../../../:\Users\charl\Documents\Jeux\rpgmaker\infinitefusion\dev\dynamic-fusions\infinitefusion-e18\Data\.idea/dataSources/
|
/../../../../../../../../../../../:\Users\charl\Documents\Jeux\rpgmaker\infinitefusion\dev\infinitefusion-e18\Data\.idea/dataSources/
|
||||||
/dataSources.local.xml
|
/dataSources.local.xml
|
||||||
# Editor-based HTTP Client requests
|
# Editor-based HTTP Client requests
|
||||||
/httpRequests/
|
/httpRequests/
|
||||||
|
|||||||
5
Data/.idea/codeStyles/Project.xml
generated
5
Data/.idea/codeStyles/Project.xml
generated
@@ -1,5 +0,0 @@
|
|||||||
<component name="ProjectCodeStyleConfiguration">
|
|
||||||
<code_scheme name="Project" version="173">
|
|
||||||
<option name="FORMATTER_TAGS_ENABLED" value="true" />
|
|
||||||
</code_scheme>
|
|
||||||
</component>
|
|
||||||
5
Data/.idea/codeStyles/codeStyleConfig.xml
generated
5
Data/.idea/codeStyles/codeStyleConfig.xml
generated
@@ -1,5 +0,0 @@
|
|||||||
<component name="ProjectCodeStyleConfiguration">
|
|
||||||
<state>
|
|
||||||
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
|
|
||||||
</state>
|
|
||||||
</component>
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user