Commit Graph

11 Commits

Author SHA1 Message Date
Ben Lankamp e7697aa3ac * Fixed input loops/too much callbacks. 2020-06-20 23:33:26 +02:00
Ben Lankamp 7962ff2124 Merge of Marshall/master into BL/master.
Merge of SDL code from feature branch into BL/master.
2020-06-20 11:41:29 +02:00
Ben Lankamp 829f27c76f Rewrote UserInput <> SDL interaction. 2020-06-18 16:11:40 +02:00
jmarshall23 c8c5ef4e34 Merge branch 'master' into master 2020-06-15 11:07:10 -07:00
Ben Lankamp 2f7e6dbcaa Menus all centered 2020-06-15 18:20:13 +02:00
Ben Lankamp 1c1737e10d * Main menu now properly aligned. 2020-06-15 17:49:18 +02:00
Justin Marshall 0a1ef9aa84 Initial checkin of the new UI blit code(there are issues and will be fixed one by one). 2020-06-14 09:20:39 -07:00
Ben Lankamp 054394ecea * Show version number 2020-06-14 16:47:31 +02:00
Justin Marshall fb58966e1b Cleaned up imgui integration. 2020-06-13 15:52:07 -07:00
Justin Marshall 712a5e519d Map command can now be called from anywhere in the main menu UI 2020-06-12 14:03:10 -07:00
Justin Marshall ba0c51a7f2 Moved code into the code folder. 2020-06-12 08:15:26 -07:00