fd0618350a
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
2015-10-22 15:51:05 +02:00
49c80c1c5a
Fixed so generated bricks fo not collide with anything.
2015-10-22 15:42:28 +02:00
5b5f5b6a62
New kraken boss model
2015-10-22 15:32:36 +02:00
e49a150f55
Merge remote-tracking branch 'origin/master' into Physics
...
Conflicts:
src/game/Game/BallSystem.cpp
src/game/Game/LevelSystem.cpp
2015-10-22 14:40:09 +02:00
2051c8186c
Background fixes
2015-10-22 14:13:38 +02:00
eedcc76e92
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
2015-10-22 14:07:32 +02:00
54f8fcd185
RaiseWater implemented. Set Debug RaiseWater to true to activate it. And fixed second stage crashing.
2015-10-22 14:04:36 +02:00
f59f123340
Small fixes
2015-10-22 11:55:02 +02:00
9b9f959602
Merge remote-tracking branch 'origin/master' into Physics
2015-10-22 11:49:34 +02:00
c6071e95c3
Kraken brick and ink brick done
2015-10-22 11:49:08 +02:00
d6e0b8a36f
Merge remote-tracking branch 'origin' into Tobias
2015-10-22 11:12:23 +02:00
de8209bdda
Kraken arm now splashes around when it arrives
2015-10-22 11:12:11 +02:00
ff3813a7cf
A metric ton of minifixes!
2015-10-21 15:46:32 +02:00
df264fb732
Added a ink brick texture
2015-10-21 15:16:34 +02:00
2954e2cbb3
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
2015-10-20 16:14:55 +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
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
Jace
4a3575190f
DX sprites and stuff I guess
2015-10-19 17:48:07 +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
7b428f2b54
Added a cheatmode setting in config
2015-10-19 15:56:26 +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
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
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
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
46f3a9f72e
Refactored CParticle->Radius to CParticle->Scale. Reviewed by Tobias Dahl aka Tleety.
2015-10-14 18:29:43 +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
8b218a0103
Next level now working
2015-10-13 17:51:37 +02:00
a5cb1ed77a
Spin fixed
2015-10-13 17:47:53 +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
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
40343744c1
Adjustments to Sticky and Inkblaster made, in addition made StickyAimer partly transparent green.
2015-10-13 14:02:18 +02:00
32bbf282c9
Aimer for Sticky Works, though stuff.
2015-10-12 18:18:37 +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
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
PlatinumSkink
viktorljung
tleety
Jace
Stiffly