Zacam
897eea19d2
Trunk Sync r7909
2011-10-16 18:03:37 +00:00
Zacam
33e49eb177
De-commit the beta version of the sound code patch (it was accidentally merged anyway) as it currently only belongs in the RC branch.
2011-09-27 05:52:02 +00:00
Zacam
176f307316
Trunk Sync r7799
2011-09-25 04:10:42 +00:00
The_E
b725ff7e21
trunk sync r7657
2011-09-06 21:22:39 +00:00
Zacam
971ae63ea3
Trunk Sync r7521
2011-08-24 05:35:30 +00:00
Zacam
61ae987752
Trunk Sync r7513
2011-08-22 18:22:17 +00:00
Zacam
1452c349ee
Trunk Sync r7502
2011-08-21 04:10:52 +00:00
Zacam
844bd02cbf
Trunk Sync r7496 More Justice
2011-08-20 23:40:54 +00:00
Zacam
4b6bfbc980
Trunk Sync r7496 for GREAT JUSTICE!
2011-08-20 22:25:04 +00:00
Zacam
de70737203
Trunk Sync r7474
2011-08-15 22:16:25 +00:00
Zacam
9df0ac03b6
Trunk Sync r7436
2011-08-09 07:41:01 +00:00
The_E
727b77a8c0
Trunk sync r7366
2011-07-21 12:22:00 +00:00
The_E
d12cc44de2
Trunk sync r7230
2011-07-06 10:51:40 +00:00
Zacam
eca9a5380b
Trunk Sync - r7315
2011-07-04 06:41:27 +00:00
Zacam
efa75b4a22
Trunk Sync - r7289
2011-06-28 22:43:33 +00:00
Zacam
ca9126e8b2
Copy of Trunk 7188
2011-05-18 13:27:35 +00:00
The_E
ad1f1ff97b
Trunk sync r7184
2011-05-17 14:59:47 +00:00
Zacam
866f7f86f8
Trunk Sync - r6910
2010-12-29 18:39:43 +00:00
Zacam
44ba6b9306
Trunk Sync - r6787
2010-11-26 01:52:39 +00:00
Zacam
c60c5c354f
Trunk Sync r6613
2010-10-16 06:46:33 +00:00
The_E
a47fc29330
--Added "-disable_glsl_model" commandline option to switch off shader-based model rendering but leave the option open to use post processing
...
--Changed shader compilation behaviour so that it stops to compile shaders if one of the lighting shaders fails, similar to the behaviour for normal and height map shaders
2010-10-15 21:11:36 +00:00
Zacam
2a6e9c8662
Trunk Sync - r6543.
2010-10-01 04:13:00 +00:00
Zacam
1752bcaee8
Trunk Sync - r6537.
2010-09-30 06:10:56 +00:00
Zacam
88377709f3
This is more like it. These files diff'd as different than Trunk versions, so I over-rode them with Trunk versions so that Antipodes and Trunk can finally have some 1:1 parity.
2010-09-23 02:14:26 +00:00
Zacam
585281635d
Trunk Sync - r4290
2010-09-22 22:39:29 +00:00
Zacam
3bebbbbcd0
Trunk Sync r6269. I hope this works. This is supposed to be a Trunk overlay merge into Antipodes, which should mean that Antipodes is now a copy of Trunk in all respects.
2010-06-29 22:09:34 +00:00
Zacam
cfc49b7680
taylor's changes3.diff
...
(see: http://www.hard-light.net/forums/index.php?topic=68146.msg1353724#msg1353724 )
Some slight changes for alignment and whitespace (space vs tab), otherwise unchanged.
2010-03-21 21:00:26 +00:00
Zacam
83d895fce2
taylors 2nd sound code diff from Reply #99 on 03-01-2010, 00:08:44 on Testing forum. Sans Project file edits, as they have already been done.
2010-03-01 18:28:21 +00:00
Zacam
f969eb52a2
taylors Sound Code. Linux, MSVC 6, 2005 & 2008 compiling.
...
(Mac OS-X Compiling still needs setup for the file changes)
2010-02-23 00:15:32 +00:00
portej05
31e620931e
Trunk Sync
2009-12-14 13:34:13 +00:00
Hery
7ec9f92db1
Post-processing
...
* the main post-processing code
* shaders manager (support for the main and post-processing shaders)
* simple post-processing effects
* bloom
* depth of field (inactive)
* wrappers for OpenGL textures, render buffers and FBO
2009-11-24 15:57:49 +00:00
Hery
b725a5e8bb
Trunk sync (pending PostProcessing patch)
2009-11-24 15:31:34 +00:00
Flaming_Sword
2ccdcbc0fe
Trunk sync
2009-11-19 12:14:17 +00:00
portej05
bc99d2520f
Trunk sync
2009-09-09 04:07:40 +00:00
portej05
aaf3a9bf09
safe_strings changes
2009-07-26 05:15:24 +00:00
portej05
6a8d45c93d
Replace most instances of std::vector with SCP_vector. Memory is now all run through vm_malloc and vm_free.
...
Watch it go up AND down in mission.
2009-07-11 07:07:57 +00:00
portej05
5d6b9be53c
Removal of DirectX from the codebase.
...
VC6 and VC2008 solutions have been updated.
2009-07-09 11:35:43 +00:00
portej05
719825f80d
The big CVS comment removal. This chops approx. 3.5mb off a full checkout.
...
I've tested this through compiling and through hand checking.
Normalises line endings in ALL files to \n.
2009-06-20 08:08:20 +00:00
karajorma
a4e623db23
Portej05's preFAST warning fixes.
2009-05-17 11:50:48 +00:00
Goober5000
6e4021888d
add apostrophes to contractions, lol
2009-04-10 07:49:12 +00:00
chief1983
b290f5281a
Add Ship Choice 3d for TBP flag as well since lack of will crash debug builds, and fixed whitespace on that particular section of code.
2008-12-06 20:23:24 +00:00
chief1983
89a7c1e0f4
Force 3d Shockwave and 3d Weapon Selection command line option when The Babylon Project command line option is on, since their default launcher.ini does not have those and not having these options breaks things in TBP.
2008-12-06 00:44:44 +00:00
chief1983
9c0dbb7acb
Add 3d Shockwave to All Features On and Default Off lists
2008-12-04 20:47:45 +00:00
phreak
f4ba5d0bb2
Apply Spicious' patch from http://www.hard-light.net/forums/index.php/topic,57573.0.html
2008-11-04 05:21:00 +00:00
phreak
16a3ed9f4b
Seperate 3d ship and weapons selection into their own command line options.
2008-09-25 01:15:30 +00:00
phreak
38abe31509
Possible fix for Mantis #1669
2008-09-01 03:09:00 +00:00
WMCoolmon
f51a8cf3c0
New camera code core commit, delta bank code.
2008-08-30 10:42:27 +00:00
taylor
9231692e48
basic commit of a few Xt tree changes
...
- updated OpenGL code (basic shader support, etc.)
- new ships lab code
- scripting RTT fixes
- don't let FRED hog CPU time
2008-07-16 02:49:19 +00:00
WMCoolmon
65bc5b7e5c
Don't quit the game when -output_sexps is used, and move the bulk of the code to a more appropriate location.
2008-05-25 20:13:35 +00:00
taylor
8590f9f6f6
cheap build capability support for the launcher
...
(remains comapatible with older hack, but also allows detection of D3D or not)
2008-03-29 02:07:46 +00:00
Zacam