df264fb732
Added a ink brick texture
2015-10-21 15:16:34 +02:00
e9942dad4a
Merge branch 'Tobias'
2015-10-21 14:48:33 +02:00
cbaf300b03
Smallfix
2015-10-21 14:47:36 +02:00
11b792c85a
Merge remote-tracking branch 'origin' into Tobias
2015-10-21 14:39:38 +02:00
726244b043
Combo particle is now more visable and better
2015-10-21 14:39:04 +02:00
d0668effea
Merge remote-tracking branch 'origin/master' into Sound
2015-10-21 13:18:42 +02:00
2954e2cbb3
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
2015-10-20 16:14:55 +02:00
0f506bfe35
Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias
2015-10-20 15:57:40 +02:00
e26156c093
Kraken Battle Implemented. Feel free to comment.
...
To get to battle faster, change CurrentCluster to 0.
2015-10-20 15:57:06 +02:00
9ffa8e9609
Kraken arm shows up when you take the powerup
2015-10-20 15:57:02 +02:00
Jace
d197ec07ad
Merge branch 'master' into directx
...
Conflicts:
include/Core/Engine.h
2015-10-20 15:13:20 +02:00
b4f098c80d
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
2015-10-20 11:53:05 +02:00
fbdd3536f3
Kraken shows up on last stage. Created WaterSystem for possible future use.
2015-10-20 11:43:39 +02:00
ce61de1d5c
Merge remote-tracking branch 'origin/Physics' into Tobias
2015-10-20 11:03:45 +02:00
f688981b06
Started work on kraken arm powerup visual changes.
2015-10-20 11:03:40 +02:00
f5957fc91a
Merge remote-tracking branch 'origin/master' into Physics
...
Conflicts:
include/Core/Engine.h
2015-10-20 11:01:42 +02:00
Jace
4a3575190f
DX sprites and stuff I guess
2015-10-19 17:48:07 +02:00
9e8d176999
Animation models and stuff
2015-10-19 16:48:42 +02:00
71521b5b02
Added squid-bounce wav
2015-10-19 16:41:57 +02:00
bbbcc528d3
Levelsystem quickfix
2015-10-19 16:35:12 +02:00
970201520e
Fixed so oilshooter shoots the new particle
2015-10-19 16:32:14 +02:00
c1df5d69a9
Merge remote-tracking branch 'origin' into Tobias
2015-10-19 15:57:41 +02:00
7b428f2b54
Added a cheatmode setting in config
2015-10-19 15:56:26 +02:00
5802c7f7c4
Merge remote-tracking branch 'origin/master' into water
2015-10-19 15:25:16 +02:00
0688de9dd2
LifeBuoy particle effect on hit.
2015-10-19 15:24:40 +02:00
7aa7e7cbf0
Pause and Resume events completed and game-crashing bug fixed. I think.
2015-10-19 14:56:44 +02:00
3fb741335e
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch.
2015-10-19 13:37:10 +02:00
c5d88301ad
Implemented a Kraken State Machine that can grab the player, and the Generating Bricks option.
2015-10-19 13:31:38 +02:00
2c6ac49e15
Added particle event for each brick debris. poof!
2015-10-16 13:05:33 +02:00
bf82e549aa
Added VectorInterpolation function. Fixed time bug for particles.
2015-10-16 12:43:40 +02:00
0600230ed4
Merge remote-tracking branch 'origin/master' into water
2015-10-16 11:59:17 +02:00
bd59cd4108
Implimented the basis for Kraken encounter.
2015-10-15 15:08:05 +02:00
927c96d863
TravellingSystem uses EMove. EMove and ERotate copied from Returngeance into TransportSystem.
2015-10-15 13:44:16 +02:00
Jace
a35d72cac3
Working skeletal animations!!!
2015-10-15 12:48:28 +02:00
52fe2e697e
Added a config file and implemented code for it
2015-10-15 12:15:53 +02:00
4abce7b17f
CTravels replaces Sticky = true. Put "Travels" component on anything that should be moved down during travel sequences.
2015-10-15 11:11:06 +02:00
44f2cf72ac
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
2015-10-15 10:24:13 +02:00
0650e7c061
Basis of RaiseWater implemented in a way that doesn't work with our amount of lag.
2015-10-15 10:20:05 +02:00
724d4e7e69
If stuck to pad, do not come into contact with other things.
2015-10-14 18:53:45 +02:00
55cc1f5b69
ScreenShakeSystem made. And some other things.
2015-10-14 18:52:04 +02:00
46f3a9f72e
Refactored CParticle->Radius to CParticle->Scale. Reviewed by Tobias Dahl aka Tleety.
2015-10-14 18:29:43 +02:00
5da96f40f3
Fixed so 42+ combo particle is shown when you have 42+ combo
2015-10-14 18:19:45 +02:00
6c41911233
Combos now show up as a particle when it is reset
2015-10-14 18:07:15 +02:00
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
tleety
Stiffly
PlatinumSkink
Jace
viktorljung