36d0601dfd
Added TravellingSystem for travelling to the next stage. Added incomplete ScreenShake. Ball now starts on pad.
2015-10-13 17:28:31 +02:00
Jace
7f344263da
Merge branch 'master' into gui
...
Conflicts:
include/Game/GUI/HUD.h
src/game/Core/Renderer.cpp
2015-10-08 23:47:25 +02:00
Jace
c91cb1c3b7
Fixed GUI color fading in renderer
2015-10-08 21:49:45 +02:00
2545cef90f
temporary particles for demo. trails for bricks, and on brick hit.
2015-10-08 21:41:01 +02:00
1a1b94477e
Merge remote-tracking branch 'origin/master' into water
...
Conflicts:
include/Core/Engine.h
include/Physics/PhysicsSystem.h
include/Sound/SoundSystem.h
src/game/Physics/PhysicsSystem.cpp
src/game/Sound/SoundSystem.cpp
PS:min teori i förra commiten var sann
2015-10-07 18:34:36 +02:00
8b12c1036d
Partycles.
2015-10-06 21:42:54 +02:00
Jace
7173fdf396
MSVC12 compiler compability fixes
2015-10-06 15:27:11 +02:00
Jace
b86dc09c82
Merge branch 'master' into gui
2015-10-02 18:18:44 +02:00
Jace
e74f1092c7
Fixed crash when events were (un)subscribed while events were processing
2015-10-02 18:12:00 +02:00
Jace
c821fbfc25
Futile attempts to fix memory corruption bug
2015-10-01 16:12:53 +02:00
45711500f7
Merged
2015-10-01 14:24:06 +02:00
52dec86925
Particle system up and running, but with bugged rendering
2015-10-01 14:14:51 +02:00
2491dd8b74
Fixed some things, code up to styleguide
2015-09-30 10:29:56 +02:00
a1c709a2db
Removed wierd glow on water
2015-09-29 11:10:08 +02:00
38d3a8c990
Fixed a bug where you could not have more than one particle group
2015-09-29 10:27:57 +02:00
a97dae542d
Merge remote-tracking branch 'origin/master' into Sound
...
Conflicts:
src/game/Sound/SoundSystem.cpp
2015-09-28 18:14:06 +02:00
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
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
c624c5bcf3
Merge master
2015-09-25 00:03:28 +02:00
fa198cf953
Water now rendered in forward rendering
2015-09-24 23:21:46 +02:00
ef3591ba46
Water threshhold added, now it's actually waterlike
2015-09-24 16:23:57 +02:00
a1215d71e9
Water now blurred and looking kinda water like
2015-09-24 16:10:13 +02:00
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
8e2eb63c5e
Added renderQueue for water and created buffers for the water to use.
2015-09-23 12:07:28 +02:00
587b712f49
Merge remote-tracking branch 'origin/master' into Sound
2015-09-17 15:41:36 +02:00
6671136a08
Made a Sound folder. Rename class Sound to SoundSystem.
...
Also awesome Cmakeness.
2015-09-17 14:42:33 +02:00
692e0ca9df
Fixed a bug where models normal and specular maps is not loaded.
2015-09-17 14:37:00 +02:00
953be0cda9
Merge remote-tracking branch 'origin/master' into Sound
...
Conflicts:
include/Core/Engine.h
2015-09-17 13:18:56 +02:00
13de4bd1cb
Added sound files. Listens to collision events -> play sound.
2015-09-16 16:54:02 +02:00
30ee6c2430
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
2015-09-16 16:29:57 +02:00
a5ffce8db8
Merge remote-tracking branch 'origin/master' into GLrenderer
2015-09-16 16:17:39 +02:00
825f6dc991
Models now get a standard normal and specular map if they dont have one
2015-09-16 16:09:20 +02:00
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
450a73f498
added a PlaySound Event.
2015-09-15 18:16:32 +02:00
ef9f6a296b
Renderer working and some test blocks in the world
2015-09-15 17:38:16 +02:00
0f96baedfa
Merge branch 'master' into LevelSystemAndSuch
2015-09-15 17:31:53 +02:00
c2d29b6110
Added ScoreEvent, added score to bricks. Stage resets after all bricks are destroyed.
2015-09-15 17:31:22 +02:00
f19f7bf56a
Added a few models and removed ortho camera perspectiv.
2015-09-15 17:05:47 +02:00
aec694359c
Merge remote-tracking branch 'origin/master' into Sound
2015-09-15 16:09:42 +02:00
5695a8c068
Sound in game! Using OpenAL. NOWHERE TO RUN
2015-09-15 16:08:52 +02:00
c5bbcec5dc
Transparancy now working for forward rendering
2015-09-15 13:20:01 +02:00
ff00e2bf9c
nothing works
2015-09-14 17:07:25 +02:00
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
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
ed5881ec54
Linking OpenAL.
2015-09-14 14:45:44 +02:00
PlatinumSkink
Jace
Stiffly
tleety