 tleety
|
38d3a8c990
|
Fixed a bug where you could not have more than one particle group
|
2015-09-29 10:27:57 +02:00 |
|
 Jace
|
7d9e3e00a4
|
Fixed out-of-range error in NumberFrame
|
2015-09-25 08:23:41 +02:00 |
|
|
Jace
|
be60464bb5
|
Merge branch 'master' of github.com:teamfisk/AgileBreakOut
|
2015-09-25 05:47:37 +02:00 |
|
|
Jace
|
17f8905696
|
Removed the HUD from the menu screen
|
2015-09-25 05:47:20 +02:00 |
|
 viktorljung
|
c459560bfa
|
Fixed score not accumulating correctly
|
2015-09-25 05:39:09 +02:00 |
|
|
viktorljung
|
ad299ad2e5
|
Merge remote-tracking branch 'origin/master' into Physics
|
2015-09-25 05:34:00 +02:00 |
|
|
viktorljung
|
cb48b881b7
|
cool fixes and stuff
|
2015-09-25 05:33:10 +02:00 |
|
|
Jace
|
7b47385674
|
Working NumberFrame and score indicator
|
2015-09-25 05:30:59 +02:00 |
|
|
viktorljung
|
a730a1ce16
|
Merge remote-tracking branch 'origin/master' into Physics
|
2015-09-25 05:16:58 +02:00 |
|
|
viktorljung
|
96511c63b1
|
Merge remote-tracking branch 'origin/master' into Physics
Conflicts:
include/Core/Engine.h
include/Physics/PhysicsSystem.h
src/game/Game/LevelSystem.cpp
src/game/Physics/PhysicsSystem.cpp
|
2015-09-25 05:16:32 +02:00 |
|
|
tleety
|
2af9567722
|
Merge branch 'master' of github.com:teamfisk/AgileBreakOut
|
2015-09-25 04:40:51 +02:00 |
|
|
viktorljung
|
cfb6d1e4b5
|
Falling bricks and collision filters
|
2015-09-25 04:28:46 +02:00 |
|
|
tleety
|
b77c357990
|
Changed some lighting and the background pipe scale
|
2015-09-25 03:33:30 +02:00 |
|
|
Jace
|
186e06bc22
|
Fixed bug where render queue wouldn't get cleared if the world wasn't running
|
2015-09-25 03:23:42 +02:00 |
|
|
Jace
|
c0f77dd32a
|
fixup! Merge branch 'master' of github.com:teamfisk/AgileBreakOut
|
2015-09-25 03:10:47 +02:00 |
|
|
Jace
|
8b3d9eb842
|
WIP HUD
|
2015-09-25 03:04:37 +02:00 |
|
|
Jace
|
ecfa666a22
|
Merge branch 'master' of github.com:teamfisk/AgileBreakOut
# Conflicts:
# include/Core/Engine.h
|
2015-09-25 03:04:13 +02:00 |
|
 Stiffly
|
b0c19c74f2
|
Merge remote-tracking branch 'origin/master' into EGameStart
Conflicts:
include/Core/Engine.h
|
2015-09-25 02:49:50 +02:00 |
|
|
Stiffly
|
650c7ec47c
|
EStartGame up and running. Moved BGM-play from soundsystem init to EGameStart.
|
2015-09-25 02:43:34 +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 |
|
|
Jace
|
c9854d2b83
|
Working volume sliders!
|
2015-09-25 02:19:37 +02:00 |
|
|
tleety
|
f79d5ec68b
|
Merge remote-tracking branch 'origin/water'
|
2015-09-25 01:51:33 +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
|
b83de44715
|
Working GUI Button
|
2015-09-25 01:29:14 +02:00 |
|
|
Jace
|
8e00b76036
|
Error texture for texture frames when texture is missing
|
2015-09-25 01:29:13 +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 |
|
|
Stiffly
|
0e6fcfb2ba
|
Merge remote-tracking branch 'origin/master' into Sound
|
2015-09-25 01:03:28 +02:00 |
|
|
tleety
|
c624c5bcf3
|
Merge master
|
2015-09-25 00:03:28 +02:00 |
|
|
viktorljung
|
d2301594ce
|
Gravity scale per entity
|
2015-09-25 00:01:24 +02:00 |
|
|
Stiffly
|
181ac60bd0
|
MasterVolume now working due to previous refactoring.
TODO: Make it depend on individual volume value.
|
2015-09-24 23:41:41 +02:00 |
|
|
Stiffly
|
0d521cdcc9
|
Refactoring. Splitting up storage and handling into SFX- and BGM sources.
|
2015-09-24 23:21:55 +02:00 |
|
|
tleety
|
fa198cf953
|
Water now rendered in forward rendering
|
2015-09-24 23:21:46 +02:00 |
|
|
Stiffly
|
e867722d9a
|
Added logic for mastervolume. And a coresponding event.
(sources need to be updated for it to be fully working)
|
2015-09-24 22:55:24 +02:00 |
|
|
Stiffly
|
1f73201943
|
Merge remote-tracking branch 'origin/master' into Sound
|
2015-09-24 21:03:57 +02:00 |
|
|
viktorljung
|
bc6b037923
|
Added submarine pad
|
2015-09-24 20:54:57 +02:00 |
|
|
viktorljung
|
e7806165b4
|
Merged Master into Sound.
|
2015-09-24 20:54:32 +02:00 |
|
|
viktorljung
|
72413dc0a9
|
Added submarine model and texture files
|
2015-09-24 20:31:47 +02:00 |
|
 PlatinumSkink
|
4e4ba29666
|
Remove Components upon removing entities, a lot of strange experimenting to remove frozen squid bug.
|
2015-09-24 18:14:39 +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 |
|
|
PlatinumSkink
|
62b17e3dbf
|
Adjusted for merge. 10:16 works. Physics works. Game works. Safety copy made before this merge.
|
2015-09-23 20:46:57 +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 |
|
|
PlatinumSkink
|
bbec676683
|
Merged master into LevelSystemAndSuch. Now let's see if it works.
|
2015-09-23 16:05:07 +02:00 |
|
|
PlatinumSkink
|
edc25e59f0
|
Start of Rescaling 10:16
|
2015-09-23 15:59:48 +02:00 |
|
|
viktorljung
|
4e429bc48c
|
Fixed remove ball bug
|
2015-09-23 15:55:50 +02:00 |
|
|
viktorljung
|
af22c84066
|
removed the test box
|
2015-09-23 15:24:41 +02:00 |
|
|
viktorljung
|
56549cdf0a
|
Merge remote-tracking branch 'origin/master' into Physics
|
2015-09-23 15:21:28 +02:00 |
|
|
Stiffly
|
e8e74eb506
|
Added pitch
|
2015-09-23 15:15:43 +02:00 |
|