This website requires JavaScript.
e9ca58de64
Merge branch 'master' into water
2015-10-14 15:43:34 +02:00
8e32574692
Removed unnecessary Cout to avoid annoying others.
2015-10-13 18:37:46 +02:00
b94eeac2cd
Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut
2015-10-13 18:34:46 +02:00
ffea58d41f
ScreenShake works as intended at the press of E and upon calling the event.
2015-10-13 18:34:21 +02:00
e6cffcb217
Merge remote-tracking branch 'origin/master' into Physics
2015-10-13 18:03:15 +02:00
8762fe3513
Fixed minor sticky bug.
2015-10-13 18:00:25 +02:00
1b4c38c292
Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut
2015-10-13 17:52:30 +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
f773458654
Merge branch 'LevelSystemAndSuch'
2015-10-13 17:45:34 +02:00
1e4e278ef6
Added score background stuff
2015-10-13 17:45:15 +02:00
5955a888d2
Merge remote-tracking branch 'origin/master' into water
2015-10-13 17:44:05 +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
2015-10-13 17:32:07 +02:00
36d0601dfd
Added TravellingSystem for travelling to the next stage. Added incomplete ScreenShake. Ball now starts on pad.
2015-10-13 17:28:31 +02:00
f86dc9a530
Needs some spinfixing
2015-10-13 17:20:32 +02:00
1065d3abc3
Merge remote-tracking branch 'origin/master' into water
2015-10-13 17:02:31 +02:00
4857e387ad
Added some new fonts
2015-10-13 17:02:20 +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
c20b9a35b3
Merge branch 'master' of github.com:teamfisk/AgileBreakOut
2015-10-13 15:09:33 +02:00
c431193764
Some debug code
2015-10-13 15:09:00 +02:00
40343744c1
Adjustments to Sticky and Inkblaster made, in addition made StickyAimer partly transparent green.
2015-10-13 14:02:18 +02:00
1a070d8ce8
Merge branch 'master' into LevelSystemAndSuch
2015-10-13 13:37:08 +02:00
32bbf282c9
Aimer for Sticky Works, though stuff.
2015-10-12 18:18:37 +02:00
cd64531307
Merged with master and fixed some small variable things
2015-10-12 17:18:44 +02:00
c2b1211be8
Merge branch 'master' of github.com:teamfisk/AgileBreakOut
2015-10-12 16:53:08 +02:00
52e2ce567a
Power up sprites now show when you hit powerup bricks
2015-10-12 16:48:04 +02:00
02d724fedd
Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut
2015-10-12 16:47:24 +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
3fef91b8a9
Added RealeaseTheKraken sprite
2015-10-12 15:29:34 +02:00
88df747741
Added Sticky sprite
2015-10-12 15:12:53 +02:00
577dad7dad
Added lifedonut sprite
2015-10-12 15:04:30 +02:00
8cc0b70776
Added Ink blaster sprite
2015-10-12 14:48:33 +02:00
2e8cfe0a92
Friends sprite
2015-10-12 14:47:36 +02:00
8f2af7ca8f
Fixed so you don't randomly lose lives upon stage cleared. I think.
2015-10-09 08:57:05 +02:00
89779fa6ee
Added Kraken to level 5
Jace
2015-10-09 00:38:34 +02:00
6ab144520a
Merge branch 'master' of github.com:teamfisk/AgileBreakOut
Jace
2015-10-09 00:29:26 +02:00
c17501547b
Removed level indicator and centered score
Jace
2015-10-09 00:28:55 +02:00
d4c79e338c
Merge remote-tracking branch 'origin/master' into Physics
2015-10-09 00:22:32 +02:00
c754d04b63
Kraken GUI
2015-10-09 00:16:16 +02:00
47493674a8
fixup! After merge fixes
Jace
2015-10-09 00:01:56 +02:00
db1baad3c1
After merge fixes
Jace
2015-10-08 23:59:26 +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
7f344263da
Merge branch 'master' into gui
Jace
2015-10-08 23:47:25 +02:00
7ee0bbc32b
Added first stage story
Jace
2015-10-08 23:41:27 +02:00
18e2891621
fixup: Loading frame
Jace
2015-10-08 23:40:58 +02:00
a5c5b5eb3e
Fixed ResourceManager preloading
Jace
2015-10-08 23:39:18 +02:00
848efa19ac
Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias
2015-10-08 23:37:14 +02:00
1efdca9d23
Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias
2015-10-08 23:35:53 +02:00
3609ca9123
pause on win
2015-10-08 23:21:03 +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
f6a760ad87
Finetuned level setup
2015-10-08 22:52:26 +02:00
90636a7169
Color Arrays in Vec4 implimented. Have fun.
2015-10-08 22:32:06 +02:00
4978f204a7
First story frame
Jace
2015-10-08 21:52:40 +02:00
2f09cdce4c
Loading frame
Jace
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
77b54ab988
Created a Storyboard frame that can fade and pan between images
Jace
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
856053e3f2
Forgot this when moving game GUI to a subfolder... I guess.
Jace
2015-10-08 21:51:13 +02:00
cc9f868d5d
Frame is now sized to parent by default
Jace
2015-10-08 21:50:04 +02:00
c91cb1c3b7
Fixed GUI color fading in renderer
Jace
2015-10-08 21:49:45 +02:00
08972919ae
Fixed texture rendering order when fading
Jace
2015-10-08 21:49:32 +02:00
96ccef6ed8
Merge remote-tracking branch 'origin/master' into water
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
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
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
2015-10-08 17:28:28 +02:00
b93013fcd8
Lifebuoy working
2015-10-08 17:22:19 +02:00
c76033113d
Small edit to temporarily solve a problem.
2015-10-08 17:15:48 +02:00
3ac6fdce5f
Fixes smaller problems
2015-10-08 16:53:51 +02:00
54fb8bf70a
Error texture was WONKY
Jace
2015-10-08 16:43:51 +02:00
74d7e1feb7
Slight calibration so Travelling doesn't necessarily kill the process just because something is Sticky.
2015-10-08 16:13:30 +02:00
210c6a003b
Merge branch 'master' into LevelSystemAndSuch. Fixed so scrolling to next level works again.
2015-10-08 16:11:47 +02:00
040b0f9461
Merge remote-tracking branch 'origin/Physics' into LevelSystemAndSuch
2015-10-08 15:47:27 +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
2015-10-08 14:29:29 +02:00
c57181fb83
working on Lifebuoy
2015-10-08 14:25:20 +02:00
544a45d21d
Merge remote-tracking branch 'origin/LevelSystemAndSuch' into Physics
2015-10-08 14:04:03 +02:00
18ffddb2ac
White bricks added
2015-10-08 14:03:38 +02:00
566b440d80
Lifebuoy added. Incomplete, but it appears.
2015-10-08 14:00:26 +02:00
51cc45fbf0
Merge branch 'master' into water
2015-10-08 13:36:01 +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
f085e6a387
Water can now collide with the bricks, added new ship model
2015-10-08 11:27:17 +02:00
3f0f45f509
Merge remote-tracking branch 'origin/master' into water
2015-10-08 11:11:56 +02:00
b5785da5d5
Merge remote-tracking branch 'origin/master' into water
2015-10-08 11:11:56 +02:00
66feadfd04
Fixed physics wrong error message
2015-10-08 11:04:35 +02:00
7bf1d7cf24
Moved game GUI to its own subfolder
Jace
2015-10-08 10:46:28 +02:00
d038855fb7
Minor adjustments.
2015-10-08 10:45:01 +02:00
Stiffly
PlatinumSkink
viktorljung
tleety
Jace