Michael Chen
|
487b668ebf
|
Revert "Merge branch 'dev' of collaborating.tuhh.de:czg6669/breakout into dev"
This reverts commit 09ab6dd027
|
2018-01-25 14:12:53 +00:00 |
|
Andreas Neumann
|
09ab6dd027
|
Merge branch 'dev' of collaborating.tuhh.de:czg6669/breakout into dev
|
2018-01-25 14:57:12 +01:00 |
|
Andreas Neumann
|
c6608cd3e0
|
Added return button and size changer
|
2018-01-25 14:51:33 +01:00 |
|
Stefan Neumann
|
21012dbc70
|
- replaced texture in settings.c
- added return button in settings.c
|
2018-01-25 14:05:47 +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 |
|
Michael Chen
|
8aa3cd3550
|
Added font library (not entirely tested)
|
2018-01-21 19:41:29 +01:00 |
|
Michael Chen
|
9956b5a7ad
|
Major changes in Scenery updating!
|
2018-01-21 15:33:09 +01:00 |
|
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 |
|