Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
TDT4240 Tank Wars
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Snorre Skjellestad Kristiansen
TDT4240 Tank Wars
Commits
feec88f8
Commit
feec88f8
authored
2 years ago
by
Magnus Segtnan Skjølberg
Browse files
Options
Downloads
Patches
Plain Diff
(
#18
): changes healthbar and slider
parent
733fcccf
No related branches found
Branches containing commit
No related tags found
3 merge requests
!51
Resolve "Adjust cannon angle from touch input"
,
!35
Draft: Resolve "Adjust cannon angle from touch input"
,
!32
Combine hud with gameplay
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
frontend/assets/gameplay-skin.atlas
+21
-22
21 additions, 22 deletions
frontend/assets/gameplay-skin.atlas
frontend/assets/gameplay-skin.json
+0
-0
0 additions, 0 deletions
frontend/assets/gameplay-skin.json
frontend/assets/gameplay-skin.png
+0
-0
0 additions, 0 deletions
frontend/assets/gameplay-skin.png
with
21 additions
and
22 deletions
frontend/assets/gameplay-skin.atlas
+
21
−
22
View file @
feec88f8
...
...
@@ -6,7 +6,7 @@ filter: Linear, Linear
repeat: none
fire-button-light.9
rotate: false
xy:
1, 1
xy:
67, 213
size: 32, 32
split: 1, 1, 1, 1
pad: 13, 13, 2, 2
...
...
@@ -15,7 +15,7 @@ fire-button-light.9
index: -1
fire-button.9
rotate: false
xy:
46
, 1
81
xy:
1
, 1
size: 32, 32
split: 1, 1, 1, 1
pad: 13, 13, 1, 1
...
...
@@ -54,18 +54,9 @@ move-right.9
orig: 43, 43
offset: 0, 0
index: -1
power-slider.9
rotate: false
xy: 1, 215
size: 64, 32
split: 2, 2, 2, 2
pad: 31, 30, 15, 14
orig: 64, 32
offset: 0, 0
index: -1
progress-background.9
rotate: false
xy:
67
, 21
5
xy:
101
, 21
3
size: 32, 32
split: 3, 3, 3, 3
pad: 1, 1, 1, 1
...
...
@@ -74,24 +65,32 @@ progress-background.9
index: -1
progress-knob
rotate: false
xy: 1
01
, 21
7
xy: 1
69
, 21
5
size: 30, 30
orig: 30, 30
offset: 0, 0
index: -1
slider-
knob-top
.9
slider-
background
.9
rotate: false
xy: 46, 109
size: 10, 36
split: 0, 0, 0, 0
orig: 10, 36
xy: 135, 213
size: 32, 32
split: 1, 1, 1, 1
orig: 32, 32
offset: 0, 0
index: -1
slider-knob-before.9
rotate: false
xy: 1, 215
size: 64, 30
split: 1, 1, 1, 1
orig: 64, 30
offset: 0, 0
index: -1
slider-knob.9
rotate: false
xy: 46, 1
4
7
size: 10, 3
2
split:
0
,
0
,
0
,
0
orig: 10, 3
2
xy: 46, 1
7
7
size: 10, 3
6
split:
1
,
1
,
1
,
1
orig: 10, 3
6
offset: 0, 0
index: -1
This diff is collapsed.
Click to expand it.
frontend/assets/gameplay-skin.json
+
0
−
0
View file @
feec88f8
No preview for this file type
This diff is collapsed.
Click to expand it.
frontend/assets/gameplay-skin.png
+
0
−
0
View replaced file @
733fcccf
View file @
feec88f8
8.54 KiB
|
W:
|
H:
9.06 KiB
|
W:
|
H:
2-up
Swipe
Onion skin
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment