Commit graph

89 commits

Author SHA1 Message Date
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
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
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