Michael Chen
|
1fb934f7a6
|
Merge branch 'devsave' into 'master'
Added control buttons to gameover screen
See merge request czg6669/breakout!4
|
2018-01-30 09:00:10 +00:00 |
|
Michael Chen
|
7bafb848bb
|
Added control buttons to gameover screen
|
2018-01-30 09:59:35 +01:00 |
|
Michael Chen
|
e55253c244
|
Merge branch 'devsave' into 'master'
Working Release v1.0
See merge request czg6669/breakout!3
|
2018-01-29 22:51:03 +00:00 |
|
Michael Chen
|
81dda24c4f
|
Removed score penalty, slight fix in collision system
|
2018-01-29 23:47:18 +01:00 |
|
Michael Chen
|
693d2b7dfe
|
Fixed login system
|
2018-01-29 23:15:40 +01:00 |
|
Michael Chen
|
aec3cb4882
|
Login and Registration system implemented
|
2018-01-29 21:26:48 +01:00 |
|
Michael Chen
|
0399b32cf8
|
Updated C# interface for login and register functions
|
2018-01-29 19:11:05 +01:00 |
|
Michael Chen
|
b16c557cf0
|
Added ingame sound effects
|
2018-01-29 19:10:08 +01:00 |
|
Michael Chen
|
afc0a96516
|
Menu Music implemented
|
2018-01-27 18:48:45 +01:00 |
Stefan Neumann
|
eccebfc938
|
added menu music
|
2018-01-27 14:58:14 +00:00 |
|
Michael Chen
|
41db97f2e3
|
Merge branch 'devsave' of collaborating.tuhh.de:czg6669/breakout into devsave
|
2018-01-27 15:52:47 +01:00 |
|
Stefan Neumann
|
9ac4e06078
|
added ingame music
|
2018-01-27 14:52:17 +00:00 |
|
Michael Chen
|
e62f43f6da
|
Merge branch 'devsave' of collaborating.tuhh.de:czg6669/breakout into devsave
|
2018-01-27 15:51:56 +01:00 |
|
Stefan Neumann
|
9a27ff1209
|
Delete 251461__joshuaempyre__arcade-music-loop.wav
|
2018-01-27 14:51:50 +00:00 |
|
Michael Chen
|
dadf5946c8
|
Braekout typo xD
|
2018-01-27 15:51:36 +01:00 |
|
Stefan Neumann
|
30f536f559
|
added in game music
|
2018-01-27 14:50:54 +00:00 |
|
Michael Chen
|
e67f684fa7
|
Death sound added
|
2018-01-27 11:37:39 +01:00 |
|
Michael Chen
|
33e69b0bb4
|
Mixer libraries added
|
2018-01-27 11:37:02 +01:00 |
|
Michael Chen
|
2c860c2f4b
|
fixed block push animation
|
2018-01-26 23:50:05 +01:00 |
|
Michael Chen
|
396c8f7ddc
|
Merge branch 'devsave' of collaborating.tuhh.de:czg6669/breakout into devsave
|
2018-01-26 10:40:30 +01:00 |
|
Michael Chen
|
629f3f94a8
|
Push new Blocks with animation
|
2018-01-26 10:40:19 +01:00 |
Andreas Neumann
|
78128033ef
|
Stepslider struct,initialization,draw function and graphics added
|
2018-01-25 22:59:33 +01:00 |
|
Andreas Neumann
|
ce8a8616ad
|
Added deinitialization of new slider textures
|
2018-01-25 21:55:48 +01:00 |
|
Andreas Neumann
|
2329df1eca
|
Merge branch 'devsave' of collaborating.tuhh.de:czg6669/breakout into devsave
|
2018-01-25 21:46:01 +01:00 |
|
Andreas Neumann
|
bb156995cd
|
Amazing Slider Upgrade
|
2018-01-25 21:45:48 +01:00 |
|
Michael Chen
|
c407253228
|
Fixed collision system! Minor bug fixes
|
2018-01-25 17:05:12 +01:00 |
|
Andreas Neumann
|
9982290d77
|
Added mousePos scaling
|
2018-01-25 16:49:10 +01:00 |
|
Andreas Neumann
|
15b0846787
|
merge 2.0
|
2018-01-25 16:13:17 +01:00 |
|
Michael Chen
|
8b8771fd41
|
Initial save commit contains recent premerge content!
|
2018-01-25 15:27:06 +01:00 |
|
Michael Chen
|
85be40dcda
|
Keep the ball speed at fail
|
2018-01-25 14:07:30 +01:00 |
|
Michael Chen
|
2a3c056909
|
Merge branch 'dev' of collaborating.tuhh.de:czg6669/breakout into dev
|
2018-01-25 11:18:40 +01:00 |
|
Michael Chen
|
a369855a27
|
Score upload interface added
|
2018-01-25 11:18:33 +01:00 |
|
Michael Chen
|
b33a6478e6
|
Revert "Merge branch 'dev' of collaborating.tuhh.de:czg6669/breakout into dev"
This reverts commit 681b6dcd2b
|
2018-01-25 10:11:07 +00:00 |
|
Stefan Neumann
|
681b6dcd2b
|
Merge branch 'dev' of collaborating.tuhh.de:czg6669/breakout into dev
|
2018-01-25 10:07:15 +01:00 |
|
Stefan Neumann
|
34fb88a86a
|
h
|
2018-01-25 10:06:49 +01:00 |
|
Michael Chen
|
8a449ac7cd
|
merge got fucked up :/
|
2018-01-25 08:00:41 +01:00 |
|
Stefan Neumann
|
df535bb7d0
|
Merge branch 'dev' of collaborating.tuhh.de:czg6669/breakout into dev
|
2018-01-25 07:54:04 +01:00 |
|
Stefan Neumann
|
a2af143d23
|
changed headline of settings
|
2018-01-25 07:53:08 +01:00 |
|
Michael Chen
|
1c227c0dce
|
Changed texture count in settings
|
2018-01-24 14:53:42 +01:00 |
|
Michael Chen
|
6aefc442d7
|
You Forgot a break;
|
2018-01-24 14:50:34 +01:00 |
|
Michael Chen
|
c577dcc2d7
|
Minor bugfix in gameover screen
|
2018-01-23 22:17:45 +01:00 |
|
Michael Chen
|
45221cb72b
|
Ingame pause screen added (Escape-Button)
|
2018-01-23 22:13:57 +01:00 |
|
Michael Chen
|
d7e5845e4e
|
Added ingame HUD and texture helper functions
|
2018-01-23 21:22:59 +01:00 |
|
Michael Chen
|
3b2a0c8741
|
Added GameOver screen
|
2018-01-23 21:22:01 +01:00 |
|
Michael Chen
|
9e1738c05d
|
Added prerendered text sprites
|
2018-01-23 21:21:33 +01:00 |
|
Michael Chen
|
affda45ac5
|
Fixed start Menu Click event at scaled window
|
2018-01-23 11:12:26 +01:00 |
|
Michael Chen
|
9088047c68
|
Score calculation added
|
2018-01-23 11:08:15 +01:00 |
|
Michael Chen
|
fc805e5c31
|
Merge branch 'dev' of collaborating.tuhh.de:czg6669/breakout into dev
|
2018-01-22 23:06:30 +01:00 |
|
Michael Chen
|
ca643ec62f
|
Increasing Difficulty and Start Countdown added
|
2018-01-22 23:06:22 +01:00 |
|
Andreas Neumann
|
2ebac3c167
|
Added rounding function
|
2018-01-22 20:07:14 +01:00 |