 viktorljung
|
d75e481e0f
|
life fix
|
2015-10-22 15:44:09 +02:00 |
|
 Jace
|
c7bef473d9
|
Merge remote-tracking branch 'origin/master'
|
2015-10-22 15:40:21 +02:00 |
|
|
Jace
|
86f823b52f
|
fixup! Moved registering ShaderProgram resources to Renderer
|
2015-10-22 15:39:55 +02:00 |
|
|
viktorljung
|
0900172bf2
|
Merge branch 'Physics'
|
2015-10-22 15:36:53 +02:00 |
|
|
Jace
|
3fb85cd049
|
Moved registering ShaderProgram resources to Renderer
|
2015-10-22 15:35:32 +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
|
61801f23d1
|
fixup! 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 15:23:29 +02:00 |
|
|
Jace
|
3f8a6d2f68
|
Fixed resource preloading when format is invalid
|
2015-10-22 15:19:32 +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 |
|
|
viktorljung
|
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 |
|
|
viktorljung
|
2051c8186c
|
Background fixes
|
2015-10-22 14:13:38 +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 |
|
|
viktorljung
|
f59f123340
|
Small fixes
|
2015-10-22 11:55:02 +02:00 |
|
 tleety
|
6b5c153c5d
|
Stopped kraken arm from looping, now it dissapears instead
|
2015-10-22 11:53:36 +02:00 |
|
|
viktorljung
|
9b9f959602
|
Merge remote-tracking branch 'origin/master' into Physics
|
2015-10-22 11:49:34 +02:00 |
|
|
viktorljung
|
c6071e95c3
|
Kraken brick and ink brick done
|
2015-10-22 11:49:08 +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
|
83f4da59d4
|
Merge branch 'LevelSystemAndSuch'
|
2015-10-21 15:47:54 +02:00 |
|
|
PlatinumSkink
|
ff3813a7cf
|
A metric ton of minifixes!
|
2015-10-21 15:46:32 +02:00 |
|
|
viktorljung
|
f41e126bd6
|
Merge remote-tracking branch 'origin/master' into Physics
|
2015-10-21 15:40:43 +02:00 |
|
|
viktorljung
|
f4ffead4f2
|
Animations and stuff
|
2015-10-21 15:40:19 +02:00 |
|
|
Jace
|
17c30ff610
|
Merge branch 'master' of github.com:teamfisk/AgileBreakOut
|
2015-10-21 15:38:46 +02:00 |
|
|
Jace
|
52f7e3f64b
|
Control over animation looping and event on animation completion
|
2015-10-21 15:38:34 +02:00 |
|
|
Jace
|
e7c1dc20ba
|
HACK: For some reason Blender likes to create a first frame that doesn't start at time 0
|
2015-10-21 15:37:58 +02:00 |
|
|
Jace
|
2df78e011a
|
Fixed Renderer trying to play animations when there is no animation component
|
2015-10-21 15:35:57 +02:00 |
|
|
tleety
|
df264fb732
|
Added a ink brick texture
|
2015-10-21 15:16:34 +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
|
cbaf300b03
|
Smallfix
|
2015-10-21 14:47:36 +02:00 |
|
|
tleety
|
11b792c85a
|
Merge remote-tracking branch 'origin' into Tobias
|
2015-10-21 14:39:38 +02:00 |
|
|
tleety
|
726244b043
|
Combo particle is now more visable and better
|
2015-10-21 14:39:04 +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 |
|
|
Jace
|
0fabac14a8
|
fixup! CMAKE Conditional compilation against DirectX and OpenGL targets
|
2015-10-20 15:48:13 +02:00 |
|
|
Jace
|
14b4fd9813
|
fixup! CMAKE Conditional compilation against DirectX and OpenGL targets
|
2015-10-20 15:39:12 +02:00 |
|
|
Jace
|
d197ec07ad
|
Merge branch 'master' into directx
Conflicts:
include/Core/Engine.h
|
2015-10-20 15:13:20 +02:00 |
|
|
Jace
|
a4b9521c34
|
CMAKE Conditional compilation against DirectX and OpenGL targets
...just don't enable both, okay?
|
2015-10-20 14:52:12 +02:00 |
|