 PlatinumSkink
|
58407203fc
|
Refinements in Niklas code
|
2015-10-05 13:09:02 +02:00 |
|
|
PlatinumSkink
|
06c7245421
|
Removed my unnecessary RemoveComponents.
|
2015-10-02 14:28:35 +02:00 |
|
|
PlatinumSkink
|
0cffdadd33
|
Removed some couts.
|
2015-10-02 14:20:53 +02:00 |
|
|
PlatinumSkink
|
754356da1d
|
Commit to enable pulling.
|
2015-10-02 13:06:44 +02:00 |
|
|
PlatinumSkink
|
cf6f9866e7
|
Merge branch 'bugfix' of https://github.com/teamfisk/AgileBreakOut into bugfix
|
2015-10-01 15:47:12 +02:00 |
|
|
PlatinumSkink
|
f45908647c
|
Quick-Fix for Score Error when additional frames appeared
|
2015-10-01 15:46:58 +02:00 |
|
 viktorljung
|
a1e49d75fb
|
Merge branch 'Physics' into bugfix
Conflicts:
include/Core/Engine.h
include/Physics/PhysicsSystem.h
src/game/Physics/PhysicsSystem.cpp
|
2015-10-01 15:15:10 +02:00 |
|
 Jace
|
0743d882b9
|
Merge branch 'gui' into bugfix
|
2015-10-01 14:42:39 +02:00 |
|
|
PlatinumSkink
|
4c7714dd21
|
Merge branch 'LevelSystemAndSuch' into bugfix
|
2015-10-01 14:41:58 +02:00 |
|
|
Jace
|
c821fbfc25
|
Futile attempts to fix memory corruption bug
|
2015-10-01 16:12:53 +02:00 |
|
|
Jace
|
45f1d882ad
|
Adding these two additional frames make the event broker break
|
2015-10-01 14:41:55 +02:00 |
|
|
PlatinumSkink
|
e120b09b84
|
Merge branch 'master' into LevelSystemAndSuch
|
2015-10-01 14:36:12 +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 |
|
|
PlatinumSkink
|
4d3428f125
|
HitLag has types in strings to send along to affect what systems lag.
|
2015-10-01 14:14:07 +02:00 |
|
|
viktorljung
|
39f4215c2b
|
Merge remote-tracking branch 'origin/master' into Physics
Conflicts:
include/Physics/PhysicsSystem.h
src/game/Physics/PhysicsSystem.cpp
|
2015-10-01 14:13:51 +02:00 |
|
|
viktorljung
|
cbaca42a3c
|
Changed SquidModel
|
2015-10-01 14:04:21 +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
|
c63ec035a7
|
HitLagSystem implemented.
|
2015-09-30 16:42:35 +02:00 |
|
|
PlatinumSkink
|
c31ff4cfcb
|
P-button pauses, H-button does 0.3 second HitLag.
|
2015-09-30 15:19:45 +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 |
|
|
viktorljung
|
7733a44d53
|
Refactoring and starting to write test for PhysicsSystem
|
2015-09-29 12:08:13 +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 |
|
|
viktorljung
|
22c7663cc5
|
Merge branch 'master' into Physics
|
2015-09-28 17:21:08 +02:00 |
|
|
viktorljung
|
1a0201ee98
|
Style guide fixes
|
2015-09-28 17:20:23 +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 |
|