Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BattleArena
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Scherbaum Maximilian
BattleArena
Merge requests
!12
merge LokalGameplay into development
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
merge LokalGameplay into development
LocalGameplay
into
development
Overview
0
Commits
7
Pipelines
0
Changes
5
Merged
Scherbaum Maximilian
requested to merge
LocalGameplay
into
development
1 year ago
Overview
0
Commits
7
Pipelines
0
Changes
5
Expand
0
0
Merge request reports
Viewing commit
b5a7035f
Prev
Next
Show latest version
5 files
+
4
−
4
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
5
Search (e.g. *.vue) (Ctrl+P)
b5a7035f
update: Player.java implemented new textures
#38
· b5a7035f
Scherbaum Maximilian
authored
1 year ago
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java
+
4
−
4
Options
@@ -152,8 +152,8 @@ class Player implements IEntity {
}
private
void
loadHighBornSprites
()
{
directionDownOne
=
new
Image
(
Objects
.
requireNonNull
(
getClass
().
getResourceAsStream
(
"/textures/player/
Huma
nDown0
1
.png"
)));
directionDownTwo
=
new
Image
(
Objects
.
requireNonNull
(
getClass
().
getResourceAsStream
(
"/textures/player/
Huma
nDown0
2
.png"
)));
directionDownOne
=
new
Image
(
Objects
.
requireNonNull
(
getClass
().
getResourceAsStream
(
"/textures/player/
high_born/HighBor
nDown0
0
.png"
)));
directionDownTwo
=
new
Image
(
Objects
.
requireNonNull
(
getClass
().
getResourceAsStream
(
"/textures/player/
high_born/HighBor
nDown0
1
.png"
)));
directionUpOne
=
new
Image
(
Objects
.
requireNonNull
(
getClass
().
getResourceAsStream
(
"/textures/player/upOne.png"
)));
directionUpTwo
=
new
Image
(
Objects
.
requireNonNull
(
getClass
().
getResourceAsStream
(
"/textures/player/upTwo.png"
)));
directionLeftOne
=
new
Image
(
Objects
.
requireNonNull
(
getClass
().
getResourceAsStream
(
"/textures/player/leftOne.png"
)));
@@ -174,8 +174,8 @@ class Player implements IEntity {
}
private
void
loadSentinelsSprites
()
{
directionDownOne
=
new
Image
(
Objects
.
requireNonNull
(
getClass
().
getResourceAsStream
(
"/textures/player/
Human
Down0
1
.png"
)));
directionDownTwo
=
new
Image
(
Objects
.
requireNonNull
(
getClass
().
getResourceAsStream
(
"/textures/player/
Human
Down0
2
.png"
)));
directionDownOne
=
new
Image
(
Objects
.
requireNonNull
(
getClass
().
getResourceAsStream
(
"/textures/player/
sentinels/Sentinel
Down0
0
.png"
)));
directionDownTwo
=
new
Image
(
Objects
.
requireNonNull
(
getClass
().
getResourceAsStream
(
"/textures/player/
sentinels/Sentinel
Down0
1
.png"
)));
directionUpOne
=
new
Image
(
Objects
.
requireNonNull
(
getClass
().
getResourceAsStream
(
"/textures/player/upOne.png"
)));
directionUpTwo
=
new
Image
(
Objects
.
requireNonNull
(
getClass
().
getResourceAsStream
(
"/textures/player/upTwo.png"
)));
directionLeftOne
=
new
Image
(
Objects
.
requireNonNull
(
getClass
().
getResourceAsStream
(
"/textures/player/leftOne.png"
)));
Loading