40 Commits

Author SHA1 Message Date
Timothee "TTimo" Besset
aaa855815a Merge pull request #40 from id-Software/master
The DOOM 3 source as it was released under the GPL license on Novembe…
2016-03-21 10:33:55 -05:00
Timothee TTimo Besset
8047099afd Please find an active fork for this project if you want to contribute. This top-level repository is provided for reference only. 2012-04-07 21:29:18 -05:00
Travis Bradshaw
a9c49da5af The DOOM 3 source as it was released under the GPL license on November 22, 2011.
The original release of the DOOM 3 source code on GitHub was done by Timothee
'TTimo' Besset on November 22, 2011.  To properly maintain the metadata between
the various forks on GitHub since then and the creation of the id-Software GitHub
account on January 31, 2011, I've forked TTimo's repository and then forced a
hard reset to the first commit.

This leaves the current "official" release from id Software just as it was on
November 22, 2011, but allows interested developers to track down interesting
work being done in TTimo's branch and all over GitHub.

Cheers,

Travis Bradshaw
2012-01-31 21:01:06 -06:00
unknown
e9c4795109 Merge branch 'master' of git@github.com:TTimo/doom3.gpl.git 2011-12-29 15:12:27 -06:00
unknown
d422788143 Looked into getting the source compiled with MSVC 2010 express and it doesn't look like that's possible.
Some version of the MFC headers can be obtained from the platform SDK, but the 32 bit MFC libraries are not included, so even if you get it compiling it won't link.

References:
http://msdn.microsoft.com/en-us/library/ms235516.aspx
http://social.msdn.microsoft.com/Forums/en-US/windowssdk/thread/0df55a14-71a9-45ae-9d10-a37a4d17f908
http://www.microsoft.com/download/en/details.aspx?id=6510
2011-12-29 15:11:10 -06:00
Timothee "TTimo" Besset
257e121a39 Merge pull request #27 from speps/master
Fix for "Could not load default.cfg" during build
2011-12-29 12:54:15 -08:00
unknown
f73e20da39 not sure how that didn't come up already 2011-12-29 14:29:49 -06:00
Timothee "TTimo" Besset
279d6c6f8d Merge pull request #31 from xoddark/Werror_conversion-null
Fix conversion-null warning
2011-12-29 09:43:34 -08:00
Timothee "TTimo" Besset
d5f751654d Merge pull request #32 from xoddark/Werror_parentheses
Fix parentheses warning
2011-12-29 09:42:30 -08:00
XoD
015f1a8f3e Add parentesis aroud '&' to avoid script warning
Gcc warn suggest parentheses arout arithmetic in operand of '|'.

Signed-off-by: XoD <xoddark@gmail.com>
2011-12-28 19:14:24 +01:00
XoD
a725daf17e Fix a test in idAI::Event_CanBecomeSolid
It's probably a small bug, idBarrel	and idExplodingBarrel can by tested
event if spawnClearMoveables is false.

Signed-off-by: XoD <xoddark@gmail.com>
2011-12-28 19:14:24 +01:00
XoD
6101cec5be Fix a test in FX_DoubleVision.
It's probably a small bug, powerupEndTime[ INVULNERABILITY ] can be
tested in multiplayer game.

Signed-off-by: XoD <xoddark@gmail.com>
2011-12-28 19:14:23 +01:00
XoD
a95464d419 Fix return FindKeyIndex
replace 'return NULL' to 'return 0', FindKeyIndex should return a int.

Signed-off-by: XoD <xoddark@gmail.com>
2011-12-28 18:56:42 +01:00
XoD
0b48f6f24a Fix A PostEventMsg call with a parameter NULL.
idEventArg don't have constructor with a pointer, a int should
avoid warning.

Signed-off-by: XoD <xoddark@gmail.com>
2011-12-28 18:56:42 +01:00
XoD
b8aaa60311 Fix A PostEventMsg call with a parameter NULL.
idEventArg don't have constructor with a pointer, a int should
avoid warning.

Signed-off-by: XoD <xoddark@gmail.com>
2011-12-28 18:56:42 +01:00
XoD
3946e7bdd4 Fix A PostEventMsg call with a parameter NULL.
idEventArg don't have constructor with a pointer, a int should
avoid warning.

Signed-off-by: XoD <xoddark@gmail.com>
2011-12-28 18:56:42 +01:00
XoD
7bf3774664 Fix A PostEventMsg call with a parameter NULL.
idEventArg don't have constructor with a pointer, a int should avoid
warning.

Signed-off-by: XoD <xoddark@gmail.com>
2011-12-28 18:56:42 +01:00
XoD
6ce9c717c3 Fix NULL affeted to a not pointer variable
Replaced by a 0.

Signed-off-by: XoD <xoddark@gmail.com>
2011-12-28 18:56:42 +01:00
Timothee "TTimo" Besset
232432d352 Merge pull request #30 from xoddark/Werror_pointer-arith
Fix pointer-arith warning
2011-12-26 06:15:39 -08:00
Timothee "TTimo" Besset
2fb684dbde Merge pull request #28 from xoddark/Werror_write-strings
Fix write-strings warning
2011-12-25 08:47:27 -08:00
XoD
72fd4c6fc2 Remove comparison from a int to NULL
In Event_HasAnim the result of GetAnim is compared to a pointer, GetAnim
return a int.

Fix a Warning: pointer-arith

Signed-off-by: XoD <xoddark@gmail.com>
2011-12-21 23:56:55 +01:00
XoD
61c9f6211b Replace NULL by '\0' in some char comparison
fix some Warning: pointer-arith in Player.cpp

Signed-off-by: XoD <xoddark@gmail.com>
2011-12-21 23:56:55 +01:00
XoD
a06e7e33e2 Fix constant string type in buildin struct
Signed-off-by: XoD <xoddark@gmail.com>
2011-12-21 21:11:00 +01:00
XoD
47c7a6b9e0 Fix constant string type in PrintClocks
Signed-off-by: XoD <xoddark@gmail.com>
2011-12-21 21:01:32 +01:00
XoD
0cd4990575 Fix constant string type in punctuation_s
Signed-off-by: XoD <xoddark@gmail.com>
2011-12-21 20:57:15 +01:00
XoD
f061e0f29d Fix some constant string type in Script_Compiler
Signed-off-by: XoD <xoddark@gmail.com>
2011-12-21 20:55:35 +01:00
XoD
dfa3aca9fe Fix char* local var
Set constante some char* local variable.

Signed-off-by: XoD <xoddark@gmail.com>
2011-12-19 22:41:03 +01:00
XoD
ea5445e22d Fix static string array type.
Set the static array flagDefs constant.

Signed-off-by: XoD <xoddark@gmail.com>
2011-12-19 22:03:37 +01:00
XoD
1ec811c3cf Fix constant string parameter.
The methode LoadScript of idItemTeam is now const compliant.

Signed-off-by: XoD <xoddark@gmail.com>
2011-12-19 22:01:41 +01:00
XoD
11eddc9a97 Fix static string array type.
Set the static array fastEntityList constant.

Signed-off-by: XoD <xoddark@gmail.com>
2011-12-19 09:44:24 +01:00
XoD
ee1ad737ce Fix constant string parameter.
The methode Warning of ScriptInterpreter is now const compliant.

Signed-off-by: XoD <xoddark@gmail.com>
2011-12-19 09:40:17 +01:00
XoD
a81ddd228d Fix constant string parameter.
The methode Error of ScriptInterpreter is now const compliant.

Signed-off-by: XoD <xoddark@gmail.com>
2011-12-19 09:36:44 +01:00
Remi Gillig
6663c5c9bc Small fix for TypeInfo if the checkout folder contains "Doom" in it (very likely) 2011-12-18 01:52:35 +01:00
Timothee 'TTimo' Besset
7db8be7917 pulling in some simple code fixes suggested towards XCode 4.2 support 2011-12-10 18:27:30 -06:00
Timothee TTimo Besset
f1f80640fb Linux/scons: throw exception when curl configure or make fails 2011-12-04 11:53:02 -06:00
Daniel Gibson
847dc3b752 remove import platform from SConscript.curl 2011-11-24 22:54:26 +01:00
Daniel Gibson
3bb47adf16 Just use -lz instead of providing path to libz.a
This is cleaner and more portable.
2011-11-24 21:49:54 +01:00
Daniel Gibson
87d583c3ba Fix creating 32bit binaries on Linux/amd64 2011-11-23 21:17:49 +01:00
Timothee 'TTimo' Besset
15597777fc towards XCode 4 support - need those converted 2011-11-22 17:32:53 -06:00
Timothee 'TTimo' Besset
fb1609f554 hello world 2011-11-22 15:28:15 -06:00