mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-07-09 07:18:03 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved android/assets/ to assets/

Browse Source
This commit is contained in:
Collin Smith
2020-11-17 19:49:45 -08:00
parent e525d4308c
commit 3eadf591c1
56 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -1 +1 @@
android/assets/* linguist-vendored
assets/* linguist-vendored

2
.idea/runConfigurations/AnimationTool.xml generated
View File

@ -4,7 +4,7 @@
<module name="tools" />
<option name="PROGRAM_PARAMETERS" value="&quot;C:\Program Files (x86)\Steam\steamapps\common\Diablo II&quot;" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
<method />
</configuration>
</component>

2
.idea/runConfigurations/BreakpointsTool.xml generated
View File

@ -3,7 +3,7 @@
<option name="MAIN_CLASS_NAME" value="com.riiablo.BreakpointsTool" />
<module name="tools" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
<method />
</configuration>
</component>

2
.idea/runConfigurations/COF_Finder.xml generated
View File

@ -4,7 +4,7 @@
<module name="tools" />
<option name="PROGRAM_PARAMETERS" value="&quot;C:\Program Files (x86)\Steam\steamapps\common\Diablo II&quot; SKDT1HS" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
<method />
</configuration>
</component>

2
.idea/runConfigurations/CameraTool.xml generated
View File

@ -3,7 +3,7 @@
<option name="MAIN_CLASS_NAME" value="com.riiablo.camera.CameraTool" />
<module name="tools" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
<method />
</configuration>
</component>

2
.idea/runConfigurations/D2_Finder.xml generated
View File

@ -4,7 +4,7 @@
<module name="tools" />
<option name="PROGRAM_PARAMETERS" value="&quot;C:\Program Files (x86)\Steam\steamapps\common\Diablo II&quot; SOSC1HS" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
<method />
</configuration>
</component>

2
.idea/runConfigurations/DirectionTool.xml generated
View File

@ -3,7 +3,7 @@
<option name="MAIN_CLASS_NAME" value="com.riiablo.engine.DirectionTool" />
<module name="tools" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
<method />
</configuration>
</component>

2
.idea/runConfigurations/ExcelGenerationTool.xml generated
View File

@ -4,7 +4,7 @@
<module name="tools" />
<option name="PROGRAM_PARAMETERS" value="com.riiablo.codec.excel.MonStats" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
<method />
</configuration>
</component>

2
.idea/runConfigurations/FontMetricsTool.xml generated
View File

@ -4,7 +4,7 @@
<module name="tools" />
<option name="PROGRAM_PARAMETERS" value="&quot;C:\Program Files (x86)\Steam\steamapps\common\Diablo II&quot; font8" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
<method />
</configuration>
</component>

2
.idea/runConfigurations/Map_Viewer.xml generated
View File

@ -4,7 +4,7 @@
<module name="tools" />
<option name="PROGRAM_PARAMETERS" value="&quot;C:\Program Files (x86)\Steam\steamapps\common\Diablo II&quot; 0 0 0" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
<method />
</configuration>
</component>

2
.idea/runConfigurations/desktop__debug_.xml generated
View File

@ -4,7 +4,7 @@
<module name="desktop" />
<option name="PROGRAM_PARAMETERS" value="-fps -w -logLevel debug -home &quot;C:\Program Files (x86)/steam/steamapps/common/Diablo II&quot;" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
<method />
</configuration>
</component>

2
.idea/runConfigurations/desktop__debug___1280x720_.xml generated
View File

@ -4,7 +4,7 @@
<module name="desktop" />
<option name="PROGRAM_PARAMETERS" value="-i 1280 -o 720 -fps -w -logLevel debug -home &quot;C:\Program Files (x86)\Steam\steamapps\common\Diablo II&quot;" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
<method />
</configuration>
</component>

2
.idea/runConfigurations/desktop__debug___640x480_.xml generated
View File

@ -4,7 +4,7 @@
<module name="desktop" />
<option name="PROGRAM_PARAMETERS" value="-i 640 -o 480 -fps -w -logLevel debug -home &quot;C:\Program Files (x86)\Steam\steamapps\common\Diablo II&quot;" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
<method />
</configuration>
</component>

2
.idea/runConfigurations/desktop__debug___720x360_.xml generated
View File

@ -4,7 +4,7 @@
<module name="desktop" />
<option name="PROGRAM_PARAMETERS" value="-i 720 -o 360 -fps -w -logLevel debug -home &quot;C:\Program Files (x86)\Steam\steamapps\common\Diablo II&quot;" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
<method />
</configuration>
</component>

2
.idea/runConfigurations/desktop__debug___840x360_.xml generated
View File

@ -4,7 +4,7 @@
<module name="desktop" />
<option name="PROGRAM_PARAMETERS" value="-i 840 -o 360 -fps -w -logLevel debug -home &quot;C:\Program Files (x86)\Steam\steamapps\common\Diablo II&quot;" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
<method />
</configuration>
</component>

2
.idea/runConfigurations/desktop__debug___853x480_.xml generated
View File

@ -4,7 +4,7 @@
<module name="desktop" />
<option name="PROGRAM_PARAMETERS" value="-i 853 -o 480 -fps -w -logLevel debug -home &quot;C:\Program Files (x86)\Steam\steamapps\common\Diablo II&quot;" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
<method />
</configuration>
</component>

2
.idea/runConfigurations/desktop__debug___854x480_.xml generated
View File

@ -4,7 +4,7 @@
<module name="desktop" />
<option name="PROGRAM_PARAMETERS" value="-i 854 -o 480 -fps -w -logLevel debug -home &quot;C:\Program Files (x86)\Steam\steamapps\common\Diablo II&quot;" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
<method />
</configuration>
</component>

2
android/build.gradle
View File

@ -10,7 +10,7 @@ android {
aidl.srcDirs = ['src/main/java']
renderscript.srcDirs = ['src/main/java']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
assets.srcDirs = ['../assets']
jniLibs.srcDirs = ['libs']
}
}

0
android/assets/(listfile) → assets/(listfile) vendored
View File

0
android/assets/(listfile).0 → assets/(listfile).0 vendored
View File

0
android/assets/(listfile).1 → assets/(listfile).1 vendored
View File

0
android/assets/consolas12.fnt → assets/consolas12.fnt vendored
View File

0
android/assets/consolas12.png → assets/consolas12.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

0
android/assets/consolas16.fnt → assets/consolas16.fnt vendored
View File

0
android/assets/consolas16.png → assets/consolas16.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

0
android/assets/consolas48.fnt → assets/consolas48.fnt vendored
View File

0
android/assets/consolas48.png → assets/consolas48.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

0
android/assets/consolas8.fnt → assets/consolas8.fnt vendored
View File

0
android/assets/consolas8.png → assets/consolas8.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

0
android/assets/data/ds1types.txt → assets/data/ds1types.txt
View File

0
android/assets/data/obj.txt → assets/data/obj.txt
View File

0
android/assets/data/quests.txt → assets/data/quests.txt
View File

0
android/assets/data/speech.txt → assets/data/speech.txt
View File

0
android/assets/default.fnt → assets/default.fnt vendored
View File

0
android/assets/default.png → assets/default.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

0
android/assets/ds1edit.dt1 → assets/ds1edit.dt1 vendored
View File

0
android/assets/ic_launcher_128.png → assets/ic_launcher_128.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

0
android/assets/ic_launcher_16.png → assets/ic_launcher_16.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 902 B

After

Width:  |  Height:  |  Size: 902 B

0
android/assets/ic_launcher_32.png → assets/ic_launcher_32.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
android/assets/lang/Client.properties → assets/lang/Client.properties
View File

0
android/assets/profiler/uiskin.atlas → assets/profiler/uiskin.atlas
View File

0
android/assets/profiler/uiskin.json → assets/profiler/uiskin.json
View File

0
android/assets/profiler/uiskin.png → assets/profiler/uiskin.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

0
android/assets/shaders/indexpalette.frag → assets/shaders/indexpalette.frag
View File

0
android/assets/shaders/indexpalette.vert → assets/shaders/indexpalette.vert
View File

0
android/assets/shaders/indexpalette2.frag → assets/shaders/indexpalette2.frag
View File

0
android/assets/shaders/indexpalette2.vert → assets/shaders/indexpalette2.vert
View File

0
android/assets/shaders/indexpalette3.frag → assets/shaders/indexpalette3.frag
View File

0
android/assets/shaders/indexpalette3.vert → assets/shaders/indexpalette3.vert
View File

0
android/assets/textures/touchBackground.png → assets/textures/touchBackground.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
android/assets/textures/touchKnob.png → assets/textures/touchKnob.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

2
desktop/build.gradle
View File

@ -5,7 +5,7 @@ import org.apache.tools.ant.taskdefs.condition.Os
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
project.ext.mainClassName = 'com.riiablo.DesktopLauncher'
project.ext.assetsDir = new File('../android/assets');
project.ext.assetsDir = new File('../assets');
dependencies {
implementation project(':core')

2
ds1viewer/build.gradle
View File

@ -5,7 +5,7 @@ import org.apache.tools.ant.taskdefs.condition.Os
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
project.ext.mainClassName = 'com.riiablo.map.DS1Viewer'
project.ext.assetsDir = new File('../android/assets');
project.ext.assetsDir = new File('../assets');
project.ext.visuiVersion = '1.4.0'
dependencies {

2
server/d2gs/build.gradle
View File

@ -5,7 +5,7 @@ import org.apache.tools.ant.taskdefs.condition.Os
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
project.ext.mainClassName = 'com.riiablo.server.d2gs.D2GS'
project.ext.assetsDir = new File('../../android/assets');
project.ext.assetsDir = new File('../../assets');
task run(dependsOn: classes, type: JavaExec) {
main = project.mainClassName

2
server/netty/build.gradle
View File

@ -5,7 +5,7 @@ import org.apache.tools.ant.taskdefs.condition.Os
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
project.ext.mainClassName = 'com.riiablo.server.d2gs.Main'
project.ext.assetsDir = new File("../../android/assets");
project.ext.assetsDir = new File("../../assets");
task run(dependsOn: classes, type: JavaExec) {
main = project.mainClassName

4
tools/src/main/java/com/riiablo/codec/excel/BinGenerationTool.java
View File

@ -45,7 +45,7 @@ public class BinGenerationTool extends ApplicationAdapter {
FileHandle src = home.child("core/src").child(pkgPath);
Gdx.app.log(TAG, "src=" + src);
FileHandle dst = home.child("android/assets").child(args[1]);
FileHandle dst = home.child("assets").child(args[1]);
Gdx.app.log(TAG, "dst=" + dst);
FileHandle mpqPath = Gdx.files.absolute(args[2]);
@ -65,7 +65,7 @@ public class BinGenerationTool extends ApplicationAdapter {
FileHandle txt = mpqs.resolve("data\\global\\excel\\" + name + ".txt");
if (txt == null) { // attempt to resolve one of my own txts
txt = home.child("android/assets/data").child(name + ".txt");
txt = home.child("assets/data").child(name + ".txt");
if (!txt.exists()) continue;
}
FileHandle bin = dst.child(name + ".bin");