working on health and energy visualization
got health and energy modes done
merge fixes
added player name to local setup menu
map loaded can now load any tmx file in assets and use it correctly
added in obstacle tiles and handling
small bug fixes in class
Merge remote-tracking branch 'origin/Carrie-3.24' into Alen's-Branch