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

205 commits

Author SHA1 Message Date
OTHGMars 0ae675839e Adds event codes for 2 POV hat masks, 2 trackballs and the guide button. 2019-01-10 20:06:54 -05:00
Areloch 644f4071ed Merge pull request #2246 from lukaspj/update-cinterface 
Update CInterface
 2018-12-09 15:24:29 -06:00
Areloch 6cf0c9e360 Merge branch 'development' into EngineAPI-Refactor 2018-12-09 14:48:50 -06:00
Lukas Joergensen 13eb392c98 Add a method to set the 'MainDotCsDir' when no main.cs is available 2018-04-21 09:29:57 +02:00
Lukas Joergensen 2bbc716db6 Eliminate unnecessary uses of ConsoleFunction 2018-04-17 21:41:29 +02:00
Lukas Joergensen e718841467 Eliminate DefineConsoleFunction 2018-04-17 20:54:08 +02:00
Azaezel cbce2ee805 Merge branch 'development' of https://github.com/GarageGames/Torque3D into memberMess 
# Conflicts:
#	Engine/source/console/consoleFunctions.cpp
 2018-03-28 15:42:34 -05:00
Azaezel 50482de41e duplicate var+assignment 2018-03-14 13:15:14 -05:00
Glenn Smith 34b2d91e89 Speaking of badly sized mac things 2018-03-08 00:45:43 -05:00
Glenn Smith d9a723d533 More cats and cpys in files that xcode doesn't see 2018-03-07 01:13:56 -05:00
Glenn Smith dce7f5f6b3 Engine was also using raw strcat/strcpy 2018-03-07 00:49:46 -05:00
Glenn Smith 79c34c68db Use strncpy instead of strcpy because again, buffer overflows 2018-03-06 02:35:33 -05:00
Glenn Smith 7769da9434 Use strncat instead of strcat to prevent some buffer overflows 2018-03-06 00:48:44 -05:00
Areloch 490c05ffd4 Adds the ability to force the path returned by the file dialog to be relative. 2018-01-29 22:16:42 -06:00
Areloch c23c99dbea Merge pull request #2118 from Areloch/MenuAndPopups 
Refactors the Popup menus and GuiMenuBars
 2018-01-27 18:41:00 -06:00
Areloch f657f774ce Updates Native File Dialogs lib to enable browsing and selecting of folders, instead of just files. 2017-12-06 14:09:27 -06:00
Areloch 2ca6af8e48 Refactors the Popup menus and GuiMenuBars to remove unneeded duplication and platform-specific/deprecated code. 2017-11-11 01:21:48 -06:00
Brian Smith b8959e2bbb Fixed a typo where the value of outBytesWritten was being clamped incorrectly. 2017-10-23 17:00:16 -04:00
Areloch afdf86f220 Merge pull request #2070 from Azaezel/OVRoops 
fix for overdark VR scene rendering
 2017-08-24 00:06:35 -05:00
OTHGMars b5cc06cc8b Fixed ovr compiling with srgb and DX9 removed. 2017-08-20 06:06:40 -04:00
Azaezel 0c35874068 fix for overdark VR scene rendering 2017-08-18 15:42:30 -05:00
Azaezel 0b9dd9bb7e forgot one 2017-07-09 15:41:54 -05:00
Azaezel 5fcb90cafd kills off the last vestiges of xenon support 2017-07-09 15:05:56 -05:00
Areloch 124ecb2fe0 Merge pull request #1984 from FooBarbarians/fix-1912 
Reordering initialization methods #1912
 2017-04-26 01:11:51 -05:00
Masquara 15f67015d3 Reordering initialization methods #1912 2017-04-19 14:02:45 -04:00
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