Commit graph

173 commits

Author SHA1 Message Date
Areloch 26fd24fbab Removes bits of code and includes that are based on old 360, xbox and PS3 flags that are no longer needed. 2017-04-08 20:30:57 -05:00
Thomas "elfprince13" Dickerson d3956cb532 merged numerous changes from upstream 2017-03-03 21:17:07 -05:00
Areloch 73752ff061 Hotfix to re-add the prior static function fix for these functions that was accidentally removed. 2017-01-31 19:16:34 -06:00
Areloch 8f420893eb Merge branch 'development' into osxDedeprecation 2017-01-31 09:44:52 -06:00
Areloch a8f2fc567b Fixes up the handling of accelerator keybinds for SDL - specifically compound ones with several modifier keys, ie ctrl-alt-shift-up. 2017-01-29 03:22:25 -06:00
Thomas "elfprince13" Dickerson 27e2871b01 Replaced StringTable->insert("") with StringTable->EmptyString() 2017-01-11 23:36:04 -05:00
Thomas "elfprince13" Dickerson bcc5459818 whitespace 2017-01-11 23:34:46 -05:00
Thomas "elfprince13" Dickerson ec5efe5411 Replaced StringTable->insert("") with StringTable->EmptyString() 2017-01-11 23:21:29 -05:00
Thomas "elfprince13" Dickerson e042c25bef something went squiffy in the last set of merges 2017-01-06 18:41:47 -05:00
Thomas "elfprince13" Dickerson 326f0f386e merged into master 2017-01-06 18:27:56 -05:00
Thomas "elfprince13" Dickerson 9773f18a88 tabs to spaces 2017-01-06 18:06:36 -05:00
Thomas "elfprince13" Dickerson bb38a40bcb fixed lots of tabs and space 2017-01-06 18:04:28 -05:00
Thomas "elfprince13" Dickerson 0adab54678 one more go-round 2017-01-06 17:54:19 -05:00
Thomas "elfprince13" Dickerson e554fc7f93 undo spurious changes used to trigger dirty for tabs and spaces 2017-01-06 17:45:38 -05:00
Thomas "elfprince13" Dickerson 9c69cd32e8 Attempting to fix tabs and space (again) 2017-01-06 17:45:09 -05:00
Thomas "elfprince13" Dickerson b31e0ad2da Attempting to fix tabs and space 2017-01-06 17:36:29 -05:00
Thomas "elfprince13" Dickerson 710a2a9b7b Revert "Net tests were failing to compile because 'static members' weren't actually being declared as members..."
This reverts commit 32f726dcc6.
2017-01-05 17:23:48 -05:00
Thomas "elfprince13" Dickerson 0e30426def Eliminated a handful of deprecation warnings, as well as inconsistent handling of FS operations in OS X 2017-01-05 17:19:19 -05:00
Thomas "elfprince13" Dickerson 32f726dcc6 Net tests were failing to compile because 'static members' weren't actually being declared as members... 2017-01-05 13:35:07 -05:00
Azaezel 0831472ca4 looks like getsockname needs a slightly different signature on the crossplatform end 2016-12-26 14:19:53 -06:00
James Urquhart 46edd46634 Use correct address in multicast print 2016-12-20 23:52:31 +00:00
James Urquhart 41085f9298 Fix setting the default client port. Also fix fallback multicast address define. 2016-12-17 23:08:43 +00:00
James Urquhart fba471d27e Fix console spam when OS socket send buffer is full 2016-11-27 18:02:19 +00:00
James Urquhart 1f69a708fb Fix ret assignment 2016-11-27 17:58:34 +00:00
James Urquhart 2ed4978cb9 Fix connecting on OSX 2016-10-28 19:34:01 +01:00
James Urquhart 5b1bb6547a Fix lookup issue on TCPObject. Also sync with working code. 2016-10-28 18:31:47 +01:00
James Urquhart 458bc27ea4 Add missing include 2016-10-28 11:33:43 +01:00
James Urquhart 704577e051 Preliminary IPV6 Support 2016-10-25 19:09:02 +01:00
Areloch 121d65215e Tweaks any enums that use uint_max values so that they have hard types to avoid any compiler kerfluffles with C++11 value narrowing, specifically pertaining to clang. 2016-10-17 01:00:12 -05:00
Azaezel a8f9249f77 clang catch: pragma note. (no longer needed) 2016-10-14 17:04:17 -05:00
RexTimmy dd64004eaf MacOS platform support. 2016-09-28 11:09:48 +10:00
James Urquhart 212ac36cc1 Tidy up indentation in openvr changes 2016-09-11 22:51:00 +01:00
James Urquhart e6159a590a Add basic support for showing openvr controllers and tracked objects 2016-09-11 22:42:42 +01:00
James Urquhart 660bd8d347 Allow gamepad to rotate openvr view. Also Fix issue with movemanager openvr rotation not being set correctly. 2016-09-11 22:42:42 +01:00
James Urquhart e6c89b1f24 Add basic rotation offset code 2016-09-11 22:42:42 +01:00
James Urquhart 2da474c484 Always use the latest eye pose data from the HMD 2016-09-11 22:42:42 +01:00
James Urquhart 734688ff7e Implement basic keyboard & mouse support for openvr overlays 2016-09-11 22:42:42 +01:00
James Urquhart f91aa639d6 Remove projection offset, add the hmd head matrix. Also tidy up a few things. 2016-09-11 22:42:42 +01:00
James Urquhart da6bcbeb2b Improvements to openvr code
- Overlays are implemented (sans input for the moment)
- Fixed a problem where the movemanager was using the wrong values for hmd rotation & position
2016-09-11 22:42:42 +01:00
James Urquhart 9f49a7844e Use correct multiplication order for eye transform. Also fix displayDevice not set bug. 2016-09-11 22:42:42 +01:00
James Urquhart 9e5eda9a08 More progress
- Fixed normal stereo rendering
- Beginnings of vr overlay code
2016-09-11 22:42:42 +01:00
James Urquhart b15be28f38 Temp add the convertRotation handler so we dont need the oculus files 2016-09-11 22:42:42 +01:00
James Urquhart b2faecc82d Fix openvr typos 2016-09-11 22:42:42 +01:00
James Urquhart 126828131d Improve openvr, also add a module for it. 2016-09-11 22:42:42 +01:00
James Urquhart ba91478fad Baseline working openvr code 2016-09-11 22:42:42 +01:00
James Urquhart e239d106f5 Use correct bgra format 2016-09-11 22:42:42 +01:00
James Urquhart 64b751a7c8 Basic port of code 2016-09-11 22:42:42 +01:00
Areloch 7372c89dc7 Corrections suggested by timmy for both consistency, and making sure to catch all potential types. 2016-07-08 22:48:24 -05:00
Areloch 911b2735d7 Flipa the i386 preprocessor flag to use __i386__, which is appraently more standard. 2016-07-08 21:33:30 -05:00
Areloch 9d47830a8b Merge branch 'development' of https://github.com/GarageGames/Torque3D into development 2016-05-24 20:09:53 -05:00