Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
FP Asteroids
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
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
Edwin
FP Asteroids
Compare revisions
d16bacfce67d4f63d093597e2f263a211ef08e30 to cb7a16706e3e54789004f9b1eef5e096b846d2dc
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
9562850/fp-asteroids
Select target project
No results found
cb7a16706e3e54789004f9b1eef5e096b846d2dc
Select Git revision
Swap
Target
9562850/fp-asteroids
Select target project
9562850/fp-asteroids
1 result
d16bacfce67d4f63d093597e2f263a211ef08e30
Select Git revision
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (2)
remove debug meteor timer message
· 23c36ae7
Edwin
authored
4 months ago
23c36ae7
Merge branch 'main' of
https://git.science.uu.nl/9562850/fp-asteroids
· cb7a1670
Edwin
authored
4 months ago
cb7a1670
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/View.hs
+2
-2
2 additions, 2 deletions
src/View.hs
src/highscores.txt
+2
-7
2 additions, 7 deletions
src/highscores.txt
with
4 additions
and
9 deletions
src/View.hs
View file @
cb7a1670
...
...
@@ -60,7 +60,7 @@ viewPure gstate@(GameState {screen, ufos, meteorTimer, spaceShip, player, poweru
let
score'
=
color
yellow
(
textPlus
(
textX
,
textY
-
30
)
textSize
$
"score: "
++
show
(
score
player
))
let
velocity'
=
color
green
(
textPlus
(
textX
,
textY
-
60
)
textSize
$
"speed: "
++
show
(
round
$
getVelocity
spaceShip
)
++
" m/s"
)
let
time
=
color
green
(
textPlus
(
textX
,
textY
-
90
)
textSize
$
"time: "
++
printf
"%.3f"
elapsedTime
++
" s"
)
let
debug
=
color
red
(
textPlus
(
textX
,
textY
-
120
)
textSize
$
"meteortimer: "
++
printf
"%.3f"
meteorTimer
)
--
let debug = color red (textPlus (textX, textY - 120) textSize $ "meteortimer: " ++ printf "%.3f" meteorTimer)
let
notif
=
color
white
(
textPlus
(
-
100
,
textY
)
textSize
$
notification
)
let
tooltip'
=
color
(
greyN
0.5
)
(
textPlus
(
-
50
,
textY
-
30
)
(
textSize
-
0.06
)
$
tooltip
)
...
...
@@ -76,7 +76,7 @@ viewPure gstate@(GameState {screen, ufos, meteorTimer, spaceShip, player, poweru
let
explos'
=
pictures
(
map
toImage
$
explosions
gstate
)
let
pics
=
[
debug
,
player'
,
explos'
,
ufos'
,
meteors'
,
score'
,
tooltip'
,
notif
,
powerup'
,
time
,
velocity'
,
ship'
,
bullets'
,
bulletss'
]
let
pics
=
[
player'
,
explos'
,
ufos'
,
meteors'
,
score'
,
tooltip'
,
notif
,
powerup'
,
time
,
velocity'
,
ship'
,
bullets'
,
bulletss'
]
pictures
pics
maybeMake
::
Maybe
Powerup
->
Picture
...
...
This diff is collapsed.
Click to expand it.
src/highscores.txt
View file @
cb7a1670
("Player", 2720)
("Player", 1990)
("Player", 720)
("Roderick", 12140)
("boris", 640)
("Player", 410)
("Player", 320)
("Player", 310)
("Player", 290)
("gerda", 290)
This diff is collapsed.
Click to expand it.