Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
Progark gruppe 3
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
Releases
Container registry
Model registry
Operate
Environments
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
Tobias Ingebrigt Ørstad
Progark gruppe 3
Commits
533ff1e0
Commit
533ff1e0
authored
5 years ago
by
Haakon Gunleiksrud
Browse files
Options
Downloads
Plain Diff
Merge branch '96-add-loading-text-to-enter-tournament' into 'dev'
Resolve "Add loading text to enter tournament" Closes
#96
See merge request
!99
parents
96005c3c
e5daea35
Branches
Branches containing commit
No related tags found
1 merge request
!99
Resolve "Add loading text to enter tournament"
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java
+20
-1
20 additions, 1 deletion
...c/com/gameware/game/states/CreateJoinTournamentState.java
with
20 additions
and
1 deletion
frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java
+
20
−
1
View file @
533ff1e0
...
@@ -70,6 +70,10 @@ public class CreateJoinTournamentState extends State {
...
@@ -70,6 +70,10 @@ public class CreateJoinTournamentState extends State {
private
boolean
includeCheckboxClicked
=
false
;
private
boolean
includeCheckboxClicked
=
false
;
private
boolean
leaveConfirmed
=
false
;
private
boolean
leaveConfirmed
=
false
;
private
boolean
joinButtonClicked
=
false
;
private
boolean
joinButtonClicked
=
false
;
private
boolean
enterButtonClicked
=
false
;
private
Tournament
enteredTournament
;
private
Round
enteredRound
;
private
LoadingText
loadingText
=
new
LoadingText
();
private
LoadingText
loadingText
=
new
LoadingText
();
public
CreateJoinTournamentState
(
GameStateManager
gsm
)
{
public
CreateJoinTournamentState
(
GameStateManager
gsm
)
{
...
@@ -293,6 +297,14 @@ public class CreateJoinTournamentState extends State {
...
@@ -293,6 +297,14 @@ public class CreateJoinTournamentState extends State {
this
.
joinButtonClicked
=
false
;
this
.
joinButtonClicked
=
false
;
}
}
// User pressed the enter tournament button
if
(
this
.
enterButtonClicked
&&
this
.
loadingText
.
textIsRendering
()){
this
.
handleEnterBtnClick
(
this
.
enteredTournament
,
this
.
enteredRound
);
this
.
enterButtonClicked
=
false
;
this
.
enteredTournament
=
null
;
this
.
enteredRound
=
null
;
}
this
.
loadingText
.
update
(
dt
);
this
.
loadingText
.
update
(
dt
);
}
}
...
@@ -319,6 +331,13 @@ public class CreateJoinTournamentState extends State {
...
@@ -319,6 +331,13 @@ public class CreateJoinTournamentState extends State {
this
.
loadingText
.
setLoading
();
this
.
loadingText
.
setLoading
();
}
}
private
void
setEnterButtonClicked
(
Tournament
clickedTournament
,
Round
enteredRound
){
this
.
enterButtonClicked
=
true
;
this
.
enteredTournament
=
clickedTournament
;
this
.
enteredRound
=
enteredRound
;
this
.
loadingText
.
setLoading
();
}
// Handle click methods
// Handle click methods
...
@@ -405,7 +424,7 @@ public class CreateJoinTournamentState extends State {
...
@@ -405,7 +424,7 @@ public class CreateJoinTournamentState extends State {
}
}
public
void
clicked
(
InputEvent
event
,
float
x
,
float
y
)
{
public
void
clicked
(
InputEvent
event
,
float
x
,
float
y
)
{
handle
EnterB
t
nClick
(
tournament
,
round
);
set
EnterB
utto
nClick
ed
(
tournament
,
round
);
};
};
}
}
...
...
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