Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
PhaseShifter
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
3
Issues
3
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
GameDevWeek
S
Sommersemester 2019
Cpp
PhaseShifter
Commits
72bd3f4f
Commit
72bd3f4f
authored
Sep 21, 2019
by
Kevin Balz
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into feature/36-level-design
parents
20b3ef6c
ec40ece9
Pipeline
#3389
canceled with stage
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
2 deletions
+2
-2
assets_raw/Idle.fbx
assets_raw/Idle.fbx
+0
-0
assets_raw/Stable Sword Inward Slash.fbx
assets_raw/Stable Sword Inward Slash.fbx
+0
-0
external/mirrage
external/mirrage
+1
-1
src/game_engine.cpp
src/game_engine.cpp
+1
-1
No files found.
assets_raw/Idle.fbx
0 → 100644
View file @
72bd3f4f
File added
assets_raw/Stable Sword Inward Slash.fbx
0 → 100644
View file @
72bd3f4f
File added
mirrage
@
cb6eadc2
Compare
e4f5314a
...
cb6eadc2
Subproject commit
e4f5314a25e5a7ea821819e9d6471acf16af99fd
Subproject commit
cb6eadc2c7376ca1651c648fe196d0087658d738
src/game_engine.cpp
View file @
72bd3f4f
...
...
@@ -82,7 +82,7 @@ namespace phase_shifter {
_global_render
->
draw
();
_renderer_factory
->
finish_frame
();
_global_render
->
device
().
wait_idle
();
//
_global_render->device().wait_idle();
}
}
// namespace phase_shifter
Write
Preview
Markdown
is supported
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