 Stiffly
|
a97dae542d
|
Merge remote-tracking branch 'origin/master' into Sound
Conflicts:
src/game/Sound/SoundSystem.cpp
|
2015-09-28 18:14:06 +02:00 |
|
|
Stiffly
|
f10749d220
|
Refactoring SoundSystem and its events, components
|
2015-09-28 17:59:57 +02:00 |
|
 Jace
|
d2bc91be48
|
Merge remote-tracking branch 'origin/master' into gui
Conflicts:
include/Core/Engine.h
include/Core/RenderQueue.h
include/Core/Renderer.h
src/game/Core/Renderer.cpp
|
2015-09-25 02:27:00 +02:00 |
|
 tleety
|
effc9ff781
|
Merge and some small fixes
|
2015-09-25 01:49:08 +02:00 |
|
|
Jace
|
5f1963b8bc
|
Complete main menu without event bindings.
|
2015-09-25 01:29:14 +02:00 |
|
|
Jace
|
e0b1747ca9
|
EventBroker::Clear renamed to Swap to cause less confusion
|
2015-09-25 01:29:13 +02:00 |
|
|
Jace
|
1d500eb4f6
|
First iteration of GUI code. GUI is rendered on top of everything, world still separate.
|
2015-09-25 01:29:13 +02:00 |
|
|
tleety
|
c624c5bcf3
|
Merge master
|
2015-09-25 00:03:28 +02:00 |
|
|
tleety
|
fa198cf953
|
Water now rendered in forward rendering
|
2015-09-24 23:21:46 +02:00 |
|
|
tleety
|
ef3591ba46
|
Water threshhold added, now it's actually waterlike
|
2015-09-24 16:23:57 +02:00 |
|
|
tleety
|
a1215d71e9
|
Water now blurred and looking kinda water like
|
2015-09-24 16:10:13 +02:00 |
|
|
tleety
|
d473e3711c
|
Now render water through it's own buffer. Not currently visable through finaltexture. Also added a white texture to render the water.
|
2015-09-23 18:01:15 +02:00 |
|
|
tleety
|
8e2eb63c5e
|
Added renderQueue for water and created buffers for the water to use.
|
2015-09-23 12:07:28 +02:00 |
|
|
Stiffly
|
587b712f49
|
Merge remote-tracking branch 'origin/master' into Sound
|
2015-09-17 15:41:36 +02:00 |
|
|
Stiffly
|
6671136a08
|
Made a Sound folder. Rename class Sound to SoundSystem.
Also awesome Cmakeness.
|
2015-09-17 14:42:33 +02:00 |
|
|
tleety
|
692e0ca9df
|
Fixed a bug where models normal and specular maps is not loaded.
|
2015-09-17 14:37:00 +02:00 |
|
|
Stiffly
|
953be0cda9
|
Merge remote-tracking branch 'origin/master' into Sound
Conflicts:
include/Core/Engine.h
|
2015-09-17 13:18:56 +02:00 |
|
|
Stiffly
|
13de4bd1cb
|
Added sound files. Listens to collision events -> play sound.
|
2015-09-16 16:54:02 +02:00 |
|
 PlatinumSkink
|
30ee6c2430
|
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
|
2015-09-16 16:29:57 +02:00 |
|
|
tleety
|
a5ffce8db8
|
Merge remote-tracking branch 'origin/master' into GLrenderer
|
2015-09-16 16:17:39 +02:00 |
|
|
tleety
|
825f6dc991
|
Models now get a standard normal and specular map if they dont have one
|
2015-09-16 16:09:20 +02:00 |
|
|
PlatinumSkink
|
8f513e3281
|
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
|
2015-09-16 15:49:36 +02:00 |
|
|
Jace
|
4cfa0ef624
|
Fixed event broker unsubscribe bug where event relay would still think it belonged to a broker after unsubscribed
|
2015-09-16 12:54:34 +02:00 |
|
|
Stiffly
|
450a73f498
|
added a PlaySound Event.
|
2015-09-15 18:16:32 +02:00 |
|
|
tleety
|
ef9f6a296b
|
Renderer working and some test blocks in the world
|
2015-09-15 17:38:16 +02:00 |
|
|
PlatinumSkink
|
0f96baedfa
|
Merge branch 'master' into LevelSystemAndSuch
|
2015-09-15 17:31:53 +02:00 |
|
|
PlatinumSkink
|
c2d29b6110
|
Added ScoreEvent, added score to bricks. Stage resets after all bricks are destroyed.
|
2015-09-15 17:31:22 +02:00 |
|
|
tleety
|
f19f7bf56a
|
Added a few models and removed ortho camera perspectiv.
|
2015-09-15 17:05:47 +02:00 |
|
|
Stiffly
|
aec694359c
|
Merge remote-tracking branch 'origin/master' into Sound
|
2015-09-15 16:09:42 +02:00 |
|
|
Stiffly
|
5695a8c068
|
Sound in game! Using OpenAL. NOWHERE TO RUN
|
2015-09-15 16:08:52 +02:00 |
|
|
tleety
|
c5bbcec5dc
|
Transparancy now working for forward rendering
|
2015-09-15 13:20:01 +02:00 |
|
|
Stiffly
|
ff00e2bf9c
|
nothing works
|
2015-09-14 17:07:25 +02:00 |
|
|
tleety
|
b9eda67a2a
|
Added depth buffer to fix transparency, still a bug that transparency goes wrong at when you press a button.
|
2015-09-14 16:53:14 +02:00 |
|
|
Stiffly
|
760574f454
|
Merge remote-tracking branch 'origin/master' into Sound
Conflicts:
include/Core/Engine.h
src/game/CMakeLists.txt
|
2015-09-14 14:54:41 +02:00 |
|
|
Stiffly
|
ed5881ec54
|
Linking OpenAL.
|
2015-09-14 14:45:44 +02:00 |
|
|
tleety
|
748f61883b
|
Added some textures and fixed camera perspective
|
2015-09-11 15:07:48 +02:00 |
|
|
tleety
|
c4c1158364
|
Working lights and deferred rendering
|
2015-09-10 23:48:45 +02:00 |
|
|
tleety
|
f97112bb20
|
Backbone to deferred rendering started
|
2015-09-10 22:39:03 +02:00 |
|
|
tleety
|
c0589563af
|
Base lightrendering started, still some work to be done.
|
2015-09-10 22:13:37 +02:00 |
|
|
tleety
|
1e67bfb103
|
Sprite ACTUALLY rendered as unitquad now.
|
2015-09-10 18:32:50 +02:00 |
|
|
tleety
|
58931e29b3
|
Sprites are now rendered on unitQuads instead of ScreenQuads
|
2015-09-10 17:45:26 +02:00 |
|
|
Jace
|
54bed28327
|
Working sprite rendering. Removed bone transforms for now.
|
2015-09-10 16:23:24 +02:00 |
|
|
tleety
|
61efddb52e
|
Removed rendering of lights
|
2015-09-09 21:31:54 +02:00 |
|
|
Stiffly
|
fbeb1fb9a6
|
Simple HelloWorld Event for understanding.
|
2015-09-09 18:42:08 +02:00 |
|
|
Stiffly
|
80d98470e9
|
Skeleton for Sound system
|
2015-09-09 15:49:53 +02:00 |
|
|
Jace
|
c24b039005
|
Semi-working base for bgfx renderer
|
2015-09-08 16:13:59 +02:00 |
|
|
Jace
|
7c92b6aef7
|
Working build with CMake 3.3.1
|
2015-09-04 14:08:07 +02:00 |
|
|
Jace
|
98e363eda6
|
Initial structure
|
2015-09-04 10:02:06 +02:00 |
|