 Jace
|
b38580f468
|
Area and Stage numbers in the right place
|
2015-10-02 18:30:36 +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
|
45f1d882ad
|
Adding these two additional frames make the event broker break
|
2015-10-01 14:41:55 +02:00 |
|
|
Jace
|
c821fbfc25
|
Futile attempts to fix memory corruption bug
|
2015-10-01 16:12:53 +02:00 |
|
 PlatinumSkink
|
a4065f734b
|
Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut
|
2015-10-01 14:26:25 +02:00 |
|
 tleety
|
45711500f7
|
Merged
|
2015-10-01 14:24:06 +02:00 |
|
|
tleety
|
52dec86925
|
Particle system up and running, but with bugged rendering
|
2015-10-01 14:14:51 +02:00 |
|
|
PlatinumSkink
|
074c53a82b
|
Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut
|
2015-10-01 14:14:36 +02:00 |
|
|
Jace
|
ff27eafccf
|
WORKING number frame
|
2015-10-01 13:09:27 +02:00 |
|
|
Jace
|
b42a09fce1
|
Semi-working number frame
|
2015-10-01 11:01:33 +02:00 |
|
|
Jace
|
d1dde9459f
|
Added FPS counter
|
2015-10-01 11:01:18 +02:00 |
|
|
Jace
|
cc1bc25914
|
Merge branch 'master' of github.com:teamfisk/AgileBreakOut
|
2015-10-01 10:55:04 +02:00 |
|
|
Jace
|
e1ff3825ee
|
Fixed type error in sound loading
|
2015-10-01 12:51:29 +02:00 |
|
|
Jace
|
842a112be8
|
Added Frame tests
|
2015-10-01 10:53:46 +02:00 |
|
|
Jace
|
ba67f6ea37
|
Tests fixed into working order
|
2015-10-01 10:53:29 +02:00 |
|
|
PlatinumSkink
|
2fb16357fa
|
Moved pad-creation to PadSystem. Pad now stops at sides.
|
2015-09-30 10:32:17 +02:00 |
|
|
tleety
|
2491dd8b74
|
Fixed some things, code up to styleguide
|
2015-09-30 10:29:56 +02:00 |
|
|
PlatinumSkink
|
45e68c51a3
|
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
|
2015-09-29 14:44:50 +02:00 |
|
|
PlatinumSkink
|
c3b54ef030
|
Implemented Combos which multiply score. Adjusted pad a bit.
|
2015-09-29 14:42:01 +02:00 |
|
 Stiffly
|
cb70cdfc5d
|
Merge remote-tracking branch 'origin/master' into Sound
|
2015-09-29 12:04:52 +02:00 |
|
|
PlatinumSkink
|
94fc7c1ce6
|
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch.
|
2015-09-29 11:21:35 +02:00 |
|
|
tleety
|
a1c709a2db
|
Removed wierd glow on water
|
2015-09-29 11:10:08 +02:00 |
|
|
Stiffly
|
3ab6c0c5ba
|
Sound channel volume not overriding individual volume for sounds.
|
2015-09-29 11:09:43 +02:00 |
|
|
tleety
|
38d3a8c990
|
Fixed a bug where you could not have more than one particle group
|
2015-09-29 10:27:57 +02:00 |
|
|
Jace
|
5e7e5ec8bb
|
Fixed precision loss in physics accumulator
|
2015-09-28 22:55:39 +02:00 |
|
|
Jace
|
5e0b0f920a
|
Fixed your asset loading fuckups
|
2015-09-28 22:46:35 +02:00 |
|
|
Jace
|
d472e2ae88
|
Added ignore rule for .orig files, since nobody seem to be able to look at what they commit...
|
2015-09-28 21:56:11 +02:00 |
|
|
Jace
|
edd87ddf58
|
Fixed critical warnings for Linux build
|
2015-09-28 20:40:28 +02:00 |
|
|
Stiffly
|
a97dae542d
|
Merge remote-tracking branch 'origin/master' into Sound
Conflicts:
src/game/Sound/SoundSystem.cpp
|
2015-09-28 18:14:06 +02:00 |
|
|
PlatinumSkink
|
7b7277509e
|
CreateBall clones the original ball rather than create new balls.
|
2015-09-28 18:09:55 +02:00 |
|
|
Stiffly
|
f10749d220
|
Refactoring SoundSystem and its events, components
|
2015-09-28 17:59:57 +02:00 |
|
|
PlatinumSkink
|
fc41727a5d
|
Transferred Ball-stuff into BallSystem.
|
2015-09-28 17:24:58 +02:00 |
|
|
Jace
|
2d7703afad
|
Header definitions added to style guide
|
2015-09-28 17:17:24 +02:00 |
|
|
PlatinumSkink
|
90424b8d68
|
Merge branch 'master' into LevelSystemAndSuch
|
2015-09-28 15:06:37 +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 |
|