mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2026-06-13 07:19:28 +00:00
Compare commits
130 Commits
6.2
..
whirlIslands
| 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 | |||
| 620a20e7f2 | |||
| 56e1cc5e5d | |||
| f76ea4db46 | |||
| ffd3a95e08 | |||
| 30f42847de | |||
| 6f69768db6 | |||
| f27961a805 | |||
| 0d9741a460 | |||
| 3326daaaab | |||
| cc26deeb33 | |||
| a8ab419036 | |||
| ba04d37b87 | |||
| aac5fd911a | |||
| 17aa9c7cb8 | |||
| 9e80ff92ec | |||
| b2efd78631 | |||
| 116323d8e8 | |||
| 8c80c9db35 | |||
| 0d75109a20 | |||
| d78caf6792 | |||
| 4a6a889b3e | |||
| 6180590860 | |||
| dee677224d | |||
| 2a33e49855 | |||
| a21f3b289b | |||
| 1379b219f2 | |||
| f6b55a838b | |||
| 92194cab02 | |||
| 0904f27afa | |||
| c5f578039e | |||
| 2b06205ee8 | |||
| 867a3bf0a5 | |||
| 9bdaf9e817 | |||
| ef919ee44b | |||
| e6d133f7a6 | |||
| e186c4b668 | |||
| ad1be384ce | |||
| 19864599e0 | |||
| b053d1eb77 | |||
| 2c3fae1b27 | |||
| 5e30a12118 | |||
| c6a52b7940 | |||
| 0ba5b1551e | |||
| 090b065a9c | |||
| 1ef1ca15d9 | |||
| 14d1988f40 | |||
| fbb23d5e5e | |||
| a5b464095b | |||
| 5c7a7548a6 | |||
| 4ec7496fee | |||
| cfc4afa5ae | |||
| aa5e5c72e5 | |||
| 4bd905d554 | |||
| 63e3d6970c |
+2
-5
@@ -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
|
||||||
|
|
||||||
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.
@@ -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 ###
|
||||||
|
|||||||
Generated
+1
-1
@@ -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/
|
||||||
|
|||||||
Generated
-5
@@ -1,5 +0,0 @@
|
|||||||
<component name="ProjectCodeStyleConfiguration">
|
|
||||||
<code_scheme name="Project" version="173">
|
|
||||||
<option name="FORMATTER_TAGS_ENABLED" value="true" />
|
|
||||||
</code_scheme>
|
|
||||||
</component>
|
|
||||||
-5
@@ -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