Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
2428f74
v22 branch
Dec 18, 2018
3512fce
[#163202496] added functional pause button to cave runner
leoleblanc Jan 15, 2019
16054e5
Merge pull request #50 from skillz/feature-add-pause-button
leoleblanc Jan 16, 2019
3acfc4d
Setting to staging, bumping snapshot and versions
erenn16 Jan 18, 2019
f27a373
Updating groovy script
erenn16 Jan 18, 2019
7bc81c9
[#163065674] adding menu to accompany pause screen in Cave Runner
leoleblanc Jan 25, 2019
9309e2b
[#163065674] removing unused code, adding clarifications
leoleblanc Jan 25, 2019
f138c61
Update GameController.js
leoleblanc Jan 25, 2019
3663487
Merge pull request #51 from skillz/feature-add-pause-menu
leoleblanc Jan 25, 2019
4533ae7
[#163065702] adding ui sliders to pause menu for cave runner
leoleblanc Jan 29, 2019
2797de8
Merge pull request #52 from skillz/feature-add-ui-sliders
leoleblanc Jan 29, 2019
ca23528
[#160766050] adding appropriate API calls to cave runner, and also se…
leoleblanc Jan 30, 2019
d6521bc
[#160766050] fixing spacing in MenuItem
leoleblanc Jan 30, 2019
5f63115
[#160766050] Modifying Prefab to include music for audio integration
leoleblanc Jan 30, 2019
b144e00
[#160766050] condensed some unnecessarily verbose code in the cross-p…
leoleblanc Jan 30, 2019
735712a
Merge pull request #53 from skillz/feature-integrate-audio-api
leoleblanc Jan 30, 2019
a4ba5ce
[#163578260] make cave runner C# files match Unity cross platform rep…
leoleblanc Feb 14, 2019
1b26804
Merge pull request #54 from skillz/update-c#-files
leoleblanc Feb 14, 2019
3311034
[#164119920, #164024212] includes changes required for Audio Integrat…
leoleblanc Feb 26, 2019
a82384e
Update MenuItem_.js
leoleblanc Feb 26, 2019
7fbb5c5
Update PauseMenu.cs
leoleblanc Feb 26, 2019
c75a0e2
Update Api.cs
leoleblanc Feb 26, 2019
d837c4c
Update Skillz.cs
leoleblanc Feb 26, 2019
0ee78f9
Update SkillzCrossPlatform.cs
leoleblanc Feb 26, 2019
377598c
[#164119920, #164024212] added another necessary change to pause menu…
leoleblanc Feb 26, 2019
76e9992
Merge pull request #56 from skillz/cave-runner-v22
leoleblanc Feb 26, 2019
22c9e0c
[#164119920, #164024212] audio integration updates for iOS
leoleblanc Feb 27, 2019
a6b75e5
[#164119920, #164024212] adding xcode proj linking changes
leoleblanc Feb 27, 2019
dc784d7
updating libiPhone-lib.a symlink
leoleblanc Feb 27, 2019
dfa6977
Merge pull request #57 from skillz/cave-runner-v22-iOS-updates
leoleblanc Feb 27, 2019
c65f6d4
attempt at reverting provisioning changes
leoleblanc Mar 1, 2019
d3891d8
more reverts for pbxproj
leoleblanc Mar 1, 2019
eb7802f
removing symlink reference
leoleblanc Mar 1, 2019
7438a5b
adding data directory, removing local sdk reference
leoleblanc Mar 1, 2019
fd7f1af
adding updating skillz framework
leoleblanc Mar 1, 2019
1f479fe
re-adding libiPhone-lib symlink
leoleblanc Mar 1, 2019
b092902
updating embedded framework
leoleblanc Mar 1, 2019
c6b2116
updating pbxproj file
leoleblanc Mar 1, 2019
259e40c
updating pbxproj to inlcude Skillz+Unity.mm
leoleblanc Mar 1, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
10 changes: 7 additions & 3 deletions Android/3D Cave Runner - Android Studio/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

348 changes: 221 additions & 127 deletions Android/3D Cave Runner - Android Studio/.idea/workspace.xml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="3D Cave Runner - Android Studio" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<module external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
<option name="BUILDABLE" value="false" />
<option name="GRADLE_PROJECT_PATH" value=":" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
<orderEntry type="inheritedJdk" />
<content url="file://$MODULE_DIR$" />
<orderEntry type="jdk" jdkName="1.8 (1)" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

Large diffs are not rendered by default.

63 changes: 32 additions & 31 deletions Android/3D Cave Runner - Android Studio/app/app.iml

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions Android/3D Cave Runner - Android Studio/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
def versionMajor = 5
def versionMinor = 0
def versionPatch = 25
def versionPatch = 27
def versionBuild = System.getenv('BUILD_NUMBER') ? Integer.parseInt(System.getenv('BUILD_NUMBER')) : 1

buildscript {
Expand Down Expand Up @@ -133,14 +133,14 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
fullImplementation 'com.skillz.sdk:skillz-sdk-android:21.0.14-SNAPSHOT'
vconlyImplementation 'com.skillz.sdk:skillz-sdk-android:21.0.14-SNAPSHOT'
fullImplementation 'com.skillz.sdk:skillz-sdk-android:22.0.2-SNAPSHOT'
vconlyImplementation 'com.skillz.sdk:skillz-sdk-android:22.0.2-SNAPSHOT'
localSDKImplementation project(':sdk')

api ('com.crashlytics.sdk.android:crashlytics:2.9.4@aar') {
api ('com.crashlytics.sdk.android:crashlytics:2.9.4@aar'){
transitive=true
}
implementation 'com.google.android.gms:play-services-gcm:15.0.1'
implementation 'com.google.android.gms:play-services-gcm:16.0.0'
}

apply plugin: 'com.google.gms.google-services'
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
<meta-data
android:name="skillz_production"
android:value="true" />
<meta-data
android:name="skillz_server_url"
android:value="https://staging.skillz.com" />

<meta-data android:name="skillz_orientation" android:value="portrait" />
<meta-data android:name="skillz_game_activity" android:value="com.skillzgames.caverun.SkillzUnityPlayerActivity"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
<meta-data
android:name="skillz_production"
android:value="true" />
<meta-data
android:name="skillz_server_url"
android:value="https://staging.skillz.com" />

<meta-data android:name="skillz_orientation" android:value="portrait" />
<meta-data android:name="skillz_game_activity" android:value="com.skillzgames.caverun.SkillzUnityPlayerActivity"/>
Expand Down
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
wait-for-native-debugger=0
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.
Loading