 tleety
|
3fef91b8a9
|
Added RealeaseTheKraken sprite
|
2015-10-12 15:29:34 +02:00 |
|
|
tleety
|
88df747741
|
Added Sticky sprite
|
2015-10-12 15:12:53 +02:00 |
|
|
tleety
|
577dad7dad
|
Added lifedonut sprite
|
2015-10-12 15:04:30 +02:00 |
|
|
tleety
|
8cc0b70776
|
Added Ink blaster sprite
|
2015-10-12 14:48:33 +02:00 |
|
|
tleety
|
2e8cfe0a92
|
Friends sprite
|
2015-10-12 14:47:36 +02:00 |
|
 PlatinumSkink
|
8f2af7ca8f
|
Fixed so you don't randomly lose lives upon stage cleared. I think.
|
2015-10-09 08:57:05 +02:00 |
|
 Jace
|
89779fa6ee
|
Added Kraken to level 5
|
2015-10-09 00:38:34 +02:00 |
|
|
Jace
|
6ab144520a
|
Merge branch 'master' of github.com:teamfisk/AgileBreakOut
|
2015-10-09 00:29:26 +02:00 |
|
|
Jace
|
c17501547b
|
Removed level indicator and centered score
|
2015-10-09 00:28:55 +02:00 |
|
 viktorljung
|
d4c79e338c
|
Merge remote-tracking branch 'origin/master' into Physics
Conflicts:
src/game/Game/LevelSystem.cpp
|
2015-10-09 00:22:32 +02:00 |
|
|
viktorljung
|
c754d04b63
|
Kraken GUI
|
2015-10-09 00:16:16 +02:00 |
|
|
Jace
|
47493674a8
|
fixup! After merge fixes
|
2015-10-09 00:01:56 +02:00 |
|
|
Jace
|
db1baad3c1
|
After merge fixes
|
2015-10-08 23:59:26 +02:00 |
|
|
viktorljung
|
46fca005bf
|
Merge remote-tracking branch 'origin/LevelSystemAndSuch' into Physics
|
2015-10-08 23:53:59 +02:00 |
|
|
PlatinumSkink
|
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 |
|
|
tleety
|
848efa19ac
|
Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias
|
2015-10-08 23:37:14 +02:00 |
|
|
tleety
|
1efdca9d23
|
Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias
# Conflicts:
# src/game/Game/LevelSystem.cpp
|
2015-10-08 23:35:53 +02:00 |
|
|
viktorljung
|
3609ca9123
|
pause on win
|
2015-10-08 23:21:03 +02:00 |
|
|
viktorljung
|
9997f3d964
|
Merge remote-tracking branch 'origin/master' into Physics
|
2015-10-08 23:19:23 +02:00 |
|
|
viktorljung
|
95c1f57dd7
|
GameOver and WinScreen Added
|
2015-10-08 23:18:54 +02:00 |
|
|
tleety
|
f6a760ad87
|
Finetuned level setup
|
2015-10-08 22:52:26 +02:00 |
|
|
PlatinumSkink
|
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 |
|
|
PlatinumSkink
|
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 |
|
|
viktorljung
|
9fe2324913
|
Lifebuoy updated, now dies after 4 hits
|
2015-10-08 21:51:43 +02:00 |
|
|
PlatinumSkink
|
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
|
c91cb1c3b7
|
Fixed GUI color fading in renderer
|
2015-10-08 21:49:45 +02:00 |
|
|
Jace
|
08972919ae
|
Fixed texture rendering order when fading
|
2015-10-08 21:49:32 +02:00 |
|
 Stiffly
|
96ccef6ed8
|
Merge remote-tracking branch 'origin/master' into water
Conflicts:
src/game/Game/LevelSystem.cpp
|
2015-10-08 21:44:50 +02:00 |
|
|
Stiffly
|
2545cef90f
|
temporary particles for demo. trails for bricks, and on brick hit.
|
2015-10-08 21:41:01 +02:00 |
|
|
Stiffly
|
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 |
|
|
viktorljung
|
d5e7481866
|
Fixed spelling error
|
2015-10-08 20:19:57 +02:00 |
|
|
viktorljung
|
a0d6f01ac2
|
Merge remote-tracking branch 'origin/master' into Physics
Conflicts:
src/game/Game/LevelSystem.cpp
|
2015-10-08 20:17:24 +02:00 |
|
|
viktorljung
|
52ab09d0b1
|
Added brick models and Lifebuoy balance changes
|
2015-10-08 20:08:42 +02:00 |
|
|
PlatinumSkink
|
3793515968
|
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
|
2015-10-08 20:08:10 +02:00 |
|
|
PlatinumSkink
|
5c2844c137
|
InkBlaster functions as intended! It just needs ink!
|
2015-10-08 20:02:51 +02:00 |
|
|
Stiffly
|
143bff2d9e
|
Added two new particle sprites.
|
2015-10-08 18:19:15 +02:00 |
|
|
viktorljung
|
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 |
|
|
viktorljung
|
b93013fcd8
|
Lifebuoy working
|
2015-10-08 17:22:19 +02:00 |
|
|
PlatinumSkink
|
c76033113d
|
Small edit to temporarily solve a problem.
|
2015-10-08 17:15:48 +02:00 |
|
|
PlatinumSkink
|
3ac6fdce5f
|
Fixes smaller problems
|
2015-10-08 16:53:51 +02:00 |
|
|
Jace
|
54fb8bf70a
|
Error texture was WONKY
|
2015-10-08 16:43:51 +02:00 |
|