mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
Compare commits
88 Commits
releases-A
...
a8007e1688
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a8007e1688 | ||
|
|
46b4385da5 | ||
|
|
72c574598d | ||
|
|
27a3d3753f | ||
|
|
d254b92981 | ||
|
|
be9516b3d0 | ||
|
|
7fa75f41c2 | ||
|
|
ef6facc4da | ||
|
|
114bc8d2a2 | ||
|
|
5654830b75 | ||
|
|
5a01022a9b | ||
|
|
f37bfc55ff | ||
|
|
15d3b6fe9d | ||
|
|
b3d5c93bf2 | ||
|
|
004a666b7b | ||
|
|
97ccd456d7 | ||
|
|
fa13f30191 | ||
|
|
295a71dbcd | ||
|
|
a94f2f1169 | ||
|
|
eae5af977c | ||
|
|
2b3dae22ac | ||
|
|
3698cadb83 | ||
|
|
a1c1d37ceb | ||
|
|
28cccd884f | ||
|
|
0ad7b1a899 | ||
|
|
370814733b | ||
|
|
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 | ||
|
|
f7d05eca58 | ||
|
|
bd7a15d1fc | ||
|
|
6af6e448e6 |
5
.gitignore
vendored
5
.gitignore
vendored
@@ -1,6 +1,7 @@
|
|||||||
Graphics/CustomBattlers/local_sprites/*
|
Graphics/CustomBattlers/local_sprites/*
|
||||||
|
Graphics/Battlers/Shiny/*
|
||||||
Graphics/Pokemon/FusionIcons/*
|
Graphics/Pokemon/FusionIcons/*
|
||||||
Graphics/CustomBattlers/spritesheets
|
Graphics/CustomBattlers/spritesheets/*
|
||||||
Graphics/CustomBattlers/*
|
Graphics/CustomBattlers/*
|
||||||
Data/sprites/*
|
Data/sprites/*
|
||||||
Data/VERSION
|
Data/VERSION
|
||||||
@@ -13,5 +14,5 @@ Data/sprites/sprites_rate_limit.log
|
|||||||
Game.rxproj
|
Game.rxproj
|
||||||
.DS_Store
|
.DS_Store
|
||||||
PBS/*
|
PBS/*
|
||||||
Game.rxproj
|
Game.exe
|
||||||
rpgmaker.sh
|
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>
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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
Audio/ME/lullaby.mp3
Normal file
BIN
Audio/ME/lullaby.mp3
Normal file
Binary file not shown.
Binary file not shown.
BIN
Audio/SE/Cries/ABOMASNOW.ogg
Normal file
BIN
Audio/SE/Cries/ABOMASNOW.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Cries/ABOMASNOW_1.ogg
Normal file
BIN
Audio/SE/Cries/ABOMASNOW_1.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
Audio/SE/Cries/ABRA.ogg
Normal file
BIN
Audio/SE/Cries/ABRA.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
Audio/SE/Cries/ABSOL.ogg
Normal file
BIN
Audio/SE/Cries/ABSOL.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Cries/ABSOL_1.ogg
Normal file
BIN
Audio/SE/Cries/ABSOL_1.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Cries/ACCELGOR.ogg
Normal file
BIN
Audio/SE/Cries/ACCELGOR.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
Audio/SE/Cries/AEGISLASH.ogg
Normal file
BIN
Audio/SE/Cries/AEGISLASH.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
Audio/SE/Cries/AERODACTYL.ogg
Normal file
BIN
Audio/SE/Cries/AERODACTYL.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Cries/AERODACTYL_1.ogg
Normal file
BIN
Audio/SE/Cries/AERODACTYL_1.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
Audio/SE/Cries/AGGRON.ogg
Normal file
BIN
Audio/SE/Cries/AGGRON.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Cries/AGGRON_1.ogg
Normal file
BIN
Audio/SE/Cries/AGGRON_1.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
Audio/SE/Cries/AIPOM.ogg
Normal file
BIN
Audio/SE/Cries/AIPOM.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
Audio/SE/Cries/ALAKAZAM.ogg
Normal file
BIN
Audio/SE/Cries/ALAKAZAM.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Cries/ALAKAZAM_1.ogg
Normal file
BIN
Audio/SE/Cries/ALAKAZAM_1.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Cries/ALCREMIE.ogg
Normal file
BIN
Audio/SE/Cries/ALCREMIE.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Cries/ALOMOMOLA.ogg
Normal file
BIN
Audio/SE/Cries/ALOMOMOLA.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
Audio/SE/Cries/ALTARIA.ogg
Normal file
BIN
Audio/SE/Cries/ALTARIA.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Cries/ALTARIA_1.ogg
Normal file
BIN
Audio/SE/Cries/ALTARIA_1.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
Audio/SE/Cries/AMAURA.ogg
Normal file
BIN
Audio/SE/Cries/AMAURA.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
Audio/SE/Cries/AMBIPOM.ogg
Normal file
BIN
Audio/SE/Cries/AMBIPOM.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Cries/AMOONGUSS.ogg
Normal file
BIN
Audio/SE/Cries/AMOONGUSS.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
Audio/SE/Cries/AMPHAROS.ogg
Normal file
BIN
Audio/SE/Cries/AMPHAROS.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Cries/AMPHAROS_1.ogg
Normal file
BIN
Audio/SE/Cries/AMPHAROS_1.ogg
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Audio/SE/Cries/ANORITH.ogg
Normal file
BIN
Audio/SE/Cries/ANORITH.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Cries/APPLETUN.ogg
Normal file
BIN
Audio/SE/Cries/APPLETUN.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Cries/APPLIN.ogg
Normal file
BIN
Audio/SE/Cries/APPLIN.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Cries/ARAQUANID.ogg
Normal file
BIN
Audio/SE/Cries/ARAQUANID.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
Audio/SE/Cries/ARBOK.ogg
Normal file
BIN
Audio/SE/Cries/ARBOK.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
Audio/SE/Cries/ARCANINE.ogg
Normal file
BIN
Audio/SE/Cries/ARCANINE.ogg
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Audio/SE/Cries/ARCEUS.ogg
Normal file
BIN
Audio/SE/Cries/ARCEUS.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
Audio/SE/Cries/ARCHEN.ogg
Normal file
BIN
Audio/SE/Cries/ARCHEN.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Cries/ARCHEOPS.ogg
Normal file
BIN
Audio/SE/Cries/ARCHEOPS.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Cries/ARCTOVISH.ogg
Normal file
BIN
Audio/SE/Cries/ARCTOVISH.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Cries/ARCTOZOLT.ogg
Normal file
BIN
Audio/SE/Cries/ARCTOZOLT.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
Audio/SE/Cries/ARIADOS.ogg
Normal file
BIN
Audio/SE/Cries/ARIADOS.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
Audio/SE/Cries/ARMALDO.ogg
Normal file
BIN
Audio/SE/Cries/ARMALDO.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Cries/AROMATISSE.ogg
Normal file
BIN
Audio/SE/Cries/AROMATISSE.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
Audio/SE/Cries/ARON.ogg
Normal file
BIN
Audio/SE/Cries/ARON.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Cries/ARROKUDA.ogg
Normal file
BIN
Audio/SE/Cries/ARROKUDA.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
Audio/SE/Cries/ARTICUNO.ogg
Normal file
BIN
Audio/SE/Cries/ARTICUNO.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Cries/AUDINO.ogg
Normal file
BIN
Audio/SE/Cries/AUDINO.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Cries/AUDINO_1.ogg
Normal file
BIN
Audio/SE/Cries/AUDINO_1.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
Audio/SE/Cries/AURORUS.ogg
Normal file
BIN
Audio/SE/Cries/AURORUS.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Cries/AVALUGG.ogg
Normal file
BIN
Audio/SE/Cries/AVALUGG.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
Audio/SE/Cries/AXEW.ogg
Normal file
BIN
Audio/SE/Cries/AXEW.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Cries/AZELF.ogg
Normal file
BIN
Audio/SE/Cries/AZELF.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
Audio/SE/Cries/AZUMARILL.ogg
Normal file
BIN
Audio/SE/Cries/AZUMARILL.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
Audio/SE/Cries/AZURILL.ogg
Normal file
BIN
Audio/SE/Cries/AZURILL.ogg
Normal file
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