mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-24 09:55:08 +00:00
Compare commits
211 Commits
whirlIslan
...
4bc79de9dd
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4bc79de9dd | ||
|
|
26312dfd6c | ||
|
|
53adec3526 | ||
|
|
9dcbf2b910 | ||
|
|
383ef3f51b | ||
|
|
e4cb1ce6ef | ||
|
|
58da1023c1 | ||
|
|
0807a7ea79 | ||
|
|
86471fbedf | ||
|
|
5255ce0215 | ||
|
|
05bb3f0d76 | ||
|
|
d559b813ed | ||
|
|
423bffaf62 | ||
|
|
ed55f39aab | ||
|
|
866dbc3502 | ||
|
|
65b3c34009 | ||
|
|
c2d1384785 | ||
|
|
0d5562ffde | ||
|
|
d3a17668e2 | ||
|
|
d917d01d9d | ||
|
|
cec6847b4e | ||
|
|
82868b55e8 | ||
|
|
c189472646 | ||
|
|
cf192456ae | ||
|
|
37cc11d2d1 | ||
|
|
9a17e87904 | ||
|
|
4c2f224a3d | ||
|
|
76af4e4e28 | ||
|
|
d668dae55a | ||
|
|
046b1c0835 | ||
|
|
c532cb2d09 | ||
|
|
f2ccaf9eef | ||
|
|
d8b8fa8723 | ||
|
|
90bc6770ff | ||
|
|
e5e1ec5b0e | ||
|
|
9dffb6f99d | ||
|
|
9853b8d6e4 | ||
|
|
be2edbef70 | ||
|
|
e1b6d7e7a9 | ||
|
|
290b6f81d1 | ||
|
|
80de6b019d | ||
|
|
eb694dcdb5 | ||
|
|
230b1b86b4 | ||
|
|
692a78d041 | ||
|
|
fc87f353d7 | ||
|
|
a0fb092441 | ||
|
|
a895180ac5 | ||
|
|
f7ff2da270 | ||
|
|
e6b17bf990 | ||
|
|
3f2e23521c | ||
|
|
2594149691 | ||
|
|
e5c5cc5a17 | ||
|
|
d2d79321b8 | ||
|
|
2e7c922d95 | ||
|
|
4ea80c50da | ||
|
|
91449316d5 | ||
|
|
0f90a62dba | ||
|
|
5b6751083a | ||
|
|
4d69d60fbc | ||
|
|
4e26dbfeca | ||
|
|
de1580c54c | ||
|
|
7f1edad773 | ||
|
|
46f0c898e0 | ||
|
|
65d0bcc7c9 | ||
|
|
455bebbd1b | ||
|
|
563390c166 | ||
|
|
2afa199b6b | ||
|
|
bab284c503 | ||
|
|
147658bccb | ||
|
|
2f1c8e2a4d | ||
|
|
5910f28431 | ||
|
|
63c54e60c3 | ||
|
|
b016e42d3c | ||
|
|
697ea760b9 | ||
|
|
d966ee00cf | ||
|
|
a3bbf1a9a8 | ||
|
|
7012af625d | ||
|
|
88ed3c000e | ||
|
|
b53ffd0c73 | ||
|
|
048e51b9ae | ||
|
|
47876255e9 | ||
|
|
d754fc45f5 | ||
|
|
03b832a897 | ||
|
|
5343792f8c | ||
|
|
324e8b5d18 | ||
|
|
ce8d182b2f | ||
|
|
4edd8e9719 | ||
|
|
aa396cf402 | ||
|
|
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 | ||
|
|
256a045607 | ||
|
|
7bb75aaf1d | ||
|
|
f7d05eca58 | ||
|
|
bd7a15d1fc | ||
|
|
2bf0b6d104 | ||
|
|
bd11977c80 | ||
|
|
6af6e448e6 |
16
.gitignore
vendored
16
.gitignore
vendored
@@ -1,5 +1,17 @@
|
||||
|
||||
Graphics/CustomBattlers/local_sprites/*
|
||||
Graphics/Pokemon/FusionIcons/*
|
||||
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
|
||||
PBS/*
|
||||
Game.exe
|
||||
rpgmaker.sh
|
||||
|
||||
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
@@ -0,0 +1,3 @@
|
||||
[submodule "Data/Scripts"]
|
||||
path = Data/Scripts
|
||||
url = https://github.com/infinitefusion/scripts.git
|
||||
15
.idea/infinitefusion-e18.iml
generated
Normal file
15
.idea/infinitefusion-e18.iml
generated
Normal file
@@ -0,0 +1,15 @@
|
||||
<?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$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/features" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
4
.idea/misc.xml
generated
Normal file
4
.idea/misc.xml
generated
Normal file
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectRootManager" version="2" project-jdk-name="ruby-2.6.10-p210" project-jdk-type="RUBY_SDK" />
|
||||
</project>
|
||||
8
.idea/modules.xml
generated
Normal file
8
.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/infinitefusion-e18.iml" filepath="$PROJECT_DIR$/.idea/infinitefusion-e18.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
6
.idea/vcs.xml
generated
Normal file
6
.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="" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
76
.idea/workspace.xml
generated
Normal file
76
.idea/workspace.xml
generated
Normal file
@@ -0,0 +1,76 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="59b847cf-c39b-4afd-803a-38eea744d77a" name="Changes" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/Data/Map237.rxdata" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Map237.rxdata" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Data/Map276.rxdata" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Map276.rxdata" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Data/Map277.rxdata" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Map277.rxdata" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Data/MapInfos.rxdata" beforeDir="false" afterPath="$PROJECT_DIR$/Data/MapInfos.rxdata" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Data/Scripts/004_Game classes/002_Game_System.rb" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Scripts/004_Game classes/002_Game_System.rb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Data/Scripts/DownloadedSettings.rb" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Scripts/DownloadedSettings.rb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Data/System.rxdata" beforeDir="false" afterPath="$PROJECT_DIR$/Data/System.rxdata" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Data/sprites/BASE_SPRITES" beforeDir="false" afterPath="$PROJECT_DIR$/Data/sprites/BASE_SPRITES" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Data/sprites/CUSTOM_SPRITES" beforeDir="false" afterPath="$PROJECT_DIR$/Data/sprites/CUSTOM_SPRITES" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="GitHubPullRequestSearchHistory"><![CDATA[{
|
||||
"lastFilter": {
|
||||
"state": "OPEN",
|
||||
"assignee": "infinitefusion"
|
||||
}
|
||||
}]]></component>
|
||||
<component name="GithubPullRequestsUISettings"><![CDATA[{
|
||||
"selectedUrlAndAccountId": {
|
||||
"url": "https://github.com/infinitefusion/infinitefusion-e18.git",
|
||||
"accountId": "2b6eb7d6-790c-4e30-967d-bfb420050830"
|
||||
}
|
||||
}]]></component>
|
||||
<component name="ProjectColorInfo"><![CDATA[{
|
||||
"associatedIndex": 2
|
||||
}]]></component>
|
||||
<component name="ProjectId" id="2vRvDbTuifxaPtCcwMIlmzF9kqX" />
|
||||
<component name="ProjectViewState">
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent"><![CDATA[{
|
||||
"keyToString": {
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"RunOnceActivity.git.unshallow": "true",
|
||||
"git-widget-placeholder": "develop-6.6",
|
||||
"last_opened_file_path": "/Users/chardub/Documents/infinitefusion/infinitefusion-release/infinitefusion-e18",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"vue.rearranger.settings.migration": "true"
|
||||
}
|
||||
}]]></component>
|
||||
<component name="SharedIndexes">
|
||||
<attachedChunks>
|
||||
<set>
|
||||
<option value="bundled-js-predefined-d6986cc7102b-822845ee3bb5-JavaScript-RM-243.23654.167" />
|
||||
</set>
|
||||
</attachedChunks>
|
||||
</component>
|
||||
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
|
||||
<component name="SpringUtil" SPRING_PRE_LOADER_OPTION="true" RAKE_SPRING_PRE_LOADER_OPTION="true" RAILS_SPRING_PRE_LOADER_OPTION="true" />
|
||||
<component name="TaskManager">
|
||||
<task active="true" id="Default" summary="Default task">
|
||||
<changelist id="59b847cf-c39b-4afd-803a-38eea744d77a" name="Changes" comment="" />
|
||||
<created>1744120584178</created>
|
||||
<option name="number" value="Default" />
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1744120584178</updated>
|
||||
<workItem from="1744120585282" duration="16000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
<option name="version" value="3" />
|
||||
</component>
|
||||
</project>
|
||||
BIN
Audio/BGM/Hall of Fame.mp3
Normal file
BIN
Audio/BGM/Hall of Fame.mp3
Normal file
Binary file not shown.
BIN
Audio/ME/lullaby.mp3
Normal file
BIN
Audio/ME/lullaby.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.
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.
BIN
Data/Map123.rxdata
Normal file
BIN
Data/Map123.rxdata
Normal file
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