Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GameDevWeek
Sommersemester 2019
Cpp
PhaseShifter
Commits
c7c1943c
Commit
c7c1943c
authored
Sep 18, 2019
by
Tim Scheiber
Browse files
Resolved conflicts
parent
cce65035
Pipeline
#3258
failed with stage
in 6 minutes and 55 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/gameplay/beat_system.hpp
View file @
c7c1943c
...
...
@@ -11,7 +11,7 @@ namespace phase_shifter::gameplay {
float
time_to_beat
=
0.
f
;
float
avg_beat_time
=
1.
f
;
int
beats_left
=
999
.
f
;
int
beats_left
=
999
;
};
// TODO: replace placeholder logic with actual beat detection
...
...
src/meta_system.cpp
View file @
c7c1943c
...
...
@@ -93,11 +93,7 @@ namespace phase_shifter {
.
position
(
glm
::
rotate
(
sun_dir
,
glm
::
vec3
(
0
,
0
,
1
))
*
40.
f
)
.
create
();
<<<<<<<
HEAD
=======
_level_system
->
load
(
"dummy"
);
>>>>>>>
develop
}
Meta_system
::~
Meta_system
()
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment