Commit Graph

92 Commits

Author SHA1 Message Date
Moris Krajnc
76f307541b Merge branch 'fps' into 'master'
Fps

See merge request !3
2020-07-16 10:59:20 +02:00
Moris Krajnc
be9838af5c cleaned code 2020-07-16 10:58:01 +02:00
Patrick Tschuchnig
37ab165bfc test for performance added FPS counter 2020-07-16 08:22:56 +02:00
Patrick Tschuchnig
257c109f9f Merge branch 'master' of http://git.wolfsberg.local/philipp.clima/heisser_draht 2019-10-29 16:27:41 +01:00
Raphael
af7277db5f Merge branch 'master' of git.wolfsberg.local:philipp.clima/heisser_draht 2019-10-29 16:21:01 +01:00
Raphael
3830e47103 changed colours 2019-10-29 16:20:35 +01:00
Patrick Tschuchnig
b733da947b Merge branch 'master' of http://git.wolfsberg.local/philipp.clima/heisser_draht 2019-10-29 16:03:41 +01:00
Patrick Tschuchnig
291eb7b746 Merge branch 'sound' into 'master'
Sound geändert und draw borders

See merge request !2
2019-10-29 15:58:31 +01:00
Raphael
fd577157ba Sound geändert und draw borders 2019-10-29 15:54:18 +01:00
Patrick Tschuchnig
70fb1acc64 Merge branch 'master' of http://git.wolfsberg.local/philipp.clima/heisser_draht 2019-10-29 13:35:35 +01:00
Raphael
c3e1af432a bild verkleinert, positionen angepasst 2019-10-29 13:33:47 +01:00
Patrick Tschuchnig
7570a03880 Merge branch 'master' of http://git.wolfsberg.local/philipp.clima/heisser_draht 2019-10-29 11:57:15 +01:00
Raphael
531f166580 bg geändert, borders abgeschalten, highscore platzierung verschoben 2019-10-29 11:53:15 +01:00
Patrick Tschuchnig
2ba3cbc1f4 Merge branch 'master' of http://git.wolfsberg.local/philipp.clima/heisser_draht 2019-10-29 10:14:53 +01:00
Patrick Tschuchnig
d440d24309 Merge branch 'bg' into 'master'
backgrounde eingefügt

See merge request !1
2019-10-29 10:11:37 +01:00
Raphael
4467f1db26 backgrounde eingefügt 2019-10-29 10:08:07 +01:00
Patrick Tschuchnig
6c516b35d9 changed metallic logo, minor spelling mistakes fixed 2019-09-23 14:27:43 +02:00
Patrick Tschuchnig
3fdfa3286b Merge branch 'master' of http://git.wolfsberg.local/philipp.clima/heisser_draht 2019-09-19 13:53:13 +02:00
Patrick Tschuchnig
97bbaba5ba renamed 2 functions, their names were swapped. inserted the metallic logo 2019-09-19 13:51:58 +02:00
Patrick Tschuchnig
f617226879 changed the default logic for the buttons and contact pins to inverted - default high. changed circuit and circuit diagrams to accomodate for that. 2019-09-19 08:58:21 +02:00
Patrick Tschuchnig
2baa5e4e7b added sound effects, changed screen resolution setup to be detection based rather than manually entered 2019-09-19 08:08:18 +02:00
Patrick Tschuchnig
d5d79416e3 added sound effects. more cleanup. removed toggle fullscreen function (unused). added more documentation 2019-09-17 08:19:24 +02:00
Patrick Tschuchnig
12ceaa7265 fixed missing input declaration 2019-09-13 12:15:30 +02:00
Patrick Tschuchnig
6f69b471e5 added next major revision with cleanups and documentation 2019-09-13 08:18:54 +02:00
Patrick Tschuchnig
5e2ecbc98f more fixes 2019-09-12 09:02:51 +02:00
Patrick Tschuchnig
0fb43994fd more fixes 2019-09-12 09:01:40 +02:00
Patrick Tschuchnig
c40f8e3128 more fixes 2019-09-12 09:00:05 +02:00
Patrick Tschuchnig
d1a3a2b35d more fixes 2019-09-12 08:58:36 +02:00
Patrick Tschuchnig
3651b6fb70 somehow this didnt work 2019-09-12 08:56:29 +02:00
Patrick Tschuchnig
953a2836dc im too dumb to understand = and == 2019-09-12 08:52:37 +02:00
Patrick Tschuchnig
c703f25311 disabled blinking 2019-09-12 08:51:36 +02:00
Patrick Tschuchnig
c0d75a69f8 changed led blinking to default off, removed the handler to update the pwm per default, and made a toggle to switch it back on 2019-09-12 08:50:40 +02:00
Patrick Tschuchnig
35416a2c28 fixed missing global assignment 2019-09-12 08:21:33 +02:00
Patrick Tschuchnig
4cada0a593 trying to reduce flicker due to pwm switching 2019-09-12 08:20:20 +02:00
Patrick Tschuchnig
dc1bc6fe7b changed led handler and blinking mechanics 2019-09-12 08:11:03 +02:00
Patrick Tschuchnig
d64b0858fc completely disabled led handler, also the name input box keeps being at the wrong place :x 2019-09-11 16:37:09 +02:00
Patrick Tschuchnig
e3af1a7f50 progress on the LED blinking handler 2019-09-11 16:34:32 +02:00
Patrick Tschuchnig
dc9497ab6b trying a new way of controlling the LED strips 2019-09-11 15:01:29 +02:00
Patrick Tschuchnig
003ccce40f changed the way the drawing for the name entry works 2019-09-11 14:24:18 +02:00
Patrick Tschuchnig
bd9ecde8b0 changed the way the border and logo is drawn to be on every screen 2019-09-11 14:16:42 +02:00
Patrick Tschuchnig
8afb7765a5 changed flipping to be done at the end of the game routine 2019-09-11 13:36:08 +02:00
Patrick Tschuchnig
a337c279f7 minor cleanup, added placeholders, changed when the border is drawn 2019-09-11 13:33:02 +02:00
Patrick Tschuchnig
ad94b1b601 cleaned up the game states to be a 2 bit system with game running and game ending states. 2019-09-11 13:08:12 +02:00
Patrick Tschuchnig
84a6e58ba3 fixed a bug where starting the game while displaying the end screen was allowed, causing an undefined state in the engine and softlocking the player. now causing an inhibit state to block the start pin and also only allow checking for the game start if the game is not currently ending 2019-09-11 12:02:41 +02:00
Patrick Tschuchnig
60f0545878 changed a stupid behaviour that allowed a backspace to be entered as the first char of a name 2019-09-11 11:45:29 +02:00
Patrick Tschuchnig
b42813cf75 changed when the game stopped routine is being called, as it was called while the game was in ending state, which wasnt intended 2019-09-11 11:40:53 +02:00
Patrick Tschuchnig
7e67391678 changed the game start timer to be a one-shot in the game_ending routine. changed a spelling mistake in variable declaration. 2019-09-11 11:27:43 +02:00
Patrick Tschuchnig
72a08a23b6 changed timing system for the game\'s end to be tick based 2019-09-11 11:14:59 +02:00
Patrick Tschuchnig
48df332b32 changed timings, changed a problem with the game restarting, changed logic for game start to be for a closing button, changed pin for errors to be 33 (pull up) 2019-09-11 10:57:16 +02:00
Patrick Tschuchnig
9e2086611c fixed incorrect variable name 2019-09-11 10:05:22 +02:00