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
|
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 |
|
Andreas Neumann
|
2ebac3c167
|
Added rounding function
|
2018-01-22 20:07:14 +01:00 |
|
Andreas Neumann
|
39e5b1bff9
|
Added mappING
|
2018-01-20 20:06:50 +01:00 |
|
Andreas Neumann
|
2b8bdcfd4b
|
small change of settings debug output
|
2018-01-20 11:04:07 +01:00 |
|
Andreas Neumann
|
a9119f4856
|
Added slider individualization
|
2018-01-19 18:03:18 +01:00 |
|
Andreas Neumann
|
b32fbe4140
|
Implementation of sliderstruct
|
2018-01-18 22:01:09 +01:00 |
|
Andreas Neumann
|
c40dd7abcc
|
Minor bug fixes
|
2018-01-18 16:11:43 +01:00 |
|
Andreas Neumann
|
168d70e873
|
Settings deinitialization added
|
2018-01-18 15:59:24 +01:00 |
|
Andreas Neumann
|
f8af7d472e
|
lol
|
2018-01-18 15:44:34 +01:00 |
|