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
Merge requests
!62
Resolve "Reset methods functionality"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "Reset methods functionality"
65-reset-methods-functionality
into
dev
Overview
0
Commits
5
Pipelines
0
Changes
12
Merged
Haakon Gunleiksrud
requested to merge
65-reset-methods-functionality
into
dev
5 years ago
Overview
0
Commits
5
Pipelines
0
Changes
12
Expand
Closes
#65 (closed)
Edited
5 years ago
by
Haakon Gunleiksrud
0
0
Merge request reports
Compare
dev
version 4
70ea3223
5 years ago
version 3
9b93de83
5 years ago
version 2
f4898e10
5 years ago
version 1
fd28af42
5 years ago
dev (base)
and
latest version
latest version
e195c774
5 commits,
5 years ago
version 4
70ea3223
4 commits,
5 years ago
version 3
9b93de83
3 commits,
5 years ago
version 2
f4898e10
2 commits,
5 years ago
version 1
fd28af42
1 commit,
5 years ago
12 files
+
80
−
34
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
12
Search (e.g. *.vue) (Ctrl+P)
frontend/core/src/com/gameware/game/sprites/Bubble.java
+
7
−
4
Options
@@ -21,6 +21,7 @@ public class Bubble extends Actor {
private
boolean
textureChanged
=
false
;
private
int
timesTouched
;
private
ArrayList
<
Texture
>
poppedTextures
;
private
Texture
unpoppedTex
;
// Wrapping Texture in Image because Image extends Widget extends Actor, so it can be used in a table
private
Image
bubble
;
@@ -31,6 +32,8 @@ public class Bubble extends Actor {
this
.
id
=
id
;
this
.
timesTouched
=
0
;
this
.
unpoppedTex
=
unpoppedTex
;
bubble
=
new
Image
(
unpoppedTex
);
// Add different textures for popped bubbles
@@ -91,10 +94,10 @@ public class Bubble extends Actor {
}
public
void
reset
()
{
}
public
Object
report
()
{
return
null
;
justTouched
=
false
;
textureChanged
=
false
;
timesTouched
=
0
;
this
.
bubble
.
setDrawable
(
new
TextureRegionDrawable
(
new
TextureRegion
(
this
.
unpoppedTex
)))
;
}
public
void
dispose
()
{
Loading