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
Added InControl compatible controls to golf sim (works well with mouse)
Merge remote-tracking branch 'upstream/master'
Some tweaks to the golf sim controls, like capturing mouse when in swing mode
Small tweak so that mouse is always captured in swing mode
Added bespoke InControl profile that allows both mouse and keyboard input
Figured out why left/right was inverted and fixed it
Fiddled around with the shot force logic to get something more realistic and useful
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 pull request #121 from elneilios/master

Added a new SwingMode script that uses InControl (x-axis rotates, y-axis is used for power)
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
added more control support to the lobby, not quite there yet, still has bugs
Merge branch 'master' of https://github.com/Double-Fine-Game-Club/bad-golf-community-edition into localmulti_02
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