Commit Graph

128 Commits

Author SHA1 Message Date
Michael Chen
73e777f98a Added fps counter 2018-01-21 14:33:51 +01:00
Michael Chen
3fc18843b3 Major glitchfix and minor bugfix in collision system. 2018-01-21 14:27:53 +01:00
Andreas Neumann
39e5b1bff9 Added mappING 2018-01-20 20:06:50 +01:00
Andreas Neumann
2ac26e990c Merge branch 'dev' of collaborating.tuhh.de:czg6669/breakout into dev 2018-01-20 11:04:25 +01:00
Andreas Neumann
2b8bdcfd4b small change of settings debug output 2018-01-20 11:04:07 +01:00
Michael Chen
ede7e06230 Major Bugfix in Vector Lib, also Fixed collision mechanics! 2018-01-20 10:56:52 +01:00
Andreas Neumann
a9119f4856 Added slider individualization 2018-01-19 18:03:18 +01:00
Michael Chen
725ed1a7a2 Merge branch 'dev' of collaborating.tuhh.de:czg6669/breakout into dev 2018-01-19 09:36:18 +01:00
Michael Chen
e6feca95c6 Minor fix 2018-01-19 07:57:47 +01:00
Andreas Neumann
b32fbe4140 Implementation of sliderstruct 2018-01-18 22:01:09 +01:00
Michael Chen
1aaf18b51d Backgrounds works now! 2018-01-18 17:03:37 +01:00
Michael Chen
dd48975d93 Merge branch 'dev' of collaborating.tuhh.de:czg6669/breakout into dev 2018-01-18 16:15:21 +01:00
Michael Chen
547943749f Clickevents fixed 2018-01-18 16:13:54 +01:00
Andreas Neumann
f2ce6658e9 Merge branch 'dev' of collaborating.tuhh.de:czg6669/breakout into dev 2018-01-18 16:12:04 +01:00
Andreas Neumann
c40dd7abcc Minor bug fixes 2018-01-18 16:11:43 +01:00
Michael Chen
75abf597e3 Highscore fixed again! 2018-01-18 16:05:42 +01:00
Andreas Neumann
168d70e873 Settings deinitialization added 2018-01-18 15:59:24 +01:00
Andreas Neumann
e69d2435ad included settings into main.c 2018-01-18 15:48:39 +01:00
Michael Chen
c60688dcf8 Merge branch 'dev' of collaborating.tuhh.de:czg6669/breakout into dev 2018-01-18 15:45:55 +01:00
Michael Chen
38a81c319a Variables renamed for convenience 2018-01-18 15:45:33 +01:00
Andreas Neumann
f8af7d472e lol 2018-01-18 15:44:34 +01:00
Michael Chen
24e6e2c76f Main header fixed again again FML 2018-01-18 15:34:34 +01:00
Michael Chen
7a28b8468f Fixed main.h again :( FML 2018-01-18 15:27:08 +01:00
Michael Chen
f412d5a025 Default is main menu 2018-01-18 15:25:30 +01:00
Michael Chen
8dd21a51a8 Highscore changed 2018-01-18 15:24:26 +01:00
Michael Chen
4bbd306407 main.c fixed 2018-01-18 15:22:53 +01:00
Michael Chen
c8ffc7840c Merge branch 'dev' of collaborating.tuhh.de:czg6669/breakout into dev 2018-01-18 15:20:41 +01:00
Michael Chen
fab3ff01fc Main Header File added 2018-01-18 15:20:01 +01:00
Stefan Neumann
04d0cfb994 main_menu as default start screen added and now you can click to change gamestate 2018-01-18 15:19:04 +01:00
Stefan Neumann
76f54de298 function added for button clicks in main menu 2018-01-18 13:18:48 +01:00
Michael Chen
d3a6dada59 Main Escape Function 2018-01-18 13:15:12 +01:00
Michael Chen
02c4341c32 Merge branch 'dev' of collaborating.tuhh.de:czg6669/breakout into dev 2018-01-18 11:45:39 +01:00
Michael Chen
96fa0960d0 Added mouse control Mode 2018-01-18 11:45:19 +01:00
Stefan Neumann
eb0fc4bc05 edited main_menu (ready now) 2018-01-18 11:44:54 +01:00
Michael Chen
7e9eaf5861 Filenames as defines 2018-01-16 12:10:37 +01:00
Michael Chen
8dbdf176f3 Highscore Memory Overflow Bug fixed 2018-01-16 10:35:40 +01:00
Michael Chen
5b42e91728 Merge branch 'dev' of collaborating.tuhh.de:czg6669/breakout into dev 2018-01-15 23:48:11 +01:00
Michael Chen
cfb55bed7a Highscoretable works now (mostly) 2018-01-15 23:48:06 +01:00
Michael Chen
5db58e9d38 Highscoretable works now (mostly) 2018-01-15 23:47:39 +01:00
Michael Chen
4ede84786e Fixed bugs and deinitialization 2018-01-15 22:01:58 +01:00
Michael Chen
0dd20c4514 Game Layout and design changed 2018-01-15 20:28:47 +01:00
Michael Chen
cadfbdc0fa Fixed basic collision mechanics 2018-01-15 16:02:21 +01:00
Michael Chen
dcceccb571 Added Highscore interface 2018-01-15 15:42:14 +01:00
Michael Chen
e253025cfd Proper block scaling (ingame) // BUG: Missing block 2018-01-15 15:35:25 +01:00
Michael Chen
e707caa7cc Debug gamestate added (important (main.c edited))! 2018-01-15 15:34:43 +01:00
Stefan Neumann
929322cc1e playbutton added, so hit that mf pull button to get a free copy of startmenu.c fellas 2018-01-15 14:08:09 +01:00
Stefan Neumann
89d295044d added texttures 2018-01-15 13:55:57 +01:00
Michael Chen
8dd9f2e02d Menu screen 2018-01-15 13:54:17 +01:00
Stefan Neumann
e7d5d2be45 fuck yu alllll 2018-01-15 13:19:51 +01:00
Michael Chen
ded8682f82 Added fonts 2018-01-14 13:47:05 +01:00