33 Commits
6.2.4 ... 6.4

Author SHA1 Message Date
infinitefusion
56b0e44d88 removes game-default 2024-12-21 10:44:07 -05:00
infinitefusion
e4b56e26d7 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-12-21 10:42:12 -05:00
infinitefusion
2929da60ed updates gitignore 2024-12-21 10:37:49 -05:00
infinitefusion
a1f024acfc removes rubymine project files 2024-12-21 10:34:52 -05:00
infinitefusion
27dbc23898 removes dev files 2024-12-21 10:25:30 -05:00
infinitefusion
7cb2daa9ae 6.4 custom sprite spritesheets 2024-12-21 10:05:07 -05:00
infinitefusion
3675a9e361 6.4 autogen spritesheets 2024-12-21 09:47:19 -05:00
infinitefusion
c7f1fafdc0 cleans fusion icons folder 2024-12-21 09:45:46 -05:00
infinitefusion
1e325366d2 6.4 update (minus sprites) 2024-12-21 09:43:11 -05:00
infinitefusion
f70c2cfde4 6.4 sprite credits 2024-12-18 10:05:32 -05:00
infinitefusion
47c68bad06 adds sprite credits csv 2024-12-06 10:13:57 -05:00
infinitefusion
6db39eed0f updates custom sprites list and adds base sprites list 2024-12-05 19:20:06 -05:00
infinitefusion
73cb1ade0e updates credits 2024-11-02 15:35:06 -04:00
infinitefusion
b96b8393f4 fixes crash while downloading sprites 2024-10-06 15:55:21 -04:00
infinitefusion
7952fbb76d Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-10-05 20:06:26 -04:00
infinitefusion
be46d62c87 adds client side rate limit for custom spritesà 2024-10-05 20:02:18 -04:00
infinitefusion
fe857f1fae Adds client-side rate limiting for fetching custom sprites 2024-10-05 20:01:00 -04:00
infinitefusion
113a0f829d updates version number 2024-10-05 09:53:18 -04:00
infinitefusion
c2ea737a19 settings stuff 2024-10-05 09:38:46 -04:00
infinitefusion
425b00c317 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-09-24 19:13:23 -04:00
infinitefusion
17aa9c7cb8 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-07-07 10:59:40 -04:00
infinitefusion
b2efd78631 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-07-05 18:35:06 -04:00
infinitefusion
1379b219f2 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-07-03 10:30:11 -04:00
infinitefusion
ef919ee44b Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-06-30 17:41:05 -04:00
infinitefusion
e186c4b668 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-06-30 15:47:04 -04:00
infinitefusion
5e30a12118 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-06-30 15:19:09 -04:00
infinitefusion
090b065a9c Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-06-29 14:16:17 -04:00
infinitefusion
4ec7496fee Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-06-28 19:50:49 -04:00
infinitefusion
63e3d6970c roamer fix 2024-06-28 18:07:27 -04:00
infinitefusion
36094cbaac removes pbs folder 2024-06-28 17:19:06 -04:00
infinitefusion
0a07063d6b Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-06-28 17:18:35 -04:00
infinitefusion
e15582deef Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-06-28 13:24:27 -04:00
infinitefusion
142de56b03 removes project file 2024-04-20 11:43:38 -04:00
5866 changed files with 430772 additions and 729536 deletions

5
.gitignore vendored
View File

@@ -1,8 +1,7 @@
Graphics/Battlers/*
Graphics/Battlers_resized/*
Graphics/CustomBattlers/*
Graphics/Battlers/*
Graphics/Pokemon/FusionIcons/*
Data/SPRITE_CREDS
Data/pokedex/*
Data/sprites/*
Data/VERSION

BIN
Audio/BGM/eusine.mp3 Normal file

Binary file not shown.

BIN
Audio/BGM/gym_kanto.mp3 Normal file

Binary file not shown.

Binary file not shown.

BIN
Audio/ME/Pkmn get.ogg Normal file

Binary file not shown.

Binary file not shown.

BIN
Audio/ME/rocketQuest.ogg Normal file

Binary file not shown.

BIN
Audio/ME/spotted_police.mp3 Normal file

Binary file not shown.

BIN
Audio/SE/CARBINK.ogg Normal file

Binary file not shown.

BIN
Audio/SE/DIANCIE.ogg Normal file

Binary file not shown.

BIN
Audio/SE/Elevator end.ogg Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/Flee.WAV Normal file

Binary file not shown.

BIN
Audio/SE/Pika.wav Normal file

Binary file not shown.

BIN
Audio/SE/Pkmn get.ogg Normal file

Binary file not shown.

BIN
Audio/SE/whistle.ogg Normal file

Binary file not shown.

View File

@@ -115,6 +115,7 @@ with their respective authors' consent
Hankiro (Oak backsprite) http://s296.photobucket.com/user/Hankiro/media/ProfOakBackSprite.png.html
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
Battle sprites:
Custom graphics:
@@ -131,6 +132,9 @@ Kiwikelly
TCGrunler#4583
elupsis
### Battle type icons ###
audreyeyeyeye https://www.deviantart.com/audreyeyeyeye/art/Pokemon-Type-Icons-FREE-TO-USE-909562921
### Public tileset graphics ###
Jorginho (OutsideEmerald)
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
M3rein Easy Questing System
bo4p5687 Multisave
Vizualise In-battle type icons (adapted from) https://github.com/Vizualyse/PokemonInfiniteFusion-EnemyTypesMod
#### Data sources ###

8
Data/.idea/.gitignore generated vendored
View File

@@ -1,8 +0,0 @@
# Default ignored files
/shelf/
/workspace.xml
# Datasource local storage ignored files
/../../../../../../../../../../../../:\Users\charl\Documents\Jeux\rpgmaker\infinitefusion\dev\dynamic-fusions\infinitefusion-e18\Data\.idea/dataSources/
/dataSources.local.xml
# Editor-based HTTP Client requests
/httpRequests/

11
Data/.idea/Data.iml generated
View File

@@ -1,11 +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$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

View File

@@ -1,5 +0,0 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<option name="FORMATTER_TAGS_ENABLED" value="true" />
</code_scheme>
</component>

View File

@@ -1,5 +0,0 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</state>
</component>

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/Data.iml" filepath="$PROJECT_DIR$/.idea/Data.iml" />
</modules>
</component>
</project>

6
Data/.idea/vcs.xml generated
View File

@@ -1,6 +0,0 @@
<?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.

Some files were not shown because too many files have changed in this diff Show More