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
Jace
7ee0bbc32b
Added first stage story
2015-10-08 23:41:59 +02:00
Jace
18e2891621
fixup: Loading frame
2015-10-08 23:40:58 +02:00
Jace
a5c5b5eb3e
Fixed ResourceManager preloading
2015-10-08 23:39:18 +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
90636a7169
Color Arrays in Vec4 implimented. Have fun.
2015-10-08 22:32:06 +02:00
Jace
4978f204a7
First story frame
2015-10-08 21:52:40 +02:00
Jace
2f09cdce4c
Loading frame
2015-10-08 21:52:22 +02:00
7d15be6d6d
Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut
2015-10-08 21:52:21 +02:00
Jace
77b54ab988
Created a Storyboard frame that can fade and pan between images
2015-10-08 21:52:09 +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
856053e3f2
Forgot this when moving game GUI to a subfolder... I guess.
2015-10-08 21:51:13 +02:00
Jace
cc9f868d5d
Frame is now sized to parent by default
2015-10-08 21:50:04 +02:00
Jace
08972919ae
Fixed texture rendering order when fading
2015-10-08 21:49:32 +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
5c2844c137
InkBlaster functions as intended! It just needs ink!
2015-10-08 20:02:51 +02:00
143bff2d9e
Added two new particle sprites.
2015-10-08 18:19:15 +02:00
87fd73f249
Merge remote-tracking branch 'origin/master' into Physics
...
Conflicts:
src/game/Game/BallSystem.cpp
src/game/Game/LevelSystem.cpp
src/game/Physics/PhysicsSystem.cpp
2015-10-08 17:28:28 +02:00
b93013fcd8
Lifebuoy working
2015-10-08 17:22:19 +02:00
3ac6fdce5f
Fixes smaller problems
2015-10-08 16:53:51 +02:00
210c6a003b
Merge branch 'master' into LevelSystemAndSuch. Fixed so scrolling to next level works again.
2015-10-08 16:11:47 +02:00
6669d91a90
Sticky works except graphics. Temporarily colored odd bricks.
2015-10-08 15:42:13 +02:00
f147778d4d
Merge remote-tracking branch 'origin/master' into Physics
...
Conflicts:
src/game/Physics/PhysicsSystem.cpp
2015-10-08 14:29:29 +02:00
c57181fb83
working on Lifebuoy
2015-10-08 14:25:20 +02:00
566b440d80
Lifebuoy added. Incomplete, but it appears.
2015-10-08 14:00:26 +02:00
bb314898ba
Fixing vs build fail
2015-10-08 12:12:21 +02:00
1a49e9d1b0
Merge remote-tracking branch 'origin/Physics' into LevelSystemAndSuch
2015-10-08 11:52:32 +02:00
b5ae490b23
Prepared for Lifebuoy PowerUp.
2015-10-08 11:51:13 +02:00
33ecbaaab3
density added in physics Component
2015-10-08 11:37:13 +02:00
3f0f45f509
Merge remote-tracking branch 'origin/master' into water
...
Conflicts:
include/Core/Engine.h
src/game/Physics/PhysicsSystem.cpp
2015-10-08 11:16:31 +02:00
66feadfd04
Fixed physics wrong error message
2015-10-08 11:04:35 +02:00
Jace
7bf1d7cf24
Moved game GUI to its own subfolder
2015-10-08 10:46:28 +02:00
07e59bd0e2
Scroll to next stage works!
2015-10-07 19:19:55 +02:00
ef5882ffbf
Vattnet fungerar nu igen.
2015-10-07 19:18:49 +02:00
1a1b94477e
Merge remote-tracking branch 'origin/master' into water
...
Conflicts:
include/Core/Engine.h
include/Physics/PhysicsSystem.h
include/Sound/SoundSystem.h
src/game/Physics/PhysicsSystem.cpp
src/game/Sound/SoundSystem.cpp
PS:min teori i förra commiten var sann
2015-10-07 18:34:36 +02:00
db2d6ad6e4
Eventbaserade partiklar. Fick nån krasch i physicssystem efter ett tags spelande, men det hoppas jag löser sig när jag mergar in Viktors senaste fysikfixar :3
2015-10-07 17:22:45 +02:00
9bb50067fc
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
2015-10-07 17:13:05 +02:00
3814c25931
Squid does not move until space is pressed. Experimenting with scroll. This shouldn't really be committed, but Visual Studio.
2015-10-07 17:09:55 +02:00
71fe786b04
even more bug fixes
2015-10-07 15:45:50 +02:00
562a5fa269
fixed more bugs
2015-10-07 15:40:04 +02:00
viktorljung
PlatinumSkink
Jace
Stiffly