 viktorljung
|
c1ba6481df
|
Merge remote-tracking branch 'origin/master' into Physics
Conflicts:
include/Game/BallSystem.h
include/Game/ProjectileSystem.h
src/game/Game/BallSystem.cpp
src/game/Game/ProjectileSystem.cpp
src/game/Rendering/AnimationSystem.cpp
|
2015-10-23 14:47:04 +02:00 |
|
|
viktorljung
|
6206859568
|
Animations in the game
|
2015-10-23 14:35:11 +02:00 |
|
 Jace
|
9158dd8ef7
|
Screen shake working
|
2015-10-23 14:26:08 +02:00 |
|
|
Jace
|
52f7e3f64b
|
Control over animation looping and event on animation completion
|
2015-10-21 15:38:34 +02:00 |
|
|
Jace
|
d197ec07ad
|
Merge branch 'master' into directx
Conflicts:
include/Core/Engine.h
|
2015-10-20 15:13:20 +02:00 |
|
|
Jace
|
80f34b27b9
|
OpenGL renderer back in working condition
|
2015-10-20 14:31:12 +02:00 |
|
|
Jace
|
aacc194358
|
Passthrough shader for DirectX GUI
|
2015-10-20 13:52:07 +02:00 |
|
|
Jace
|
4175b29653
|
DirectX GUI rendering
|
2015-10-20 12:07:40 +02:00 |
|
|
Jace
|
4a3575190f
|
DX sprites and stuff I guess
|
2015-10-19 17:48:07 +02:00 |
|
 PlatinumSkink
|
7aa7e7cbf0
|
Pause and Resume events completed and game-crashing bug fixed. I think.
|
2015-10-19 14:56:44 +02:00 |
|
|
Jace
|
d423239320
|
All vertex attributes now present in DX shaders
|
2015-10-19 13:53:12 +02:00 |
|
|
Jace
|
e195e69408
|
Working DirectX textures
|
2015-10-19 13:39:00 +02:00 |
|
|
Jace
|
a782e6b40a
|
Successful DirectX context through GLFW, praise Gaben!
|
2015-10-19 13:39:00 +02:00 |
|
|
Jace
|
0be663be11
|
Created interface class for Renderer
|
2015-10-19 13:38:58 +02:00 |
|
|
Jace
|
0666e8513f
|
Split model file loading and buffer creation into separate classes
|
2015-10-19 13:38:46 +02:00 |
|
|
Jace
|
00f537bc03
|
Removed OpenGL specifics from RenderQueue
|
2015-10-19 13:38:12 +02:00 |
|
|
Jace
|
13360856f9
|
Separated OpenGL specific code into its own "compilation unit"
|
2015-10-19 13:37:59 +02:00 |
|
|
Jace
|
f335955396
|
Animation system now listens to pause events
|
2015-10-15 18:39:47 +02:00 |
|
|
Jace
|
a35d72cac3
|
Working skeletal animations!!!
|
2015-10-15 12:48:28 +02:00 |
|
 tleety
|
c0589563af
|
Base lightrendering started, still some work to be done.
|
2015-09-10 22:13:37 +02:00 |
|
|
Jace
|
98e363eda6
|
Initial structure
|
2015-09-04 10:02:06 +02:00 |
|