Zacam
dc82a0c7f8
Trunk Sync: r9351
...
You may see other sync's, but none have taken place during a live Feed Dump on Desert Bus!
2012-11-17 23:47:11 +00:00
Zacam
ba68ceca3f
Trunk Sync: r9326 and set revision properties to this commit, tagged as 3.6.17 to eliminate any later fiddling or missing it for merge to Trunk.
2012-11-11 00:50:47 +00:00
chief1983
73ab64e3da
Trunk sync r9300 (last was actually synced with 9284, skipped 9296 since we don't have an Xcode4 project in Antipodes yet).
2012-11-02 20:28:04 +00:00
The_E
e2fb98b862
Trunk sync r9275
2012-10-27 14:25:44 +00:00
The_E
ce05f3a88a
Trunk sync r9274
2012-10-21 07:58:11 +00:00
The_E
1d75b96d5c
Trunk sync r9215
2012-09-20 16:34:15 +00:00
Zacam
c9a1d1869c
Trunk Sync: r9195-9199
2012-09-13 17:21:17 +00:00
The_E
05d5744477
TRunk sync r9104
2012-08-12 07:44:05 +00:00
The_E
2c729eee15
Trunk sync r9057
2012-07-28 21:09:28 +00:00
Zacam
5dc5f82e43
Trunk Sync r8897
2012-06-18 00:44:03 +00:00
Zacam
a74531eed3
Trunk Sync: r8452, r8454
2012-02-09 14:48:18 +00:00
Zacam
45d55d5c75
Trunk Sync: r8297-8302
2012-01-22 07:52:20 +00:00
The_E
d02a86a86b
Trunk sync revisions 8258, 8260-8263
2012-01-19 14:45:47 +00:00
The_E
465b3296ae
Trunk sync r7997
2011-11-16 18:16:55 +00:00
Zacam
f64c5ea811
Trunk Sync r7946
2011-11-05 09:36:17 +00:00
Zacam
897eea19d2
Trunk Sync r7909
2011-10-16 18:03:37 +00:00
Zacam
31ccffef1c
Trunk Sync r7853
2011-10-03 11:28:19 +00:00
The_E
3f60c8a228
Trunk sync r7747
2011-09-17 20:32:54 +00:00
Zacam
8a587f1a50
Trunk r7703: Allow customization of the thruster distortion effect in species_defs.tbl and ships.tbl
2011-09-12 04:02:17 +00:00
The_E
d8a728d5f1
Trunk sync r7593
2011-08-30 18:17:09 +00:00
Zacam
61ae987752
Trunk Sync r7513
2011-08-22 18:22:17 +00:00
Zacam
4b6bfbc980
Trunk Sync r7496 for GREAT JUSTICE!
2011-08-20 22:25:04 +00:00
Echelon9
67eb406443
PVS-Studio: Fix V805. Decreased performance. It is inefficient to identify an empty string by using 'strlen(str) > 0' construct
2011-08-14 13:14:35 +00:00
The_E
b5a1b4c263
Trunk sync r7282
2011-07-26 22:16:22 +00:00
Zacam
80ba7361a8
Trunk Sync - r7197
2011-05-19 21:34:28 +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
d5542b9a31
Trunk Sync - r7030
2011-02-26 01:50:36 +00:00
The_E
4cba1ccb03
Trunk sync r6949
2011-01-18 16:26:37 +00:00
Zacam
1e4b61547c
Trunk Sync - r6684
2010-10-25 04:09:33 +00:00
Zacam
9dac4b2bc4
From taylor: go_faster
2010-09-23 02:19:27 +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
Flaming_Sword
2ccdcbc0fe
Trunk sync
2009-11-19 12:14:17 +00:00
portej05
d1a1f39974
Trunk Sync
2009-11-03 08:21:16 +00:00
portej05
aaf3a9bf09
safe_strings changes
2009-07-26 05:15:24 +00:00
Wanderer
014b7e4300
Commit of thruster effects for ship and weapon flame and for weapon glow effects
2009-07-19 16:07:23 +00:00
portej05
29abf1f51c
Python Stripping. Can't promise to have gotten the whole lot though.
2009-07-13 14:11: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
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
15fe7f2ffe
Commit Echelon9's flag to prevent the addition of noise to thrusters.
2009-06-06 10:46:10 +00:00
karajorma
a4e623db23
Portej05's preFAST warning fixes.
2009-05-17 11:50:48 +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
taylor
0c1d218fb4
fix compiling on F9 (per the standard, limits.h isn't implicitly included)
2008-06-19 04:36:26 +00:00
Goober5000
6ab0b17acc
added fixes for #1415 and #1483 , made sure every read_file_text had a corresponding setjmp, and sync'd the parse error messages between HEAD and stable
2007-09-02 02:10:29 +00:00
Goober5000
1505576dfb
fixed a small bug in the lab
...
moved WMC's no damage scaling flag to ai_profiles and made it work correctly
removed my old supercap damage scaling change
moved Turey's truefire flag to ai_profiles
2007-07-15 02:45:51 +00:00
Goober5000
0fafd8dcde
add two features for WCS: specifyable shield/weapon recharge rates, and removal of linked fire penalty
2007-02-27 01:44:48 +00:00
taylor
b5fb6913f8
fix a couple of things that I missed earlier
2007-02-12 02:19:45 +00:00
taylor
640aa62261
get rid of non-standard itoa(), make use of the proper sprintf() instead
2007-02-12 00:23:40 +00:00
Goober5000
057c4876f9
invert the do-collision flag into a don't-do-collision flag, plus fixed a wee lab bug
2007-02-11 06:19:08 +00:00
Zacam