Skip to content

Commit b74972f

Browse files
committed
Merge remote-tracking branch 'origin/develop' into feature/improve-textures
2 parents a5da3fc + 207c8ce commit b74972f

180 files changed

Lines changed: 435 additions & 433 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

api/pubspec.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -504,10 +504,10 @@ packages:
504504
dependency: transitive
505505
description:
506506
name: watcher
507-
sha256: "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a"
507+
sha256: "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c"
508508
url: "https://pub.dev"
509509
source: hosted
510-
version: "1.1.2"
510+
version: "1.1.3"
511511
web:
512512
dependency: transitive
513513
description:

app/android/Gemfile.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ GEM
1111
artifactory (3.0.17)
1212
atomos (0.1.3)
1313
aws-eventstream (1.4.0)
14-
aws-partitions (1.1148.0)
15-
aws-sdk-core (3.229.0)
14+
aws-partitions (1.1153.0)
15+
aws-sdk-core (3.232.0)
1616
aws-eventstream (~> 1, >= 1.3.0)
1717
aws-partitions (~> 1, >= 1.992.0)
1818
aws-sigv4 (~> 1.9)
1919
base64
2020
bigdecimal
2121
jmespath (~> 1, >= 1.6.1)
2222
logger
23-
aws-sdk-kms (1.110.0)
24-
aws-sdk-core (~> 3, >= 3.228.0)
23+
aws-sdk-kms (1.112.0)
24+
aws-sdk-core (~> 3, >= 3.231.0)
2525
aws-sigv4 (~> 1.5)
26-
aws-sdk-s3 (1.197.0)
27-
aws-sdk-core (~> 3, >= 3.228.0)
26+
aws-sdk-s3 (1.198.0)
27+
aws-sdk-core (~> 3, >= 3.231.0)
2828
aws-sdk-kms (~> 1)
2929
aws-sigv4 (~> 1.5)
3030
aws-sigv4 (1.12.1)
@@ -182,17 +182,17 @@ GEM
182182
trailblazer-option (>= 0.1.1, < 0.2.0)
183183
uber (< 0.2.0)
184184
retriable (3.1.2)
185-
rexml (3.4.1)
185+
rexml (3.4.2)
186186
rouge (3.28.0)
187187
ruby2_keywords (0.0.5)
188188
rubyzip (2.4.1)
189189
screengrab (1.0.0)
190190
fastlane (>= 2.0.0, < 3.0.0)
191191
security (0.1.5)
192-
signet (0.20.0)
192+
signet (0.21.0)
193193
addressable (~> 2.8)
194194
faraday (>= 0.17.5, < 3.a)
195-
jwt (>= 1.5, < 3.0)
195+
jwt (>= 1.5, < 4.0)
196196
multi_json (~> 1.10)
197197
simctl (1.6.10)
198198
CFPropertyList
-40 KB

app/assets/images/ground.png

-228 Bytes

app/assets/images/hud.png

-243 Bytes

app/assets/images/player.png

-67 Bytes

app/assets/images/selection.png

-24 Bytes

app/assets/images/wall.png

-130 Bytes

app/images/ground.png

-194 Bytes

app/images/hud.png

-206 Bytes

0 commit comments

Comments
 (0)