Zacam
4952b70488
Trunk Sync - r10911
...
There are a lot of changes here that should probably be examined, namely the Debug Console (which had conflicts) and Yarn's "any resolution" mainhalls code (Which also had conflicts) but for the most part this should be fairly clean.
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10912 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-11 19:22:13 +10:00
The_E
88dce29920
Trunk sync r10550
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10551 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-11 19:22:12 +10:00
m_m
088f0c2c4f
Fix a few mouse related issues. This adds the CursorManager class which handles loading cursors and showing/hiding the cursor.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10487 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-10 20:52:22 +10:00
Zacam
18648cbc37
Trunk Sync: r10464 This is sans Trunk Commit 10463 due to osapi changes.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10465 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-06 19:24:14 +10:00
The_E
edeb8768af
Trunk sync r10257
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10259 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-06 19:24:14 +10:00
The_E
09d039fd42
sync to trunk 10223
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10228 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-06 19:24:13 +10:00
The_E
2f46cbe8a3
sync to trunk 10046
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10047 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:16 +10:00
Zacam
684908b239
Trunk Sync: r9544
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@9548 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:14 +10:00
chief1983
e1650f1255
Trunk sync r9508.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@9509 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:14 +10:00
Zacam
3fdae2e3c1
Trunk Sync: r9386
2012-12-02 02:24:53 +00:00
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
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
Zacam
c9a1d1869c
Trunk Sync: r9195-9199
2012-09-13 17:21:17 +00:00
chief1983
ac44f7c59d
Trunk Sync: r9193
2012-09-13 15:14:56 +00:00
The_E
b6bdffd23a
Trunk sync r9082
2012-08-01 16:43:44 +00:00
The_E
2c729eee15
Trunk sync r9057
2012-07-28 21:09:28 +00:00
The_E
68be57e92b
Trunk sync r9031
2012-07-22 11:41:28 +00:00
The_E
8c8302a064
Trunk sync r9006
2012-07-11 17:25:38 +00:00
Zacam
592ad34c4e
Trunk Sync r8845
2012-06-06 13:59:44 +00:00
CommanderDJ
8a430d927a
Trunk sync r8830.
2012-05-28 12:23:16 +00:00
The_E
cc7a648fac
Trunk sync r8766
2012-05-10 10:03:39 +00:00
The_E
4bd9093125
Trunk sync r8753
2012-05-05 14:09:52 +00:00
The_E
05283a3cfa
Trunk sync r8742
2012-05-03 08:26:41 +00:00
The_E
45bd1d1d99
Trunk sync r8679
2012-04-15 11:41:31 +00:00
The_E
3f364d8718
trunk sync r8644
2012-04-01 16:21:23 +00:00
The_E
af9261af10
Trunk sync r8575
2012-03-05 11:53:22 +00:00
The_E
02d8bd64c4
Trunk sync r8545
2012-03-02 16:05:44 +00:00
chief1983
b7716621a8
Trunk sync: r8523-8526
2012-02-23 19:01:29 +00:00
Zacam
a068ae82f2
From Eli2: Corrects some issues with the last changes to the Main Hall code to allow compilation under linux.
2012-02-19 05:23:23 +00:00
Zacam
55996169ff
Trunk Sync: r8456-8459
2012-02-10 19:05:36 +00:00
Zacam
3a62c1bb23
From CommanderDJ:
...
Introduces +Name identifiers for mainhall.tbl entries:
- +Name identifiers only need to be added to the lo-res (640x480) entry of the mainhall. If you really must add a +Name to both res versions, the two resolutions must have the exact same name.
- +Name identifiers are added immediately under the $Main Hall string
Vectorises Main_hall_defines, thus removing the MAIN_HALLS_MAX limit.
Main halls are now loaded based purely on campaign files. Hall indexes are no longer stored in the player struct, and thus this patch changes the pilot file version.
2012-02-09 12:56:10 +00:00
Zacam
feba1296d8
Trunk Sync: r8406-8410
2012-01-30 18:27:55 +00:00
Zacam
4236636365
Trunk Sync: r8287, r8291-8295
2012-01-22 02:09:35 +00:00
Zacam
e75c12920b
Trunk Sync: r8207-8212
2012-01-14 02:35:17 +00:00
Zacam
aacaf1944b
Trunk 8199: Various scripting patches from m!m:
...
--Eyepoint access to the model handle
--getCollisionDistance() to the collision info handle to get the precomputed distance to the hit point
--A Disabled variable for the ship handle
--getTimeUntilExplosion() for the ship handle to get the time until the ship finally explodes
--A change to the documentation of ad.play3DSound() to reflect that the function also takes position parameters
2012-01-13 17:53:56 +00:00
Zacam
6e648f5205
Trunk Sync r8013
2011-11-19 16:32:50 +00:00
The_E
465b3296ae
Trunk sync r7997
2011-11-16 18:16:55 +00:00
Zacam
657182c001
Trunk Sync r7936
2011-11-01 04:16:18 +00:00
Zacam
6c6849405d
Trunk Sync r7891
2011-10-11 09:04:55 +00:00
Zacam
3839228867
Trunk Sync r7871
2011-10-08 05:41:06 +00:00
The_E
f77910e72e
Trunk sync r7842
2011-10-02 07:54:02 +00:00
Zacam
e6a4e6114a
And another Sync Drift check for AP to tidy things up.
2011-09-25 08:27:17 +00:00
The_E
15afdd864a
Trunk sync r7792
2011-09-24 17:44:49 +00:00
Zacam
a4c59963ef
Trunk Sync (r7732, r7736, r7737)
2011-09-17 15:11:02 +00:00
Zacam
98bbc8bee3
These PVS-Studio checks were fixed by IssMneur in Trunk r7676 and don't need flagging.
2011-09-09 13:46:12 +00:00
The_E
f7e75c32b1
A few PVS Studio things (fixes, false alarm marks)
2011-09-09 11:47:55 +00:00
Zacam
17b3c8be17
Trunk Sync r7677
2011-09-08 05:47:44 +00:00
The_E
b725ff7e21
trunk sync r7657
2011-09-06 21:22:39 +00:00
Zacam