Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it

.gitlab-ci.yml

@@ -16,6 +16,28 @@ variables:
         variables:
             - $RUN_NON_RELEASE_BUILDS
 
+.release_build:
+    artifacts:
+        expire_in: 1 week
+
+WebGL [Release]:
+    when: on_success
+
+pages:
+    when: on_success
+    start_in:
+
+Deploy Nextcloud:
+    when: manual
+    allow_failure: false
+    start_in:
+
+Release:
+    when: manual
+    allow_failure: false
+    dependencies:
+        - Deploy Nextcloud
+
 include:
 # Base
     - https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/build-base.yml

Assets/_Game/Data/Player Data/Movement Data/Movement States.asset

@@ -13,7 +13,7 @@ MonoBehaviour:
   m_Name: Movement States
   m_EditorClassIdentifier: Assembly-CSharp:_Game.Scripts.Scriptable_Object:MovementStates
   airMoveState:
-    jumpForce: 5
+    jumpForce: 10
     smoothing: 0.03
     airControl: 1
     canSwim: 1

Assets/_Game/Data/Player Data/PlayerState.asset

@@ -12,15 +12,17 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 353b156b7c59b1c45a8767d7500b31fb, type: 3}
   m_Name: PlayerState
   m_EditorClassIdentifier: 
-  currentInfusedElement: 2
+  currentInfusedElement: 1
   currentMoveState:
-    jumpForce: 10
+    jumpForce: 15
     smoothing: 0.03
     airControl: 1
     canSwim: 1
     moveSpeed: 20
-    maxJumpCount: 1
+    maxJumpCount: 2
     mass: 1
     gravity: 3
   movementStates: {fileID: 11400000, guid: c757aad6925b37a46b916f609fa9012b, type: 2}
-  charges: 2
+  onElementInfused: {fileID: 11400000, guid: 7e5b80a8353af1846a878c3a997bdb4a, type: 2}
+  onChargeChange: {fileID: 11400000, guid: 6ec6544f645a9d1458383b111fcaf8b6, type: 2}
+  charges: 0

Assets/_Game/Graphics/Sprite/HUD/AttackBox.png.meta

-fileFormatVersion: 2
-guid: f7ec8ad896f47904cb7499a6425f0c4c
-TextureImporter:
-  fileIDToRecycleName: {}
-  externalObjects: {}
-  serializedVersion: 9
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
-    wrapU: 1
-    wrapV: 1
-    wrapW: -1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  platformSettings:
-  - serializedVersion: 2
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: