fsm tests
stuff
options menu functional ish
state machine , options / resolution stuff
state machine and civilian character
delete old files
more delete old files
minor changes + comments before manual merge (broken master again)
fix fps from manual merge
y
basic ui functionality. character clicking.
merge with master
fix after merge
Merge branch 'P'