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 d719ec696d Don't set ATTACKED_DRUUGE if Druuge attempted to salvage your ship; bug #1013 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3194 8092fc87-c524-0410-9efc-e669fe64eaf9
 2009-10-08 02:16:48 +00:00
avolkov 39021b42ec Process subtitles correctly with no timestamp file; bug #1060; some trackplayer cleanups 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3193 8092fc87-c524-0410-9efc-e669fe64eaf9
 2009-10-08 01:26:26 +00:00
avolkov f619b0b8e1 Ensure that lander explosion element gets allocated; bug #584 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3192 8092fc87-c524-0410-9efc-e669fe64eaf9
 2009-10-08 00:07:52 +00:00
avolkov 1c29a67fdc Canceling a load from main menu aborts the game and returns to main menu; bug #679 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3188 8092fc87-c524-0410-9efc-e669fe64eaf9
 2009-10-07 02:45:26 +00:00
avolkov 12a0e5f9cd Suppress generation of menu input when entering text with numpad with NumLock on; bug #934 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3186 8092fc87-c524-0410-9efc-e669fe64eaf9
 2009-10-07 00:30:11 +00:00
avolkov f5a0024efc Better location descriptions in savegame summaries; bug #844 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3185 8092fc87-c524-0410-9efc-e669fe64eaf9
 2009-10-03 22:58:09 +00:00
avolkov 0a609ba3f1 Fixed a buffer overflow when saving a game with too many devices 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3182 8092fc87-c524-0410-9efc-e669fe64eaf9
 2009-09-30 23:12:49 +00:00
avolkov 9925a29c89 Scope graphing rewrite: speech/music merged, allows 8- or 16-bit, auto-adjust level; bug #1064 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3181 8092fc87-c524-0410-9efc-e669fe64eaf9
 2009-09-30 22:37:36 +00:00
avolkov 07a7a09659 Game settings Quit menu now delegates to F10 quit; bug #462 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3174 8092fc87-c524-0410-9efc-e669fe64eaf9
 2009-07-09 05:24:40 +00:00
avolkov 8222417745 Do not pause the game in places where not relevant; bug #984 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3173 8092fc87-c524-0410-9efc-e669fe64eaf9
 2009-07-07 00:51:26 +00:00
avolkov 2fa662ab3c Updated for bug #997 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3172 8092fc87-c524-0410-9efc-e669fe64eaf9
 2009-07-07 00:22:52 +00:00
avolkov ad23012567 Fixed crashes and potential weirdness when loading savegames from a Homeworld encounter screen 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3169 8092fc87-c524-0410-9efc-e669fe64eaf9
 2009-07-04 07:25:58 +00:00
avolkov 85191e5541 Cleanup of GLOBAL(ShipStamp.frame) abuse; also fixes #1054 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3168 8092fc87-c524-0410-9efc-e669fe64eaf9
 2009-07-04 06:18:22 +00:00
avolkov 86f36b30d5 First steps towards clean exit; bug #52 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3167 8092fc87-c524-0410-9efc-e669fe64eaf9
 2009-07-02 01:44:31 +00:00
avolkov bd092ca844 Fixed Mmrnmhrm's X-Form transformation without energy use; bug #1004 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3166 8092fc87-c524-0410-9efc-e669fe64eaf9
 2009-07-01 20:31:49 +00:00
avolkov d877ed58f1 Added missing sleeps in DoInput() functions; bug #893. Random minor cleanups 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3164 8092fc87-c524-0410-9efc-e669fe64eaf9
 2009-07-01 00:25:39 +00:00
avolkov f2a8766252 Starmap unit conversion corrections and lazy-cursor fix; fixes bug #970 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3163 8092fc87-c524-0410-9efc-e669fe64eaf9
 2009-06-30 10:06:23 +00:00
avolkov 852eeaf7a4 Rounding-error correction in log(x|y)ToUniverse; bug #1046; from Nic 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3162 8092fc87-c524-0410-9efc-e669fe64eaf9
 2009-06-30 05:32:24 +00:00
avolkov fb9688751f Change hardcoded Starbase and Sa-Matra values to pretty enum values; bug #1047; from Nic 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3160 8092fc87-c524-0410-9efc-e669fe64eaf9
 2009-06-30 01:11:27 +00:00
avolkov 8e10817997 Load override.cfg from config dir to add or override menu controls 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3159 8092fc87-c524-0410-9efc-e669fe64eaf9
 2009-06-30 00:07:20 +00:00
avolkov d4f68f3909 Allow addons to override any content by placing zips into their 'shadow-content' dir. 
Unzipped files in 'shadow-content' are not currently supported.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3158 8092fc87-c524-0410-9efc-e669fe64eaf9
 2009-06-29 05:05:48 +00:00
avolkov 59288c1085 Content reorg: font chars now use hexadecimal numbering to match the Unicode standard 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3157 8092fc87-c524-0410-9efc-e669fe64eaf9
 2009-06-28 23:43:08 +00:00
avolkov 7af85ce8a7 Content renames mostly complete 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3156 8092fc87-c524-0410-9efc-e669fe64eaf9
 2009-06-28 21:04:33 +00:00
mcmartin c4f404af0a Move the configure and keyconfig data into subtrees of the resource map. As a side effect, default key configurations are read directly from the content directory. 
THIS IS AN INCOMPATIBLE CHANGE TO THE CONFIG FILES. Update content as well as src when upgrading here. Old configurations will be lost but the upgrade should otherwise be automatic.

Bumped version to 0.6.5 to commemorate the incompatible change.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3108 8092fc87-c524-0410-9efc-e669fe64eaf9
 2009-02-16 00:40:42 +00:00
mcmartin 67dc3becff Updated to reflect the past six weeks of commits 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3106 8092fc87-c524-0410-9efc-e669fe64eaf9
 2009-01-03 22:22:06 +00:00
avolkov 5407575ef4 Allow reaching 999.9 over X in HSpace; Y fixed symmetrically and would be relevant if weren't inverted; bug #628 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3098 8092fc87-c524-0410-9efc-e669fe64eaf9
 2008-11-10 06:03:16 +00:00
Meep-Eep c99ef7b9ca Use system getopt_long() when available. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3097 8092fc87-c524-0410-9efc-e669fe64eaf9
 2008-10-18 18:57:19 +00:00
gewlitys 2f7bbc1d5f Added --addondir commandline option. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3092 8092fc87-c524-0410-9efc-e669fe64eaf9
 2008-10-17 21:48:14 +00:00
Meep-Eep 72e31c75db Case insensitive matching for .uqm/.zip/.rmp. Also fixes an error in the regexp used before. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3090 8092fc87-c524-0410-9efc-e669fe64eaf9
 2008-10-15 17:45:17 +00:00
Meep-Eep b3321c8c60 Added read-ahead buffering when reading zip index files. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3086 8092fc87-c524-0410-9efc-e669fe64eaf9
 2008-10-12 21:46:57 +00:00
gewlitys 64fd9db34e Added support for packed ani and font files 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3084 8092fc87-c524-0410-9efc-e669fe64eaf9
 2008-10-12 00:37:05 +00:00
avolkov 1c6e58d98f DrawTracedText abstraction; bug #1029; from Nic, modified 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3081 8092fc87-c524-0410-9efc-e669fe64eaf9
 2008-10-05 20:07:37 +00:00
gewlitys 50664a6f71 Experimental support for Symbian S60 3rd edition 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3064 8092fc87-c524-0410-9efc-e669fe64eaf9
 2008-08-31 00:34:29 +00:00
Meep-Eep aa02a78da5 Pthread support from Gwl. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3041 8092fc87-c524-0410-9efc-e669fe64eaf9
 2008-08-21 20:03:54 +00:00
mcmartin b6c31e07af Part 2 of the content reorganization. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2990 8092fc87-c524-0410-9efc-e669fe64eaf9
 2008-05-24 21:31:14 +00:00
mcmartin 536d0cb676 Voiceove clip abstraction. 
This is two simultaneous changes: CONVERSATION resources are made of 
three paths instead of one (phrases, clip directory, timestamps), and 
the synthetic, always-loaded '3dovoice' addon controls the use of them.

The intent is to eventually move uqm-0.x.0-voice.zip out of the core 
packages and into the addons with 3domusic.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2978 8092fc87-c524-0410-9efc-e669fe64eaf9
 2008-05-18 13:57:22 +00:00
Meep-Eep c952996ad7 Replaced stricmp() by strcasecmp(). 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2976 8092fc87-c524-0410-9efc-e669fe64eaf9
 2008-05-17 10:54:10 +00:00
mcmartin ded11e540e Split STRTAB further into STRTAB and CONVERSATION 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2974 8092fc87-c524-0410-9efc-e669fe64eaf9
 2008-05-15 07:17:32 +00:00
mcmartin 38b00505d5 Made the INT32 and BOOLEAN resource types more type-sane. 
This has required reworking the way load methods work slightly.



git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2973 8092fc87-c524-0410-9efc-e669fe64eaf9
 2008-05-15 03:15:27 +00:00
mcmartin 47a7575e97 Full support for "zero-file" resources UNKNOWNRES and SHIP. 
The CODE resource file type has been retired, replaced by SHIP.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2971 8092fc87-c524-0410-9efc-e669fe64eaf9
 2008-05-14 06:05:58 +00:00
mcmartin 2ddc969faf Resource loader now descriptor-based, not filestream-based. 
This will allow for non-file resources, and eventual merging of
configuration and other data into the resource system.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2970 8092fc87-c524-0410-9efc-e669fe64eaf9
 2008-05-14 03:15:29 +00:00
mcmartin ffd50ee6fd Fold the ResourceHandlers vtable into the ResourceDesc directly. 
The vtables themselves are stored in the main resource map under
the "sys." branch instead of in their own side array.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2969 8092fc87-c524-0410-9efc-e669fe64eaf9
 2008-05-11 03:29:14 +00:00
mcmartin 245cbce1a0 Split STRTAB into two resource types instead of differentiating on suffix 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2968 8092fc87-c524-0410-9efc-e669fe64eaf9
 2008-05-08 07:30:22 +00:00
mcmartin 0ea5d1c361 Removed the defunct KEY_CONFIG and RES_INDEX resource types. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2964 8092fc87-c524-0410-9efc-e669fe64eaf9
 2008-04-09 18:51:33 +00:00
mcmartin 7cead51fb3 Major revamp of the resource system. Only RMP files remain. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2962 8092fc87-c524-0410-9efc-e669fe64eaf9
 2008-04-09 05:54:22 +00:00
mcmartin 37f0bcf5e6 Moved all resource ID construction into its own file for easy replacement 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2960 8092fc87-c524-0410-9efc-e669fe64eaf9
 2008-04-06 07:53:42 +00:00
mcmartin 7f65c19044 Fixed intermittent crash if conversing with music disabled 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2959 8092fc87-c524-0410-9efc-e669fe64eaf9
 2008-04-06 07:50:42 +00:00
mcmartin 32940bb214 Moved code resources into starcon.ls2 as well. 
SetResourceIndex is no longer used after main program init,
and RES_INDEX is for all practical purposes defunct.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2958 8092fc87-c524-0410-9efc-e669fe64eaf9
 2008-04-06 00:52:14 +00:00
mcmartin 356a2106e9 Moved all non-CODE resources to starcon.ls2. 
At this point, only loading ships ever changes the resource index.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2957 8092fc87-c524-0410-9efc-e669fe64eaf9
 2008-04-05 10:16:22 +00:00
mcmartin 9a526084ec Fixed errors and warnings when compiling without HAVE_JOYSTICK 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2956 8092fc87-c524-0410-9efc-e669fe64eaf9
 2008-04-05 07:59:26 +00:00