3883 Commits

Author SHA1 Message Date
avolkov 60d320f09b Fixed Melee menu timeouts after Load team and NET dialogs; bug #1067
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3262 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-29 00:40:35 +00:00
avolkov 8d595b300e Fix main menu inactivity timeout broken by r3164; random cleanups
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3261 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-28 22:58:50 +00:00
Meep-Eep 66b0fdb593 Remove empty struct.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3260 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-28 07:29:29 +00:00
avolkov d8daf03969 Do not try an orbital insertion when the ship is not moving; bug #648
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3259 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-28 05:00:07 +00:00
avolkov c5ef5f4bad Updated MSVC6 project file for message box rewrite; left out in r3252
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3258 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-27 18:41:12 +00:00
avolkov db321c4eb7 Really kill mouse_err.c which refused to die in r2809
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3257 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-27 16:41:27 +00:00
avolkov 7d276bc796 Revert graphics settings entirely when a mode switch fails; bug #1056
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3256 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-26 20:59:14 +00:00
avolkov 7c75c31291 Add pauses to the beginning and end of 'several hours later' track to emphasize the time passage and give the scene a more natural feel
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3255 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-26 19:49:18 +00:00
avolkov ce29d6a7a6 Fixed the Syreen 'several hours later' timing; bug #1011
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3254 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-26 18:32:48 +00:00
avolkov 4cf3f2b292 Do not make alien comm code play each track individually when there are events interspersed, it causes subtitle blinking, and there is no need for this
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3253 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-26 18:25:56 +00:00
avolkov 90945cf8df Native message box on MacOSX; platform-specific separation of box drivers
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3252 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-25 22:21:08 +00:00
Meep-Eep 9ef9d69622 A few commas, to help Alex read.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3251 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-25 01:17:36 +00:00
Meep-Eep b1eedecb32 Switch main menu to the new threadless flashing code.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3250 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-25 01:12:19 +00:00
Meep-Eep c02ca9e000 Improvements to flashing code. Overlays work right too, now.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3249 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-25 01:11:41 +00:00
avolkov a82b17e1c9 Asm scaler fixes: restrict RGB15_to_YUV operand to a register, but leave gcc more available regs; fixes scaler problems in MacOSX; Also, properly inform gcc of clobbered condition code reg
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3248 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-25 01:01:45 +00:00
avolkov 11ffd2ac61 We cannot rely on SDL_DisplayFormatAlpha(). Our code assumed things which may not be true on a Mac w/ SDL 1.2.14. This fix is also applicable to all platforms
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3247 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-24 22:22:02 +00:00
avolkov 68ebcaf54e Don't try using pkgconfig to detect libs on Mac OSX; pkgconfig is not there
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3246 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-24 21:53:05 +00:00
Meep-Eep 2db40c9528 Only need to put the version number on the restart screen once.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3245 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-24 21:11:40 +00:00
Meep-Eep 6828498658 Some more cleanups; move color definitions to colors.h.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3244 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-24 20:07:03 +00:00
Meep-Eep e90b6c5537 Updated.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3243 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-24 19:36:24 +00:00
Meep-Eep 5036ba075e Fix SDL, libmikmod, and pthreads detection.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3242 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-24 19:32:36 +00:00
Meep-Eep 241d95d2c1 Cleanups, add have_command.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3241 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-24 19:31:55 +00:00
Meep-Eep 595bf1e5e0 Detection of libmikmod requires detection of libmikmod-config.
Same for SDL and pthread.



git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3240 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-24 17:57:14 +00:00
Meep-Eep 005cbd6656 Even more fixes.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3239 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-24 17:56:13 +00:00
Meep-Eep bb2513fc06 More fixes.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3238 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-24 17:50:49 +00:00
Meep-Eep 4eb191e859 A few corrections.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3237 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-24 17:44:34 +00:00
avolkov 2362c376a4 Scope fixes: 0-init scope data; do not put critical calls into an assert() ;-)
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3236 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-24 05:37:41 +00:00
Meep-Eep 6774ad2a9b Make DoPopupWindow() work over faded out screens.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3235 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-23 19:51:33 +00:00
avolkov 62c7422918 Cleanup of options processing: parse all options at the very first thing we do, so do not have to screw with optind; fixes failures when running with no args on mingw
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3234 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-21 20:21:25 +00:00
Meep-Eep cf7fd70c67 Redefining "absurd". Also small cleanup.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3233 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-21 16:49:26 +00:00
avolkov c6de2bece5 Sndlib cleanup: do not expose internals; some dead stuff removed; a few bugs fixed; stream decoder reorg; some memory optimizations; use intptr_t for tags (64-bit cleanliness)
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3232 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-19 19:13:24 +00:00
avolkov 50f95f5856 This debug print should not have made it in, and now removed
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3231 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-19 10:32:15 +00:00
avolkov 621e8c5a7f Make HRealloc() check the return the same way HMalloc() does
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3230 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-19 10:09:33 +00:00
mcmartin 20ae0eb3fb When reading options, perform more thorough type-checking. This should solve a crash some modders found when modifying menu.key.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3229 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-19 01:02:22 +00:00
avolkov ac3b01ce12 Trackplayer rewrite; fixes several obscure bugs; SpliceTrack() still a mess
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3228 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-18 16:53:27 +00:00
avolkov 769e932fff Minor fix: the slides string is not auto-deleted anymore, so we have to
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3227 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-17 21:56:16 +00:00
avolkov 934bbd3a8f Cleanup of inplib: don't include stuff from uqm/, some funcs and vars moved around, some dead stuff removed, others
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3226 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-14 13:35:37 +00:00
Meep-Eep 398552a22a Indenting.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3225 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-12 21:04:48 +00:00
avolkov 3c25fd1934 Some minor cleanups
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3224 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-12 02:26:48 +00:00
avolkov 6473363eb2 Cleanup of vidlib: move uqm/-specific code out of vidplayer; other
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3223 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-12 02:19:46 +00:00
avolkov 2a76a63292 Cleanup of memlib and its use: removed legacy handle code, moved memory alloc funcs into memlib.h
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3222 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-11 21:42:05 +00:00
avolkov 7873b3115a Include cleanups in forgotten files
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3221 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-11 12:36:55 +00:00
avolkov 1196e2ddab Graphics lib cleanup: don't include stuff from uqm/, so things moved around
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3220 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-11 10:28:47 +00:00
Meep-Eep 4eef01b3f6 Fix indenting.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3219 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-09 22:26:07 +00:00
Meep-Eep f4399708ba Formatting fix.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3218 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-09 22:24:42 +00:00
avolkov af49118ff9 Reverting erroneous check-in
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3217 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-09 22:17:25 +00:00
avolkov 30444288ad MSVC project dir thought to be MIA was actually AWOL hanging out here. Now it has been court-martialed and executed
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3216 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-09 22:08:38 +00:00
avolkov 3fbe31c651 Source tree reorg: Normalized #include paths after the dir moves
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3215 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-09 20:38:29 +00:00
avolkov 7122e86855 Source tree reorg, stage 2: finished renaming sc2code/ to uqm/; build files updated
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3214 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-09 17:18:45 +00:00
avolkov 2b4af406b2 Source tree reorg, stage 1: Rstoring MSVC project dir that went MIA
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3213 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-09 16:52:53 +00:00