adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,014 Commits 1 Branch 0 Tags
master
Commit Graph

789 Commits

Author SHA1 Message Date
avolkov ad86e93d9c updated 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1239 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-09-18 10:10:36 +00:00
mcmartin c967decff0 Unified the recursive mutex implementations in MixSDL and DCQ code 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1233 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-09-14 02:23:08 +00:00
mcmartin e9c78782e7 Introduction and first deployment of CrossThreadMutex 
CrossThreadMutex has the semantics for locking that we actually want, as
opposed to Semaphores, which are "close enough" but fail dramatically on
double-unlocks.  The clock and graphics locks have been shifted over to
CTMs, but a few still remain (and will be replaced later).


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1232 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-09-13 17:54:20 +00:00
gewlitys a8ed3da9d4 Load/save icons don't flash anymore when in savegame menu (part of bug 
#291), from Paxtez


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1231 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-09-13 16:21:12 +00:00
gewlitys 9a3b53d291 Savegame slot now defaults to the last one used during one execution of 
uqm (bug #477), from chmmravatar


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1230 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-09-13 16:06:57 +00:00
gewlitys b8f4f7dfe9 Fixed one-pixel glitch in shipyard when scrapping (bug #461), from 
Paxtez


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1229 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-09-13 15:51:03 +00:00
gewlitys fc5f75dbb9 Adjusted subtitle timings when there are no oggs (part of bug #362), 
from chmmravatar


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1228 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-09-13 15:41:14 +00:00
gewlitys 50a80d6f63 Fixed crash in conversation summary and ffw/frew problem when selling 
data to Melnorme (bug #476), from chmmravatar


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1227 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-09-13 15:08:51 +00:00
mcmartin ace6ecaa5b Flush input after selecting "Navigate" 
This fixes some menu/thrust confusion that broke autopilot (bug #475)


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1221 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-09-10 11:09:37 +00:00
avolkov 5aea089a29 updated due to bugs 319, 365 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1218 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-09-08 22:33:14 +00:00
avolkov f3493431fb updated 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1214 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-09-08 22:06:29 +00:00
mcmartin 536b0aa1e6 Removed the obsolete "register" annotations (#460) -Michael 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1209 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-09-08 00:06:14 +00:00
meep-eep ae970ff792 Entries for recent commits. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1200 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-09-05 04:35:56 +00:00
mcmartin 0e8e94bcd1 RUs properly cleared in savegame display (#463, Paxtez, chmmravatar) 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1194 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-09-04 21:32:06 +00:00
mcmartin b27b707f87 Support for 50 savegames per user, from Paxtez 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1168 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-09-01 16:43:10 +00:00
mcmartin d8f537cd1b Fixed a problem where bad actions (MenuUp instead of Menu-Up) crashed 
during initKeyConfig.  The action-listener table needs to be
null-terminated.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1166 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-09-01 01:21:45 +00:00
meep-eep 37ace65799 added '--addon <addon>' 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1165 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-08-31 22:44:03 +00:00
meep-eep 6e35282ec0 Proper credits for bugfix (Paxtez, not chmmravatar) 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1163 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-08-31 22:02:03 +00:00
gewlitys 974b70fe48 keys.cfg from incompatible control scheme version is now renamed 
automatically to keys.old


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1162 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-08-31 21:33:48 +00:00
meep-eep 96abf389ab Warranty message in console on startup. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1159 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-08-31 14:51:25 +00:00
mcmartin db01c3c841 Fuel keys normalized to match crew and menu keys (#452), from Paxtez 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1158 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-08-31 07:03:32 +00:00
mcmartin 68eee4a5b8 Syreen don't rejoice until Mycons are defeated (#451), from Nic 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1156 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-08-31 03:11:04 +00:00
meep-eep 11081809fd Fixed bug 283 (Blazer-form Guardian being drained by DOGI). 
From chmmravatar.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1155 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-08-31 01:59:21 +00:00
gewlitys 7f6d392126 'CREW' and 'BATT' instead of icons in combat screen when using PC menus 
(bug #308); from Paxtez


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1154 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-08-30 16:18:35 +00:00
avolkov 199a98548a Updated due to #413 fix 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1151 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-08-29 23:12:04 +00:00
avolkov a1e9ff0dac forgot to credit Nic 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1149 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-08-29 20:41:11 +00:00
avolkov 2f972debd3 updated 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1148 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-08-29 20:40:02 +00:00
gewlitys 50c85c7be3 Reverted patch for #413 because of previously unnoticed bug 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1144 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-08-29 16:57:39 +00:00
mcmartin f8ee727c28 Ships aren't sold without confirmation anymore (Bug 413), from Paxtez 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1142 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-08-29 10:16:20 +00:00
avolkov 15d84e449c Updated due to bug #184 fix 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1139 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-08-28 23:19:49 +00:00
gewlitys 8da2644287 Lander report messages now use the entire panel (bug #36), from 
chmmravatar


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1137 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-08-28 22:43:00 +00:00
gewlitys d9943b1689 Fixed colour cycling in the roster screen (bug #279), from Nic 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1136 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-08-28 15:09:38 +00:00
avolkov e39a5b7ca0 Updated due to #109 fix. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1134 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-08-27 23:25:55 +00:00
mcmartin 6c035c669d Fixed a Drall/Drahn confusion 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1132 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-08-27 05:26:39 +00:00
mcmartin 9652af31ef Lander's landing sequence starts simulating events later (bug #80) 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1130 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-08-27 03:35:57 +00:00
meep-eep 21a261406e 2 more melee ship slots, as the PC SC2 had. 
From chmmravatar. Bug #248.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1123 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-08-26 01:27:17 +00:00
meep-eep cd50e140ea Made functions for GET_GAME_STATE and SET_GAME_STATE, providing some 
state debugging code (#define STATE_DEBUG in globdata.h).
Also documented some of the states.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1118 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-08-24 16:42:34 +00:00
meep-eep 15cd9cff30 Fixed bug #108, extending chmmravatar's patch. Also added comments, and did 
some general cleanups.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1117 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-08-24 16:33:33 +00:00
gewlitys 9f47741316 updated 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1105 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-08-21 19:43:12 +00:00
mcmartin ed8d195bd0 Incompatible changes are tracked in the keys.cfg file now 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1102 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-08-20 17:28:29 +00:00
meep-eep b629dcb724 Install location for content on unix is now ${prefix}/share/uqm/ by default. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1097 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-08-10 19:33:43 +00:00
mcmartin 99f156b592 New Main Menu graphics from MarkVera, Paxtez, Nic (#393) 
Setup is nonfunctional at present.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1092 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-07-30 14:51:10 +00:00
mcmartin 2336893e50 Can't ask for resources just before transferring radioactives 
(bug #432), from Nic


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1090 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-07-28 04:43:59 +00:00
mcmartin cbb902048a Allow for quits during fade-in and splash screen (addresses #422) 
Still can't quit during fade-outs, because the fading is not paused, and
affects the confirmation window too.  Bad times.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1087 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-07-26 05:15:52 +00:00
meep-eep 83d761c5f9 Fix the starship location after being teleported from Procyon to the 
Earth starbase after the Precursor bomb is installed.
Corrects for SAFE_X and SAFE_Y, and adds a little adjustment of 1 pixel.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1085 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-07-25 00:50:08 +00:00
gewlitys 694c5a7bd7 Crew death on planet is now counted properly in all cases (bug #70) 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1084 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-07-23 22:58:00 +00:00
gewlitys e450085a0b Fixed lockup in 'save failed' alert box (bug #397), from ghakko 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1074 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-07-20 22:39:41 +00:00
gewlitys f6fbce650d Fixed glitch in Pkunk animation (bug #354), from Paxtez 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1073 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-07-20 21:04:24 +00:00
gewlitys 055afcbbd5 updated 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1072 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-07-20 16:32:42 +00:00
meep-eep 4f41ce8158 Fix for picking up talking pet after Umgah genocide - from Paxtez 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1071 8092fc87-c524-0410-9efc-e669fe64eaf9
 2003-07-20 16:29:18 +00:00