diff --git a/R6S/.idea/inspectionProfiles/Project_Default.xml b/R6S/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 9c62d0c..0000000 --- a/R6S/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - \ No newline at end of file diff --git a/R6S/.idea/inspectionProfiles/profiles_settings.xml b/R6S/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 3b31283..0000000 --- a/R6S/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/R6S/.idea/misc.xml b/R6S/.idea/misc.xml index fbb6828..60e3ac9 100644 --- a/R6S/.idea/misc.xml +++ b/R6S/.idea/misc.xml @@ -27,6 +27,31 @@ + + + + + + + + + Android > Lint > Correctness + + + Java + + + Probable bugsJava + + + + + Android + + + + + @@ -37,7 +62,7 @@ - + diff --git a/R6S/app/app-release.apk b/R6S/app/app-release.apk index 2e9759f..81c57a2 100644 Binary files a/R6S/app/app-release.apk and b/R6S/app/app-release.apk differ diff --git a/R6S/app/build.gradle b/R6S/app/build.gradle index 4ff4320..9d92793 100644 --- a/R6S/app/build.gradle +++ b/R6S/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "io.nicco.r6s" minSdkVersion 19 targetSdkVersion 23 - versionCode 1 - versionName "1.0" + versionCode 2 + versionName "1.1" } buildTypes { release { diff --git a/R6S/app/src/main/AndroidManifest.xml b/R6S/app/src/main/AndroidManifest.xml index a96e782..8d4f5c9 100644 --- a/R6S/app/src/main/AndroidManifest.xml +++ b/R6S/app/src/main/AndroidManifest.xml @@ -1,4 +1,4 @@ - + diff --git a/R6S/app/src/main/assets/Maps/Chalet/1 (1).jpg b/R6S/app/src/main/assets/Maps/Chalet/1 (1).jpg new file mode 100644 index 0000000..4c9f538 Binary files /dev/null and b/R6S/app/src/main/assets/Maps/Chalet/1 (1).jpg differ diff --git a/R6S/app/src/main/assets/Maps/Favela/0.jpg b/R6S/app/src/main/assets/Maps/Favela/0.jpg new file mode 100644 index 0000000..31d0742 Binary files /dev/null and b/R6S/app/src/main/assets/Maps/Favela/0.jpg differ diff --git a/R6S/app/src/main/assets/Maps/House/1 (1).jpg b/R6S/app/src/main/assets/Maps/House/1 (1).jpg new file mode 100644 index 0000000..added60 Binary files /dev/null and b/R6S/app/src/main/assets/Maps/House/1 (1).jpg differ diff --git a/R6S/app/src/main/assets/Maps/Yacht/0 (1).jpg b/R6S/app/src/main/assets/Maps/Yacht/0 (1).jpg new file mode 100644 index 0000000..e81960d Binary files /dev/null and b/R6S/app/src/main/assets/Maps/Yacht/0 (1).jpg differ diff --git a/R6S/app/src/main/assets/Maps/Yacht/1 (1).jpg b/R6S/app/src/main/assets/Maps/Yacht/1 (1).jpg new file mode 100644 index 0000000..39d25b5 Binary files /dev/null and b/R6S/app/src/main/assets/Maps/Yacht/1 (1).jpg differ diff --git a/R6S/app/src/main/assets/Operators/Attacker/Ash.jpeg b/R6S/app/src/main/assets/Operators/Attacker/Ash.jpeg deleted file mode 100644 index 7184f5c..0000000 Binary files a/R6S/app/src/main/assets/Operators/Attacker/Ash.jpeg and /dev/null differ diff --git a/R6S/app/src/main/assets/Operators/Attacker/Blackbeard.png b/R6S/app/src/main/assets/Operators/Attacker/Blackbeard.png new file mode 100644 index 0000000..3563177 Binary files /dev/null and b/R6S/app/src/main/assets/Operators/Attacker/Blackbeard.png differ diff --git a/R6S/app/src/main/assets/Operators/Attacker/Blitz.jpeg b/R6S/app/src/main/assets/Operators/Attacker/Blitz.jpeg deleted file mode 100644 index 831aa02..0000000 Binary files a/R6S/app/src/main/assets/Operators/Attacker/Blitz.jpeg and /dev/null differ diff --git a/R6S/app/src/main/assets/Operators/Attacker/Buck.jpeg b/R6S/app/src/main/assets/Operators/Attacker/Buck.jpeg deleted file mode 100644 index 4382649..0000000 Binary files a/R6S/app/src/main/assets/Operators/Attacker/Buck.jpeg and /dev/null differ diff --git a/R6S/app/src/main/assets/Operators/Attacker/Capitao.png b/R6S/app/src/main/assets/Operators/Attacker/Capitao.png new file mode 100644 index 0000000..a65b7bb Binary files /dev/null and b/R6S/app/src/main/assets/Operators/Attacker/Capitao.png differ diff --git a/R6S/app/src/main/assets/Operators/Attacker/Fuze.jpeg b/R6S/app/src/main/assets/Operators/Attacker/Fuze.jpeg deleted file mode 100644 index 42e96e1..0000000 Binary files a/R6S/app/src/main/assets/Operators/Attacker/Fuze.jpeg and /dev/null differ diff --git a/R6S/app/src/main/assets/Operators/Attacker/Glaz.jpeg b/R6S/app/src/main/assets/Operators/Attacker/Glaz.jpeg deleted file mode 100644 index 77f488e..0000000 Binary files a/R6S/app/src/main/assets/Operators/Attacker/Glaz.jpeg and /dev/null differ diff --git a/R6S/app/src/main/assets/Operators/Attacker/IQ.jpeg b/R6S/app/src/main/assets/Operators/Attacker/IQ.jpeg deleted file mode 100644 index bd64588..0000000 Binary files a/R6S/app/src/main/assets/Operators/Attacker/IQ.jpeg and /dev/null differ diff --git a/R6S/app/src/main/assets/Operators/Attacker/Montagne.jpeg b/R6S/app/src/main/assets/Operators/Attacker/Montagne.jpeg deleted file mode 100644 index 6681689..0000000 Binary files a/R6S/app/src/main/assets/Operators/Attacker/Montagne.jpeg and /dev/null differ diff --git a/R6S/app/src/main/assets/Operators/Attacker/Recruit.jpeg b/R6S/app/src/main/assets/Operators/Attacker/Recruit.jpeg deleted file mode 100644 index a736c1e..0000000 Binary files a/R6S/app/src/main/assets/Operators/Attacker/Recruit.jpeg and /dev/null differ diff --git a/R6S/app/src/main/assets/Operators/Attacker/Sledge.jpeg b/R6S/app/src/main/assets/Operators/Attacker/Sledge.jpeg deleted file mode 100644 index 3172dc4..0000000 Binary files a/R6S/app/src/main/assets/Operators/Attacker/Sledge.jpeg and /dev/null differ diff --git a/R6S/app/src/main/assets/Operators/Attacker/Thatcher.jpeg b/R6S/app/src/main/assets/Operators/Attacker/Thatcher.jpeg deleted file mode 100644 index 0424ee5..0000000 Binary files a/R6S/app/src/main/assets/Operators/Attacker/Thatcher.jpeg and /dev/null differ diff --git a/R6S/app/src/main/assets/Operators/Attacker/Thermite.jpeg b/R6S/app/src/main/assets/Operators/Attacker/Thermite.jpeg deleted file mode 100644 index 0c8bc81..0000000 Binary files a/R6S/app/src/main/assets/Operators/Attacker/Thermite.jpeg and /dev/null differ diff --git a/R6S/app/src/main/assets/Operators/Attacker/Twitch.jpeg b/R6S/app/src/main/assets/Operators/Attacker/Twitch.jpeg deleted file mode 100644 index 2d94922..0000000 Binary files a/R6S/app/src/main/assets/Operators/Attacker/Twitch.jpeg and /dev/null differ diff --git a/R6S/app/src/main/assets/Operators/Defender/Bandit.jpeg b/R6S/app/src/main/assets/Operators/Defender/Bandit.jpeg deleted file mode 100644 index 636f0f7..0000000 Binary files a/R6S/app/src/main/assets/Operators/Defender/Bandit.jpeg and /dev/null differ diff --git a/R6S/app/src/main/assets/Operators/Defender/Castle.jpeg b/R6S/app/src/main/assets/Operators/Defender/Castle.jpeg deleted file mode 100644 index aea03ab..0000000 Binary files a/R6S/app/src/main/assets/Operators/Defender/Castle.jpeg and /dev/null differ diff --git a/R6S/app/src/main/assets/Operators/Defender/Caveira.png b/R6S/app/src/main/assets/Operators/Defender/Caveira.png new file mode 100644 index 0000000..555eabf Binary files /dev/null and b/R6S/app/src/main/assets/Operators/Defender/Caveira.png differ diff --git a/R6S/app/src/main/assets/Operators/Defender/Doc.jpeg b/R6S/app/src/main/assets/Operators/Defender/Doc.jpeg deleted file mode 100644 index 4363668..0000000 Binary files a/R6S/app/src/main/assets/Operators/Defender/Doc.jpeg and /dev/null differ diff --git a/R6S/app/src/main/assets/Operators/Defender/Frost.jpeg b/R6S/app/src/main/assets/Operators/Defender/Frost.jpeg deleted file mode 100644 index 97fab53..0000000 Binary files a/R6S/app/src/main/assets/Operators/Defender/Frost.jpeg and /dev/null differ diff --git a/R6S/app/src/main/assets/Operators/Defender/Jager.jpeg b/R6S/app/src/main/assets/Operators/Defender/Jager.jpeg deleted file mode 100644 index 92e8f51..0000000 Binary files a/R6S/app/src/main/assets/Operators/Defender/Jager.jpeg and /dev/null differ diff --git a/R6S/app/src/main/assets/Operators/Defender/Kapkan.jpeg b/R6S/app/src/main/assets/Operators/Defender/Kapkan.jpeg deleted file mode 100644 index c4a1624..0000000 Binary files a/R6S/app/src/main/assets/Operators/Defender/Kapkan.jpeg and /dev/null differ diff --git a/R6S/app/src/main/assets/Operators/Defender/Mute.jpeg b/R6S/app/src/main/assets/Operators/Defender/Mute.jpeg deleted file mode 100644 index 1e5b6c1..0000000 Binary files a/R6S/app/src/main/assets/Operators/Defender/Mute.jpeg and /dev/null differ diff --git a/R6S/app/src/main/assets/Operators/Defender/Pulse.jpeg b/R6S/app/src/main/assets/Operators/Defender/Pulse.jpeg deleted file mode 100644 index 8c3fa2a..0000000 Binary files a/R6S/app/src/main/assets/Operators/Defender/Pulse.jpeg and /dev/null differ diff --git a/R6S/app/src/main/assets/Operators/Defender/Recruit.jpeg b/R6S/app/src/main/assets/Operators/Defender/Recruit.jpeg deleted file mode 100644 index a61a4cb..0000000 Binary files a/R6S/app/src/main/assets/Operators/Defender/Recruit.jpeg and /dev/null differ diff --git a/R6S/app/src/main/assets/Operators/Defender/Rook.jpeg b/R6S/app/src/main/assets/Operators/Defender/Rook.jpeg deleted file mode 100644 index 1286fcb..0000000 Binary files a/R6S/app/src/main/assets/Operators/Defender/Rook.jpeg and /dev/null differ diff --git a/R6S/app/src/main/assets/Operators/Defender/Smoke.jpeg b/R6S/app/src/main/assets/Operators/Defender/Smoke.jpeg deleted file mode 100644 index d22af18..0000000 Binary files a/R6S/app/src/main/assets/Operators/Defender/Smoke.jpeg and /dev/null differ diff --git a/R6S/app/src/main/assets/Operators/Defender/Tachanka.jpeg b/R6S/app/src/main/assets/Operators/Defender/Tachanka.jpeg deleted file mode 100644 index d432a04..0000000 Binary files a/R6S/app/src/main/assets/Operators/Defender/Tachanka.jpeg and /dev/null differ diff --git a/R6S/app/src/main/assets/Operators/Defender/Valkyrie.png b/R6S/app/src/main/assets/Operators/Defender/Valkyrie.png new file mode 100644 index 0000000..5be5f01 Binary files /dev/null and b/R6S/app/src/main/assets/Operators/Defender/Valkyrie.png differ