Commit graph

21 commits

Author SHA1 Message Date
MtH
720ae5d3cc resolve merge conflict with ActualMandM/pause 2021-03-30 16:47:50 +02:00
George FunBook
9ffa28dd21 Merge branch 'master' into options 2021-03-13 22:41:29 -06:00
George FunBook
95f8d65972 Merge branch 'master' into ng_login 2021-03-13 20:24:57 -06:00
George FunBook
43b0d5ac78 add options menu 2021-03-13 20:11:56 -06:00
Cameron Taylor
d7aba46853 tankmen foreground in progress 2021-03-08 18:38:58 -05:00
Cameron Taylor
4fae6773c9 tank guy and quality of life shit 2021-03-07 15:34:21 -05:00
Cameron Taylor
0951b672e7 charts an shit and death counter 2021-03-04 14:30:35 -05:00
Cameron Taylor
7cba3e72ea freeplay icon polish, and pause title touchups 2021-03-01 23:58:19 -05:00
Cameron Taylor
fee7a7746c pause screen polish shit 2021-03-01 23:00:02 -05:00
George FunBook
fb3ed180e1 Merge branch 'master' into deferred_loading 2021-02-12 09:46:22 -06:00
Cameron Taylor
b3ec450352 more seamless storymode transitions 2021-02-12 01:20:20 -05:00
George FunBook
07abc35f66 add Paths asset name helper 2021-02-08 15:34:48 -06:00
M&M
8e0a286c01 Pause menu goes back to the mode you came from 2021-02-07 17:31:21 -08:00
Cameron Taylor
b07372aa8e CHARTS 2020-12-26 21:46:22 -05:00
Cameron Taylor
36b0302ac4 cool pause music 2020-11-20 04:21:04 -08:00
Cameron Taylor
3a1a410fe2 restart on pause menu 2020-11-17 18:20:27 -08:00
Cameron Taylor
2462ae555e pause menu in progress 2020-11-17 17:50:09 -08:00
Cameron Taylor
6b076faaf7 LOSS SCREEN WIP 2020-10-27 03:35:23 -07:00
Cameron Taylor
02b751d8fb new line support for text also camera shit 2020-10-26 02:16:05 -07:00
Cameron Taylor
4d7fc18fc4 FIXED up bullshit 2020-10-21 17:22:12 -07:00
Cameron Taylor
186b981847 simple pause screen 2020-10-09 14:24:20 -07:00