mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
Compare commits
176 Commits
6.4
...
develop-en
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ac83e9ddcb | ||
|
|
3470c75b02 | ||
|
|
7358d67e7e | ||
|
|
701ea9ab11 | ||
|
|
36851c7bb7 | ||
|
|
3d6e76a41e | ||
|
|
bc2d48488e | ||
|
|
f3ebd7e7f5 | ||
|
|
6a072917b8 | ||
|
|
0c06b7a6c9 | ||
|
|
14f99f7efb | ||
|
|
b14d9d491c | ||
|
|
071621b8dd | ||
|
|
dc4ec939cd | ||
|
|
a974994d15 | ||
|
|
6b978c0ebc | ||
|
|
8b8b348ed1 | ||
|
|
e9bdea5bad | ||
|
|
6248ccd061 | ||
|
|
60de077d01 | ||
|
|
20a5811ab8 | ||
|
|
32874d8a38 | ||
|
|
d9ef1cd12e | ||
|
|
ccb05dc509 | ||
|
|
4ed504d817 | ||
|
|
96f60d8cb9 | ||
|
|
45bf331031 | ||
|
|
4ef0e87577 | ||
|
|
4f1accc017 | ||
|
|
c41773d06f | ||
|
|
5398a5aa78 | ||
|
|
0d7ea25203 | ||
|
|
98f753eb97 | ||
|
|
f1f00202c2 | ||
|
|
c4242bb0b6 | ||
|
|
c3b501dc28 | ||
|
|
a6649ce82d | ||
|
|
4fcc3e1516 | ||
|
|
553d862168 | ||
|
|
1dba2e41ae | ||
|
|
f15fd29c39 | ||
|
|
c38d513a67 | ||
|
|
92feb7c714 | ||
|
|
892c2b62f6 | ||
|
|
f1d21b10c6 | ||
|
|
687aa86e1c | ||
|
|
707bac5d65 | ||
|
|
c8f2a37d5a | ||
|
|
5eac2dd43a | ||
|
|
9b5f376ed9 | ||
|
|
5ed090229b | ||
|
|
f9095f2d06 | ||
|
|
c6f69edf9c | ||
|
|
a52af5a021 | ||
|
|
80eef3b1c4 | ||
|
|
0f416eecaf | ||
|
|
d099d788f4 | ||
|
|
f835ff8209 | ||
|
|
810154c516 | ||
|
|
76ecb4e2e0 | ||
|
|
1c665bf636 | ||
|
|
0f38d7933b | ||
|
|
4089c956d7 | ||
|
|
133f01218b | ||
|
|
c5cff0dfb9 | ||
|
|
1d2139df32 | ||
|
|
8352043c4c | ||
|
|
67d32e7c18 | ||
|
|
1ddb9ba24a | ||
|
|
4fa7292bdd | ||
|
|
cb39bac568 | ||
|
|
541c98ba6b | ||
|
|
28a982ce15 | ||
|
|
fdcfbb5bb4 | ||
|
|
05b1af28e0 | ||
|
|
0f58800fd1 | ||
|
|
f251cf37ab | ||
|
|
d23e2ff98a | ||
|
|
871045ca46 | ||
|
|
0c918bbfcb | ||
|
|
2488a2575e | ||
|
|
2c5b161029 | ||
|
|
32dc832b5c | ||
|
|
9fa7dac43f | ||
|
|
d3e4fd3d33 | ||
|
|
16b2deeefb | ||
|
|
b8d479b801 | ||
|
|
38377b703e | ||
|
|
1fed55f7fa | ||
|
|
3ebd3fd68a | ||
|
|
2fcc7fc9cd | ||
|
|
692a25bd8e | ||
|
|
24943e092f | ||
|
|
935c548016 | ||
|
|
44f114b5e0 | ||
|
|
1809d246b6 | ||
|
|
a9de6b6c97 | ||
|
|
1499465ce0 | ||
|
|
f72c7fff7b | ||
|
|
a9267b7bad | ||
|
|
fed8490fc3 | ||
|
|
a62544e8d8 | ||
|
|
9d30b0e0fb | ||
|
|
5640871dcd | ||
|
|
e7d2330a2f | ||
|
|
71894707b1 | ||
|
|
727bccfe61 | ||
|
|
e0201bf021 | ||
|
|
8f1f4a0f9b | ||
|
|
8bcc4f226b | ||
|
|
5fc4935a0c | ||
|
|
064a09664a | ||
|
|
6c621d04e4 | ||
|
|
d523f30eb7 | ||
|
|
b2b8a4ec12 | ||
|
|
33ab16c3c6 | ||
|
|
4730228557 | ||
|
|
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 | ||
|
|
256a045607 | ||
|
|
0a59474542 | ||
|
|
17ca4dcd69 | ||
|
|
950c942b20 | ||
|
|
d2e5dfb8cd | ||
|
|
a674134c62 | ||
|
|
92818790b9 | ||
|
|
f6f85fab1b | ||
|
|
2ae331fd14 | ||
|
|
b89420afd7 | ||
|
|
5085a89614 | ||
|
|
db8f0d6d3e | ||
|
|
57d0118ee9 | ||
|
|
fd053345b1 | ||
|
|
5034855f98 | ||
|
|
4cdd6878fb | ||
|
|
a19b64ebea | ||
|
|
0e8e7da039 | ||
|
|
d22e6b0208 | ||
|
|
a6dc5167d1 | ||
|
|
c846150afd | ||
|
|
81489ec8e6 | ||
|
|
28d3ffc074 | ||
|
|
7bb75aaf1d | ||
|
|
2bf0b6d104 | ||
|
|
bd11977c80 |
15
.gitignore
vendored
15
.gitignore
vendored
@@ -1,7 +1,14 @@
|
||||
Graphics/CustomBattlers/*
|
||||
Graphics/Battlers/*
|
||||
Graphics/CustomBattlers/local_sprites/*
|
||||
Graphics/Pokemon/FusionIcons/*
|
||||
Data/pokedex/*
|
||||
Graphics/CustomBattlers/spritesheets
|
||||
Graphics/CustomBattlers/*
|
||||
Data/sprites/*
|
||||
Data/VERSION
|
||||
|
||||
infinitefusion.sh
|
||||
Data/sprites/CUSTOM_SPRITES
|
||||
Data/sprites
|
||||
Data/sprites/updated_spritesheets_cache
|
||||
Data/sprites/sprites_rate_limit.log
|
||||
.gitignore
|
||||
Game.rxproj
|
||||
.DS_Store
|
||||
BIN
Audio/BGM/Hall of Fame.mp3
Normal file
BIN
Audio/BGM/Hall of Fame.mp3
Normal file
Binary file not shown.
BIN
Audio/SE/Cries/MINIOR_M.ogg
Normal file
BIN
Audio/SE/Cries/MINIOR_M.ogg
Normal file
Binary file not shown.
@@ -45,7 +45,7 @@ Special thanks to Aegide and Reizod for helping to rip the sprites from the webs
|
||||
and to the owners of the respective fusion websites for accepting to share
|
||||
their sprites.
|
||||
|
||||
Intro cinamatic
|
||||
Intro cinematic
|
||||
#####################
|
||||
Kiwikelly
|
||||
|
||||
@@ -116,7 +116,7 @@ with their respective authors' consent
|
||||
SailorVicious (Prof. Elm OW sprite) https://www.deviantart.com/sailorvicious
|
||||
OceansLugiaSpirit (Koga OW sprite) http://oceanslugiaspirit.deviantart.com/
|
||||
Wolfang62: https://www.deviantart.com/wolfang62/art/Wimpod-Sprite-Overworld-836704744
|
||||
|
||||
zender1752 (Sabrina OW sprite)
|
||||
Battle sprites:
|
||||
Custom graphics:
|
||||
Kiwikelly, UnworthyPie
|
||||
@@ -124,7 +124,7 @@ with their respective authors' consent
|
||||
Free use graphics:
|
||||
luckygirl88 (Misty VS sprite) http://luckygirl88.deviantart.com/art/Pokemon-BW-Misty-Sprite-Sheet-268364830
|
||||
Lorelei VS sprite by Nalty http://nalty.deviantart.com/art/Lorelei-VS-Sprite-177184960
|
||||
|
||||
x-5-4-5-2 (Sabrina sprite) https://www.deviantart.com/x-5-4-5-2/art/Game-Sabrina-204548703
|
||||
### Custom tileset graphics ###
|
||||
Kiwikelly
|
||||
|
||||
|
||||
BIN
Data/.DS_Store
vendored
Normal file
BIN
Data/.DS_Store
vendored
Normal file
Binary file not shown.
8
Data/.idea/.gitignore
generated
vendored
Normal file
8
Data/.idea/.gitignore
generated
vendored
Normal file
@@ -0,0 +1,8 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
# Datasource local storage ignored files
|
||||
/../../../../../../../../../../../:\Users\charl\Documents\Jeux\rpgmaker\infinitefusion\dev\infinitefusion-e18\Data\.idea/dataSources/
|
||||
/dataSources.local.xml
|
||||
# Editor-based HTTP Client requests
|
||||
/httpRequests/
|
||||
11
Data/.idea/Data.iml
generated
Normal file
11
Data/.idea/Data.iml
generated
Normal file
@@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="RUBY_MODULE" version="4">
|
||||
<component name="ModuleRunConfigurationManager">
|
||||
<shared />
|
||||
</component>
|
||||
<component name="NewModuleRootManager">
|
||||
<content url="file://$MODULE_DIR$" />
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
8
Data/.idea/modules.xml
generated
Normal file
8
Data/.idea/modules.xml
generated
Normal file
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/Data.iml" filepath="$PROJECT_DIR$/.idea/Data.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
6
Data/.idea/vcs.xml
generated
Normal file
6
Data/.idea/vcs.xml
generated
Normal file
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
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.
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