cbb6e7a04f
Trail to individual brick debris.
...
Counter the particle spawn bug.
The bug occurs when the position is read as (0, 0) from the emitter. Similar particle removal bug appears when particles are deleted. Counterered by deleting particle entities a little time before b2particles.
2015-10-14 17:40:24 +02:00
e9ca58de64
Merge branch 'master' into water
...
Conflicts:
src/game/Game/LevelSystem.cpp
src/game/Physics/PhysicsSystem.cpp
2015-10-14 15:43:34 +02:00
b94eeac2cd
Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut
2015-10-13 18:34:46 +02:00
ffea58d41f
ScreenShake works as intended at the press of E and upon calling the event.
2015-10-13 18:34:21 +02:00
e6cffcb217
Merge remote-tracking branch 'origin/master' into Physics
2015-10-13 18:03:15 +02:00
8762fe3513
Fixed minor sticky bug.
2015-10-13 18:01:10 +02:00
8b218a0103
Next level now working
2015-10-13 17:51:37 +02:00
a5cb1ed77a
Spin fixed
2015-10-13 17:47:53 +02:00
f773458654
Merge branch 'LevelSystemAndSuch'
2015-10-13 17:45:34 +02:00
5955a888d2
Merge remote-tracking branch 'origin/master' into water
...
Conflicts:
src/game/Physics/PhysicsSystem.cpp
2015-10-13 17:44:05 +02:00
5040ff4649
added a radius distribution to randomize the scale.
2015-10-13 17:39:40 +02:00
40054cb40f
Merge remote-tracking branch 'origin/master' into Physics
...
Conflicts:
src/game/Game/LevelSystem.cpp
2015-10-13 17:32:07 +02:00
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
f86dc9a530
Needs some spinfixing
2015-10-13 17:20:32 +02:00
1065d3abc3
Merge remote-tracking branch 'origin/master' into water
...
Conflicts:
src/game/Game/LevelSystem.cpp
src/game/Physics/PhysicsSystem.cpp
2015-10-13 17:02:31 +02:00
b8e1f6fcde
Added brick break, needs more work with the removal code and particles
2015-10-13 16:18:46 +02:00
94cac38cc6
"Lightening" particle bugg fixed. Scale and alpha interpolation implemented through ScalarInterpolation-funtion
2015-10-13 15:22:11 +02:00
c20b9a35b3
Merge branch 'master' of github.com:teamfisk/AgileBreakOut
2015-10-13 15:09:33 +02:00
c431193764
Some debug code
2015-10-13 15:09:00 +02:00
40343744c1
Adjustments to Sticky and Inkblaster made, in addition made StickyAimer partly transparent green.
2015-10-13 14:02:18 +02:00
1a070d8ce8
Merge branch 'master' into LevelSystemAndSuch
2015-10-13 13:37:08 +02:00
32bbf282c9
Aimer for Sticky Works, though stuff.
2015-10-12 18:18:37 +02:00
cd64531307
Merged with master and fixed some small variable things
2015-10-12 17:18:44 +02:00
c2b1211be8
Merge branch 'master' of github.com:teamfisk/AgileBreakOut
2015-10-12 16:53:08 +02:00
52e2ce567a
Power up sprites now show when you hit powerup bricks
2015-10-12 16:48:04 +02:00
5630771272
Fixed Sticky after Ink bug, fixed directions on Squid after sticky, laser direction is in background. Brick Components implemented, though they do nothing.
2015-10-12 16:45:59 +02:00
8f2af7ca8f
Fixed so you don't randomly lose lives upon stage cleared. I think.
2015-10-09 08:57:05 +02:00
Jace
89779fa6ee
Added Kraken to level 5
2015-10-09 00:38:34 +02:00
d4c79e338c
Merge remote-tracking branch 'origin/master' into Physics
...
Conflicts:
src/game/Game/LevelSystem.cpp
2015-10-09 00:22:32 +02:00
46fca005bf
Merge remote-tracking branch 'origin/LevelSystemAndSuch' into Physics
2015-10-08 23:53:59 +02:00
c222383b6f
KRAKEN ATTACK! At a press of K! KrakenAttackBricks exist, too, just add number to level.
2015-10-08 23:52:48 +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
848efa19ac
Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias
2015-10-08 23:37:14 +02:00
1efdca9d23
Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias
...
# Conflicts:
# src/game/Game/LevelSystem.cpp
2015-10-08 23:35:53 +02:00
3609ca9123
pause on win
2015-10-08 23:21:03 +02:00
9997f3d964
Merge remote-tracking branch 'origin/master' into Physics
2015-10-08 23:19:23 +02:00
95c1f57dd7
GameOver and WinScreen Added
2015-10-08 23:18:54 +02:00
f6a760ad87
Finetuned level setup
2015-10-08 22:52:26 +02:00
90636a7169
Color Arrays in Vec4 implimented. Have fun.
2015-10-08 22:32:06 +02:00
7d15be6d6d
Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut
2015-10-08 21:52:21 +02:00
9fe2324913
Lifebuoy updated, now dies after 4 hits
2015-10-08 21:51:43 +02:00
f6f74c659f
Getting Sticky after Ink Blaster now works.
2015-10-08 21:51:27 +02:00
Jace
c91cb1c3b7
Fixed GUI color fading in renderer
2015-10-08 21:49:45 +02:00
96ccef6ed8
Merge remote-tracking branch 'origin/master' into water
...
Conflicts:
src/game/Game/LevelSystem.cpp
2015-10-08 21:44:50 +02:00
2545cef90f
temporary particles for demo. trails for bricks, and on brick hit.
2015-10-08 21:41:01 +02:00
706e720ae8
Merge remote-tracking branch 'origin/master' into water
...
Conflicts:
src/game/Physics/ContactListener.cpp
src/game/Physics/PhysicsSystem.cpp
2015-10-08 21:39:48 +02:00
d5e7481866
Fixed spelling error
2015-10-08 20:19:57 +02:00
a0d6f01ac2
Merge remote-tracking branch 'origin/master' into Physics
...
Conflicts:
src/game/Game/LevelSystem.cpp
2015-10-08 20:17:24 +02:00
52ab09d0b1
Added brick models and Lifebuoy balance changes
2015-10-08 20:08:42 +02:00
3793515968
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
2015-10-08 20:08:10 +02:00
Stiffly
PlatinumSkink
viktorljung
tleety
Jace