Compare commits

..

11 Commits

Author SHA1 Message Date
infinitefusion 03fc558fbb wip 2023-08-08 18:26:54 -04:00
infinitefusion e92cfe9b0a adds gen 7 icons & cries 2023-08-08 09:24:02 -04:00
infinitefusion e815e005a1 dynamic fusion names 2023-08-06 18:40:22 -04:00
infinitefusion 7f9e2312be wip 2023-08-06 12:43:43 -04:00
infinitefusion fa6f8f4f8c adds fused species abilities & fixes pokedex issue 2023-08-06 10:49:35 -04:00
infinitefusion b8a27ff6e3 adds fused species abilities & fixes pokedex issue 2023-08-06 10:49:26 -04:00
infinitefusion 9f44271b99 [wip] generate fusions dynamically 2023-08-05 22:10:03 -04:00
infinitefusion 41acb265da Revert "Adds factory for Pokemon class"
This reverts commit d304d223bd.
2023-08-05 12:34:07 -04:00
infinitefusion 1a9846f72f Revert "[wip] fusedPokemon"
This reverts commit 440a585d8c.
2023-08-05 12:33:50 -04:00
infinitefusion 440a585d8c [wip] fusedPokemon 2023-08-05 12:32:35 -04:00
infinitefusion d304d223bd Adds factory for Pokemon class 2023-08-05 11:03:37 -04:00
18034 changed files with 320940 additions and 1048415 deletions
-17
View File
@@ -1,17 +0,0 @@
Graphics/CustomBattlers/local_sprites/*
Graphics/Battlers/Shiny/*
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
Game.exe
rpgmaker.sh
-3
View File
@@ -1,3 +0,0 @@
[submodule "Data/Scripts"]
path = Data/Scripts
url = https://github.com/infinitefusion/scripts.git
-15
View File
@@ -1,15 +0,0 @@
<?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
View File
@@ -1,4 +0,0 @@
<?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
View File
@@ -1,8 +0,0 @@
<?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>
Generated
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>
-76
View File
@@ -1,76 +0,0 @@
<?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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
View 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