Merge branch 'master' of https://github.com/Double-Fine-Game-Club/bad-golf-community-edition into in-game-gui
Merge branch 'master' of https://github.com/Double-Fine-Game-Club/bad-golf-community-edition into in-game-gui
in-game gui: implemented marking for enemy balls, network integrated, fixed up general bugs with ball marking
Merge branch 'master' of https://github.com/Double-Fine-Game-Club/bad-golf-community-edition into in-game-gui
in-game hud: fixed up ball marking to work with Osse's new multiplayer work, fit names to project naming conventions, added more error checking and some slight art updates
Merge branch 'master' of https://github.com/Double-Fine-Game-Club/bad-golf-community-edition into in-game-gui
in-game hud: added UnlitTransparency.shader for future updates, switched ball marker materials to use it
in-game gui: added in new ball marker art, and started working on transparency on approach
Merge pull request #115 from MaritalWheat/in-game-gui

in-game hud: enemy ball marking
Added new ball controls to level_full and fixed power meter issue
Merge pull request #124 from elneilios/master

Added new ball controls to level_full and fixed power meter issue
in-game gui: slight updates to ball marking, textures and scaling on distance
Merge pull request #129 from MaritalWheat/in-game-gui

in-game hud: slight updates to ball marking, textures and scaling on distance
Adjusted stuff for Feb 26th build
* Changed multi_lobby floor texture to green and wall texture to blue
* Added skybox to main.unity
* Added ball indicatory to multi_lobby
* Trimmed config.xml and EditorBuildSettings.asset of extraneous scenes
* Added level_full to config.xml and EditorBuildSettings.asset
Removed extraneous file
manual merge of main.unity, also fix lighting issue (ambient was set to white)
fix some bugs that I had with controller sensitivity and also with turning on off players