Commit Graph

60 Commits

Author SHA1 Message Date
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
Michael Chen
347326a14a Changed assets 2018-01-14 11:50:28 +01:00
Michael Chen
a29178ec55 Ball collides with blocks 2018-01-12 16:49:17 +01:00
Michael Chen
61a470f0fb Fixed Paddle glitch 2018-01-12 14:04:44 +01:00
Michael Chen
cc5211f84f Block struct works, TODO: Fix rectangle collisions! Fix texture 2018-01-12 10:47:14 +01:00
Michael Chen
ab98ff12c5 Block Textures 2018-01-12 09:47:32 +01:00
Michael Chen
47e2c125f5 Glitchfix (Ball no longer gets stuck in Paddle easily) 2018-01-11 19:05:22 +01:00
Michael Chen
bb164e51d8 Paddle collision works 2018-01-11 19:03:12 +01:00
Michael Chen
77bd1ed996 Fullscreen now supported (absolute, not scaled) 2018-01-11 18:45:00 +01:00
Michael Chen
b9cd095b1c Autostarting makefile 2018-01-11 16:57:01 +01:00
Michael Chen
cac2af317b Bugfix 2018-01-11 16:47:40 +01:00
Michael Chen
db5f91ccf7 Added dll 2018-01-11 16:40:36 +01:00
Michael Chen
05f523b138 Paddle and Ball do now collide. Still glitchy 2018-01-11 14:12:30 +01:00
Michael Chen
064ace7bf1 Basic Movement works. No Collisions yet! 2018-01-11 01:06:55 +01:00
Michael Chen
f136e07b43 Basic Ball functionality 2018-01-10 23:56:47 +01:00
Michael Chen
71b4993a6b Added dll for SDL2_image and implemented top level functions for ball. 2018-01-10 23:40:17 +01:00
Michael Chen
7f36f6dd14 Added interface for online score system. 2018-01-10 22:49:37 +01:00
Michael Chen
ff3c1a5333 Click Events, added Image and Text libraries (included), working prototype 2018-01-10 15:37:55 +01:00
Michael Chen
89a745882e Changed working directory of the run in Makefile 2018-01-09 14:36:57 +01:00