Mike Lilligreen d75d644b54 Fixed some merge conflicts between development and linux branches %!s(int64=12) %!d(string=hai) anos
..
core 67d51acf7a Get the existing Torque2D codebase to compile as easily as is possible on Linux in a 32-bit environment. %!s(int64=12) %!d(string=hai) anos
AmbientForceController.cc 7ed1f79dd3 - Reorganized controllers into a picking/grouped hierarchy. %!s(int64=13) %!d(string=hai) anos
AmbientForceController.h 7ed1f79dd3 - Reorganized controllers into a picking/grouped hierarchy. %!s(int64=13) %!d(string=hai) anos
AmbientForceController_ScriptBinding.h 21b86e342d Revert "Hand merging rnd branch, which is just Leap Motion support and input improvements. This will temporarily break the other platforms, which I will fix immediately." %!s(int64=12) %!d(string=hai) anos
BuoyancyController.cc ba818ce8e5 Fixed some compiler warnings in Xcode %!s(int64=12) %!d(string=hai) anos
BuoyancyController.h 67d51acf7a Get the existing Torque2D codebase to compile as easily as is possible on Linux in a 32-bit environment. %!s(int64=12) %!d(string=hai) anos
BuoyancyController_ScriptBinding.h 21b86e342d Revert "Hand merging rnd branch, which is just Leap Motion support and input improvements. This will temporarily break the other platforms, which I will fix immediately." %!s(int64=12) %!d(string=hai) anos
PointForceController.cc 83ad121c78 - Added Scene "pickCircle" to WorldQuery. %!s(int64=13) %!d(string=hai) anos
PointForceController.h 67d51acf7a Get the existing Torque2D codebase to compile as easily as is possible on Linux in a 32-bit environment. %!s(int64=12) %!d(string=hai) anos
PointForceController_ScriptBinding.h 21b86e342d Revert "Hand merging rnd branch, which is just Leap Motion support and input improvements. This will temporarily break the other platforms, which I will fix immediately." %!s(int64=12) %!d(string=hai) anos