TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-04 20:11:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
8219 commits 5 branches 33 tags 958 MiB
Commit graph

280 commits

Author SHA1 Message Date
Areloch dba8b5b327 Merge branch 'development' into Xenon_Removal 2017-04-18 20:47:43 -05:00
Areloch 5be2497b69 Merge branch 'development' into Fix_Issue_#1951_TCPObject_is_broken_3.10 2017-04-17 20:19:20 -05:00
Chris Millsap f421a50e5a Comment formatting 
Removed incorrect comments to be more inline with windows and linux. Put
comment on line 812 on top of code.
 2017-04-12 18:54:59 -04:00
Chris Millsap c0906e1c41 Possible fix to issue #1951 
(Code formated to be submitted for pull request) -- Indentation was off.
SAME FIX AS BEFORE

When two instances of Torque3D are running on the same network, one as a
hosted server and the other as a client, the client is unable to connect
to the server. The program now can open a socket. This was obviously a
typo. To find the error I just searched for keywords containing socket,
open, open socket, and opensocket till I found the correct file. The
other error was in how the program processed “non fatal” errors. I just
outputed the error to the main console and devised that the socket
should not be closed for a WSAEWOULDBLOCK error 10035 "It is normal for
WSAEWOULDBLOCK to be reported as the result from calling connect on a
nonblocking SOCK_STREAM socket, since some time must elapse for the
connection to be established."

Read about the WouldBlock error:

https://msdn.microsoft.com/en-us/library/windows/desktop/ms740668(v=vs.85).aspx

Use of dbgSetParameters ( port , password ):

http://docs.garagegames.com/tge/official/content/documentation/Reference/Console%20Functions/TorqueScript_Console_Functions_2.html#dbgSetParameters_.28_port_.2C_password_.29
 2017-04-11 14:51:29 -04:00
Areloch 214aae7277 Removed the unneeded PPC And Altivec elements, and removed the LOCBUILD flag 2017-04-09 23:26:35 -05:00
Areloch bf229a9c0b Missed a bit. Readded an accidental removal, and cleaned up an extraneous endif 2017-04-08 21:06:47 -05:00
Areloch ed14b6fced 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 849a1c1eb1 merged numerous changes from upstream 2017-03-03 21:17:07 -05:00
Francisco Montañés García 49130dbd71 Proposed fix for Issue #1951. Checked with IP4. IP6 should work as wel but not checked yet. 2017-02-22 19:27:08 +01: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 332c06ae82 Replaced StringTable->insert("") with StringTable->EmptyString() 2017-01-11 23:21:29 -05:00
Thomas "elfprince13" Dickerson a7cb22b877 something went squiffy in the last set of merges 2017-01-06 18:41:47 -05:00
Thomas "elfprince13" Dickerson 878fbdb609 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 45ae5e71cb 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
Areloch c0a96c908f Adds handling for if the user cancels out of the file dialog, and adds support for proper multi-filters. 2016-05-17 12:46:39 -05:00
Areloch 95ae0b9863 Removes the old component code and moves the IProcessInput interface file into platform/input/ directory. 2016-05-12 23:31:15 -05:00
Azaezel 5958e86e9a corrects native file dialogue return values 2016-05-09 06:43:47 -05:00
Areloch ec6f9c05a6 Integrates the nativeFileDialog library to enable native file dialogs on the major platforms. It is activated with SDL. 2016-04-30 15:48:33 -05:00
Anis A. Hireche 10cb6ab9c4 Merge remote-tracking branch 'refs/remotes/origin/development' into pr/1153 2016-02-26 14:39:38 +01:00
Anis 443cd2d607 Merge pull request #1231 from J0linar/platformNet_PR 
+proper buffer size for udp socket
 2016-02-25 18:38:47 +01:00
Anis 8f4295879d Merge pull request #1413 from Azaezel/LittleLeakLost 
partial reversion for #1333
 2016-02-25 18:29:50 +01:00
Anis 7418fbfbbd fixed memory leak in proper way 2016-02-25 18:26:15 +01:00
Areloch 7a3b40a86d Initial Implementation of the Taml, Asset and Modules systems. 
Only has example and shape assets currently.
 2015-10-13 15:19:36 -05:00
Azaezel 27112c468a reversion for a4c09d1680 
To be honest, can't remember how I was intending to fix that, but this one's causing it to fail to profile twice in a row, so kill it with fire.
 2015-09-17 16:14:49 -05:00
Areloch 31afbedfb6 Merge pull request #1346 from eightyeight/fix-threadpool-tests 2015-08-21 00:07:55 -05:00
Daniel Buckmaster c2e5dc3345 Merge remote-tracking branch 'bpay/clang-cl-build-fixes' into development 
Conflicts:
	Engine/source/T3D/shapeBase.h
 2015-07-17 16:55:12 +10:00
Azaezel bf1449e3a7 fills in profiler timer fallback as per remmed out lines in other samples. see https://github.com/GarageGames/Torque3D/issues/1349 for report, and https://gist.github.com/Azaezel/2aafb88cf0d642418051 for result 2015-07-10 19:33:42 -05:00
Daniel Buckmaster e75a9fa081 Don't assert; sometimes there aren't any jobs to wait for! 2015-07-05 14:11:24 +10:00
Daniel Buckmaster b491d7bbc0 Fix ThreadPool tests to account for asynchronicity. 2015-07-05 13:07:37 +10:00
Daniel Buckmaster 0995520d6f Add a method to wait for all pending items in a ThreadPool. 2015-07-05 12:59:52 +10:00
Daniel Buckmaster 7b2cb8d04f Add a method to see whether a WorkItem has executed yet. 2015-07-05 12:40:50 +10:00
Raul Ferriz 5ef130d581 Fixed some random Worder warnings 2015-07-03 15:52:38 +02:00
Raul Ferriz a5d34271f2 Fixed some minor compiler warnings on Linux 2015-06-28 22:29:23 +02:00
Daniel Buckmaster d89c3b7c6f Merge pull request #1333 from Azaezel/PluggingLeaks 
Plugging Memory Leaks
 2015-06-28 14:41:13 +10:00
Daniel Buckmaster 39f0e269d6 Merge pull request #1328 from GarageGames/release-3.7 
Release 3.7
 2015-06-24 19:00:57 +10:00
Azaezel a4c09d1680 leak prevention according to: https://vld.codeplex.com/ apparently we weren't freeing the entirety of the ProfilerData linked list when resetting the Profiler, and that was leading to a pinhole leak per profiled block 2015-06-01 23:45:49 -05:00
Daniel Buckmaster ae4ac53592 Remove comments. 2015-05-09 15:02:41 +10:00
Levitator1 f3199b04e4 Fix for no sound output under Linux 2015-05-09 14:53:21 +10:00
James Urquhart 2aca5f6ee7 Remove unused stereo target codepath in Oculus code 2015-05-08 11:55:54 +01:00
James Urquhart 3a457749ec Oculus VR DK2 Support 
- Updated to work with 0.5.x SDK
- Uses Oculus Rendering rather than PostFX
- Stereo rendering refactored so more rendering info is grabbed from the DisplayDevice
- Implements an Offscreen Canvas for in-game gui with oculus
- Message dialogs and metrics display can now go to the OffScreen Canvas (if oculus demo is setup correctly)
 2015-05-06 23:09:51 +01:00
Ben Payne 29934cdc27 Fix comment 2015-03-08 20:12:14 -04:00
Ben Payne 27c9e79906 Inline asm is not yet supported by clang 2015-03-05 14:57:58 -05:00
Ben Payne 4386ababbe Character type fixes for building with clang-cl 2015-03-04 19:25:10 -05:00
Ben Payne 27e6649413 Fix ill-formed #else 2015-03-04 19:24:55 -05:00
Daniel Buckmaster 6c92ab065e Merge remote-tracking branch 'jamesu/console_stack_fix2' into development 
Conflicts:
	Engine/source/console/console.cpp
 2015-03-01 20:33:29 +11:00
Daniel Buckmaster 497a15cfd0 Merge pull request #1214 from bpay/cppcheck-cleaning 
Fix some issues flagged by cppcheck
 2015-03-01 18:27:40 +11:00
Nathan Bowhay bc31d79da1 Changed type to NetSocket 
Changed some S32 types to use the typedef NetSocket since they are a
socket.
 2015-03-01 17:20:48 +11:00
Miodrag Sejic cd686a23b3 +proper buffer size for udp socket 
SkypeLog: 28.02.2015
[17:18:32] Dušan Jocic: when creating user datagram protocol or UDP, old
implementation was limiting lan utalization to 1% of our modern 1000Mbps
hardwar
[17:19:15] Dušan Jocic: that add proper buffer size for udp socket
[17:19:43] Dušan Jocic: and lift off limitation what was present there
for 10/100 mbps lan
 2015-02-28 21:28:10 +01:00
Daniel Buckmaster bddc27c693 Add a temporary local copy of stdint.h for VS2008. 2015-02-22 11:25:19 +11:00
Ben Payne 3205fea936 Add a comment about an incorrect condition that I'm not sure how to fix 2015-02-20 18:42:34 -05:00
Ben Payne 591253d5b5 Fix missing va_end's 2015-02-20 18:42:29 -05:00
Daniel Buckmaster 47626684ce Merge pull request #1159 from GarageGames/navigation-default-on 
Include navigation and testing modules by default
 2015-02-14 19:28:56 +11:00
Daniel Buckmaster ec06dd78f9 Fix unit tests. 2015-02-14 14:50:32 +11:00
Daniel Buckmaster d10afa2ba2 VS2008 doesn't have stdint.h 2015-02-10 15:22:35 +11:00
James Urquhart f44a3f27d6 Fix stack balancing problems by refactoring execution calls 
- Con::executef now uses a template
- All public execution functions now restore the console stack upon return
- Fixed bad parameters on some callbacks
- Reverts get*Arg behavior
 2015-02-08 00:08:18 +00:00
LuisAntonRebollo 6d1ef41c69 Changed some size_t to uintptr_t. 2015-02-07 16:41:54 +01:00
Ben Payne 222be2bb72 Remove dead function 2015-02-02 19:11:20 -05:00
Ben Payne c19a70814c Tidy up and fix the various Assert macros 
Rephrase the macros so that they can be used in expressions, and
properly require semicolons. And add the semicolons where missing.
 2015-02-02 18:37:48 -05:00
Ben Payne e03c3bb34f Fix TORQUE_UNUSED for recent versions of MSVC 
Since there's now apparently no way to suppress the warning for a
particular variable without adding at least some extra size to the
executable, just turn the warning off in release builds. We leave it on in
debug since it can sometimes help catch bugs, and we don't care about a
little extra code in that configuration.
 2015-02-02 18:33:49 -05:00
Daniel Buckmaster 014b566014 Merge remote-tracking branch 'gg/development-3.6' into development 
Conflicts:
	Engine/source/T3D/gameFunctions.cpp
 2015-01-29 21:17:38 +11:00
LuisAntonRebollo 4e9034854d Linux implementation. Include changes for gcc x64. 2015-01-24 22:08:26 +01:00
LuisAntonRebollo 3336bffad2 Changes for Linux. 2015-01-19 01:44:36 +01:00
LuisAntonRebollo 21d58bb191 Modified files for SDL2. 2015-01-19 00:33:23 +01:00
Daniel Buckmaster ae284a89ec Merge branch 'development' into defineconsolemethod 
Conflicts:
	Engine/source/materials/materialDefinition.cpp
 2014-12-26 13:22:16 +11:00
Daniel Buckmaster 9396ae7176 Merge remote-tracking branch 'Winterleaf/Development-Console' into defineconsolemethod 
Conflicts:
	Engine/source/T3D/missionMarker.cpp
 2014-12-21 21:23:55 +11:00
Daniel Buckmaster 183fe7dbeb Merge pull request #996 from Winterleaf/Add-new-cpus-AMD-Types 
Added support for AMD Chips
 2014-12-21 19:04:26 +11:00
Vincent Gee 8e0ae15f74 Tabs... 2014-11-30 21:49:41 -05:00
Vincent Gee 5dfc293191 type fix 2014-11-30 21:11:32 -05:00
Vincent Gee ff7f48be6f Added support for AMD Chips 2014-11-30 20:43:04 -05:00
Vincent Gee 48ba106667 Just cleaned up some code 2014-11-30 20:28:40 -05:00
LuisAntonRebollo 98e3651db5 Merge pull request #940 from BeamNG/add_opengl_support 
Add/Activate OpenGL render.
 2014-11-30 02:48:13 +01:00
LuisAntonRebollo dd08fd2e7d Add OpenGL support. 2014-11-08 20:21:50 +01:00
Vincent Gee ad4b06f2bc Cleaned up Enum to set init value to 0 2014-11-05 21:14:38 +11:00
Vincent Gee cb161ad5ff Cleaning up and streamlining Types.h, 2014-11-04 07:50:24 -05:00
Vincent Gee acb192e2a5 Replaced a ton of ConsoleMethods with the DefineConsoleMethod Macro. 2014-11-03 22:42:51 -05:00
Daniel Buckmaster 2f416290ab Merge pull request #788 from eightyeight/return-status-code 
Allow return status to be specified using quitWithStatus
 2014-10-24 00:31:05 +11:00
LuisAntonRebollo 535f56af6e Merge pull request #801 from eightyeight/gtest-tests 
Googletest tests
 2014-10-02 01:31:13 +02:00
Daniel Buckmaster bedde94a9f Removed all local type definitions for GCC. 2014-09-29 14:31:07 +10:00
Daniel Buckmaster fae1bad96c All unit tests that run now pass. 2014-09-29 11:38:44 +10:00
Daniel Buckmaster b173e5571c Moved async packet queue test and commented it out. 2014-09-29 11:38:42 +10:00
Daniel Buckmaster 9f47032522 Allow return status to be specified using quitWithStatus. 2014-09-24 09:24:29 +10:00
Daniel Buckmaster 6fdebd16f6 Merge remote-tracking branch 'jamesu/simplify_compiler_ast' into x64 
Conflicts:
	Engine/source/console/compiler.cpp
	Engine/source/console/compiler.h
 2014-09-15 11:50:32 +10:00
LuisAntonRebollo fcf7bee64a Fix x64 problems for WIN64. 2014-09-14 21:42:51 +02:00
LuisAntonRebollo 8ed0f508ca Minimal changes to compile T3D on WIN64. 2014-09-14 21:39:56 +02:00
Daniel Buckmaster 7df5684af1 Removed old tests. 2014-09-01 07:58:19 +10:00
Daniel Buckmaster b34afee979 Test Thread inheritance as well as callbacks. 2014-08-31 22:21:42 +10:00
Daniel Buckmaster 93325df0c4 Added thread safe container tests. 2014-08-31 22:21:21 +10:00
Daniel Buckmaster 5a430af051 Merge remote-tracking branch 'gg/development' into gtest-tests 2014-08-30 17:51:41 +10:00
Daniel Buckmaster 4c769627c3 Ported thread static stress test. 2014-08-20 11:55:21 +10:00
Daniel Buckmaster fb408f3f01 Ported thread statics test. 2014-08-20 11:55:06 +10:00
Daniel Buckmaster eeac48b4ea Ported platform timer test. 2014-08-16 13:48:01 +10:00
Daniel Buckmaster 96011623ef Ported thread pool and refcount tests. Failures, not sure why yet. 2014-08-09 11:32:46 +10:00
Daniel Buckmaster e6d47c58f7 Avoid infinite loop waiting for DNS resolution. 2014-08-08 14:31:42 +10:00
Daniel Buckmaster 77381ac494 Ported networking test. 2014-08-08 13:17:14 +10:00
Daniel Buckmaster 2f95583df8 Ported thread tests without the stress tests. 2014-08-02 16:43:29 +10:00
Daniel Buckmaster b34b1a70fa Port file test. 2014-07-29 09:16:11 +10:00
Daniel Buckmaster 262a08b854 Remove interactive alert tests. 2014-07-18 21:59:09 +02:00
Daniel Buckmaster b43b6d2242 Ported basic platform types test. 2014-07-17 10:32:14 +02:00
Areloch c2da67d473 Fixes the splash screen so that it displays until the game has actually done initial setup and can display GUI elements. This prevents the ugly blank window just sitting there while the GUI loads. 2014-07-15 17:44:19 -05:00
Daniel Buckmaster 56d434132e Added optimistic profiler test. 2014-07-15 12:44:10 +02:00
Daniel Buckmaster b7c720d01d Reverted #540 2014-07-14 15:13:30 +02:00
Daniel Buckmaster feec36731e Merge pull request #594 from LuisAntonRebollo/unit-tests-without-crash 
Increased stability Torque3D: unit-tests running without a crash.
 2014-06-16 10:57:04 +10:00
LuisAntonRebollo 6450294855 Fixes for dedicated build on linux. 
Thx @Bloodknigh for Signal fix.
 2014-05-30 12:35:39 +02:00
LuisAntonRebollo ac96ac7568 Fix AssertFatal/TORQUE_UNUSED are not optimized on release build causing performance problems. 
http://cnicholson.net/2009/02/stupid-c-tricks-adventures-in-assert/
> "Both gcc and MSVC are smart enough to optimize out the evaluation of x, but only if they can determine if  there are no side effects associated with the evaluation.  Unfortunately, this can only be done if the body of x is known entirely to the compiler.  If x is a function call to another module MSVC can still make it go away with Link-Time Code Generation (via cross-module inlining), but poor gcc is dead in the water and emits the call.  Either way, we’re relying on compiler and linker optimizations to make this code go away."
 2014-05-30 00:16:43 +02:00
LuisAntonRebollo 18ba0646c0 Increased stability Torqu3D: unit-tests running without a crash. See the console.log after ran unitTest_runTests( "", true ). @signmotion 2014-05-25 16:50:19 +02:00
Daniel Buckmaster 87d9e245b7 Merge remote-tracking branch 'smally/platform_type_consistency' into platform-type-consistency 
Conflicts:
	Engine/source/platform/platformCPUCount.cpp
 2014-04-04 13:43:25 +11:00
LuisAntonRebollo 54fa2bcdab Merge pull request #540 from signmotion/default-keyboard-layout 
Added a default keyboard layout for launching the game.
 2014-03-29 14:20:30 +01:00