 PlatinumSkink
|
fd0618350a
|
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
|
2015-10-22 15:51:05 +02:00 |
|
|
PlatinumSkink
|
49c80c1c5a
|
Fixed so generated bricks fo not collide with anything.
|
2015-10-22 15:42:28 +02:00 |
|
 viktorljung
|
80ba2a0c32
|
Merge remote-tracking branch 'origin/master' into Physics
|
2015-10-22 15:32:59 +02:00 |
|
|
viktorljung
|
5b5f5b6a62
|
New kraken boss model
|
2015-10-22 15:32:36 +02:00 |
|
 Jace
|
bdb5a76e24
|
Merge remote-tracking branch 'origin/master'
|
2015-10-22 14:52:27 +02:00 |
|
|
Jace
|
d0ee438c4c
|
Loading screen that preloads the entire game based on what's in the "PreloadResources" file. The file is filled automatically with resources that are hot-loaded to make the next launch load more complete.
|
2015-10-22 14:51:34 +02:00 |
|
|
PlatinumSkink
|
eedcc76e92
|
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
|
2015-10-22 14:07:32 +02:00 |
|
|
PlatinumSkink
|
fde2ddeafb
|
Failed to stage it all.
|
2015-10-22 14:05:23 +02:00 |
|
|
PlatinumSkink
|
54f8fcd185
|
RaiseWater implemented. Set Debug RaiseWater to true to activate it. And fixed second stage crashing.
|
2015-10-22 14:04:36 +02:00 |
|
 tleety
|
d6e0b8a36f
|
Merge remote-tracking branch 'origin' into Tobias
|
2015-10-22 11:12:23 +02:00 |
|
|
tleety
|
de8209bdda
|
Kraken arm now splashes around when it arrives
|
2015-10-22 11:12:11 +02:00 |
|
|
PlatinumSkink
|
59c23026d2
|
Put all LifeStuff into a new LifeSystem. Appears to be working.
|
2015-10-22 10:34:22 +02:00 |
|
|
PlatinumSkink
|
1a6f18da94
|
Random direction upon ResetBall, turn in direction.
|
2015-10-21 16:53:04 +02:00 |
|
|
PlatinumSkink
|
ff3813a7cf
|
A metric ton of minifixes!
|
2015-10-21 15:46:32 +02:00 |
|
|
PlatinumSkink
|
f0b36c6f12
|
Fixed Kraken battle. I think. Made it so you do not shoot projectiles or squids when struggling with Kraken.
|
2015-10-21 15:12:50 +02:00 |
|
|
tleety
|
e9942dad4a
|
Merge branch 'Tobias'
|
2015-10-21 14:48:33 +02:00 |
|
|
tleety
|
11b792c85a
|
Merge remote-tracking branch 'origin' into Tobias
|
2015-10-21 14:39:38 +02:00 |
|
 Stiffly
|
d0668effea
|
Merge remote-tracking branch 'origin/master' into Sound
|
2015-10-21 13:18:42 +02:00 |
|
|
PlatinumSkink
|
2954e2cbb3
|
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
|
2015-10-20 16:14:55 +02:00 |
|
|
Jace
|
9b8546abb2
|
Fixed your score frames
|
2015-10-20 16:13:33 +02:00 |
|
|
Stiffly
|
c23c7e4d8e
|
Story sound. Tom could be improved.
|
2015-10-20 16:12:55 +02:00 |
|
|
PlatinumSkink
|
c1e4e6c0bd
|
KrakenHit event includes max health, current, and new.
|
2015-10-20 15:58:02 +02:00 |
|
|
tleety
|
0f506bfe35
|
Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias
|
2015-10-20 15:57:40 +02:00 |
|
|
PlatinumSkink
|
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 |
|
|
tleety
|
9ffa8e9609
|
Kraken arm shows up when you take the powerup
|
2015-10-20 15:57:02 +02:00 |
|
|
PlatinumSkink
|
b4f098c80d
|
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
|
2015-10-20 11:53:05 +02:00 |
|
|
PlatinumSkink
|
b38fdf2183
|
Merge branch 'master' into LevelSystemAndSuch
|
2015-10-20 11:44:57 +02:00 |
|
|
PlatinumSkink
|
fbdd3536f3
|
Kraken shows up on last stage. Created WaterSystem for possible future use.
|
2015-10-20 11:43:39 +02:00 |
|
|
viktorljung
|
f5957fc91a
|
Merge remote-tracking branch 'origin/master' into Physics
Conflicts:
include/Core/Engine.h
|
2015-10-20 11:01:42 +02:00 |
|
|
viktorljung
|
9e8d176999
|
Animation models and stuff
|
2015-10-19 16:48:42 +02:00 |
|
|
tleety
|
dd6c5443eb
|
Fixed an upper case E into a lowercase so linux hopefully wont have a shitfit
|
2015-10-19 16:42:39 +02:00 |
|
|
Stiffly
|
71521b5b02
|
Added squid-bounce wav
|
2015-10-19 16:41:57 +02:00 |
|
|
tleety
|
970201520e
|
Fixed so oilshooter shoots the new particle
|
2015-10-19 16:32:14 +02:00 |
|
|
tleety
|
c1df5d69a9
|
Merge remote-tracking branch 'origin' into Tobias
|
2015-10-19 15:57:41 +02:00 |
|
|
tleety
|
7b428f2b54
|
Added a cheatmode setting in config
|
2015-10-19 15:56:26 +02:00 |
|
|
Stiffly
|
5802c7f7c4
|
Merge remote-tracking branch 'origin/master' into water
|
2015-10-19 15:25:16 +02:00 |
|
|
Stiffly
|
0688de9dd2
|
LifeBuoy particle effect on hit.
|
2015-10-19 15:24:40 +02:00 |
|
|
PlatinumSkink
|
c83aee9b5d
|
Merge branch 'LevelSystemAndSuch'
|
2015-10-19 15:05:50 +02:00 |
|
|
PlatinumSkink
|
7aa7e7cbf0
|
Pause and Resume events completed and game-crashing bug fixed. I think.
|
2015-10-19 14:56:44 +02:00 |
|
|
Stiffly
|
dc2ec46cfa
|
Playing sound on EGameStart. Menu sounds.
|
2015-10-19 13:53:42 +02:00 |
|
|
PlatinumSkink
|
3fb741335e
|
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch.
|
2015-10-19 13:37:10 +02:00 |
|
|
PlatinumSkink
|
c5d88301ad
|
Implemented a Kraken State Machine that can grab the player, and the Generating Bricks option.
|
2015-10-19 13:31:38 +02:00 |
|
|
PlatinumSkink
|
bd59cd4108
|
Implimented the basis for Kraken encounter.
|
2015-10-15 15:08:05 +02:00 |
|
|
Jace
|
b754fff9e3
|
Added volume settings to config file
|
2015-10-15 14:10:22 +02:00 |
|
|
PlatinumSkink
|
b2127c6c4e
|
Fixed error so you can actually play LevelSystemAndSuch branch.
|
2015-10-15 13:48:35 +02:00 |
|
|
PlatinumSkink
|
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 |
|
|
PlatinumSkink
|
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 |
|
|
PlatinumSkink
|
44f2cf72ac
|
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
|
2015-10-15 10:24:13 +02:00 |
|
|
PlatinumSkink
|
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 |
|