789 Commits

Author SHA1 Message Date
meep-eep 1935316a12 Moved -h/-? handling to preParseOptions().
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1441 8092fc87-c524-0410-9efc-e669fe64eaf9
2005-01-10 08:49:05 +00:00
meep-eep 942c1efdc1 updating for fOSSiL's latest patch
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1439 8092fc87-c524-0410-9efc-e669fe64eaf9
2005-01-08 21:17:46 +00:00
avolkov d53b4719a8 bugfix 668
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1436 8092fc87-c524-0410-9efc-e669fe64eaf9
2005-01-07 22:34:26 +00:00
meep-eep 2fa71c9337 Cocoa hooks for MacOS X.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1433 8092fc87-c524-0410-9efc-e669fe64eaf9
2005-01-05 10:08:37 +00:00
meep-eep be85c3917f Correct number for combat energy in "Outfit Starship".
it used to divide by wait_delay, but in practice wait_delay + 1 is used.
Unfortunately, this means if you want integer numbers, you'd have to
multiply everything by gcd(5, 7, 9, 11), instead of gcd(4, 6, 8, 10).
This would be too big, so I had to use rounded numbers.
The number displayed now is the amount of energy gained per second.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1432 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-12-22 20:27:03 +00:00
meep-eep 423ccea449 Dumping info for planets.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1431 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-12-10 04:11:44 +00:00
meep-eep a5728f990d Look for language.txt for locale, from Zap.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1427 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-12-04 19:04:57 +00:00
meep-eep d4e0e093f4 updated
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1422 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-11-23 00:27:05 +00:00
meep-eep d2a969b38d Some of Nic's speech patches.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1419 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-10-29 20:19:39 +00:00
meep-eep 1673aa70d3 Made the unix build scripts more portable. It will be necessary to
rerun './build.sh config' as build.vars.in has been modified.
Also fixed some small bugs in the redirection of text to /dev/null.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1413 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-10-02 08:41:04 +00:00
meep-eep 27d524f758 No longer chdir() to the content dir (bug #564)
Also, ~ and environment variables are interpreted in the supplied
content path now.
There's no longer a hardcoded fallback for CONTENTDIR in starcon2.c, as it
should always be defined in config.h.
Don't look for content in the default directories if an explicitely
supplied path failed. It would only confuse users.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1406 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-08-09 03:15:40 +00:00
meep-eep a8ef5a61c8 The unix build script should now be able to detect SDL on Darwin (bug #358)
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1387 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-06-16 23:22:19 +00:00
meep-eep a739db6786 Resource units given more obviously when ordering a probe to
self-destruct (bug #586), from Nic.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1385 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-06-15 22:59:55 +00:00
meep-eep 49bb1703d4 Shipyard "Combat Energy" changed to reflect the recharge rate (bug #522).
Also, some cleanups. Thanks and apologies to Nic.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1384 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-06-15 22:23:30 +00:00
meep-eep 398b666a8d Lots of debugging stuff. See doc/devel/debug for more info.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1380 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-06-15 03:41:32 +00:00
meep-eep 87edd5faa0 Cleaned up use of the DEBUG define:
- renamed the DEBUG define for debugging specific code. In the top of
  the relevant files there is an commented out define to activate
  debugging for that file.
- removed entire DEBUG sections where it is no longer relevant
- compile with DEBUG defined when building a debugging binary
Code that produces general warnings is kept in DEBUG blocks.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1376 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-06-10 04:49:02 +00:00
meep-eep c83d817752 Text and timestamp fixes, from Nic.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1372 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-06-06 16:19:00 +00:00
mcmartin b477112297 Abstracted the quit-confirm window
Beginning of the creation of somewhat general-purpose widgets for the
setup menu and related functionality.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1369 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-06-02 07:19:41 +00:00
gewlitys dc2a900df7 Fixed blue comms screen problem (bug #363), from Joel Holveck & Nic
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1364 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-05-25 15:53:04 +00:00
meep-eep 848aa115b4 Automatically add an icon for Darwin, from Nic.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1355 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-04-07 06:13:31 +00:00
mcmartin 589a8fa7ca F10-Quit from roster works now (Bug #591) - Michael
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1350 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-04-07 03:14:09 +00:00
meep-eep ec6fc4867e Restructuring of the unix build scripts.
Also, interrupted dependency builds are now detected.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1338 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-02-29 00:04:18 +00:00
meep-eep 2990805c14 Allow compilation in an other directory on unix, keeping the source tree
clean, by setting the BUILD_WORK environment variable.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1333 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-02-27 14:09:13 +00:00
mcmartin 5d23241647 Fixed a bug (#587) when loading from hyperspace, from Nic and Michael
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1331 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-02-24 04:52:58 +00:00
avolkov d04c9f7f2c updated
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1327 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-02-19 08:29:42 +00:00
mcmartin 4fecf6381c Space Marines die if on board a self-destructing Scout, from Nic
(fixes bug #445)


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1324 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-02-19 07:51:14 +00:00
mcmartin 8fe1920a51 Added -l option for logfiles (#560), from Nic
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1323 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-02-19 07:26:40 +00:00
mcmartin 2d5b681991 ZFP subtitles vertically aligned properly (#567), from Nic
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1322 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-02-19 07:11:34 +00:00
mcmartin ba1e64a6be Interplanetary code is folded into a single thread
All player input code is now brokered through DoInput


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1321 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-02-19 06:19:43 +00:00
mcmartin e082deb9f6 Added more complete .cvsignore files, from Nic
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1320 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-02-08 06:47:10 +00:00
mcmartin dac85fa62f Updated
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1319 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-02-05 08:32:21 +00:00
mcmartin 7b2d5a6427 Input refactoring, phase 1
Instead of two structs with many members, these structs are now an array
indexed by an enum.  This makes it easier to take actions on the entirety
of the input state.  The input core itself (input/ and gameinp.c) look a
lot messier at the moment; phase 2 will be to clean them up.  This phase is
mostly to get "typographical" changes across the code out of the way first
to minimize update disruption.

This refactoring has the eventual goal of eliminating the special purpose
input code scattered throught battles, SuperMelee's menus, and IP
exploration.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1312 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-01-15 07:52:45 +00:00
mcmartin 702455687a Thread creation and destruction is now handled by the main loop.
Some modifications to the initialization code were also necessary
to keep the system from deadlocking itself immediately; only subthreads
may now call CreateThread or AssignTask.

All threads are guaranteed to get a WaitThread () on them when they're
finished now, which hopefully will stop thread ID leaking (bug #561).


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1311 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-01-09 19:11:13 +00:00
gewlitys 248e1e4d6b Sound code refactoring: core api is now virtualized, MixSDL is divided to generic mixer and driver entities
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1310 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-01-04 03:38:04 +00:00
gewlitys b729f3f1bc Optimized MixSDL mixing and resampling routines (mono sources are no longer converted to stereo; removed "clipping smoothing" as it's not really the correct way to handle that; resampling routines now use integer arithmetic for calculating position; + some misc changes). This might fix bug #435.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1309 8092fc87-c524-0410-9efc-e669fe64eaf9
2003-12-31 20:03:17 +00:00
gewlitys 2eaee9af88 Better-looking slave shield (bug #32), from Nic
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1305 8092fc87-c524-0410-9efc-e669fe64eaf9
2003-12-17 15:06:02 +00:00
mcmartin b7152e3ee5 Skipping bay door animations works properly now (bug #500), from chmmravatar
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1303 8092fc87-c524-0410-9efc-e669fe64eaf9
2003-12-14 15:47:32 +00:00
gewlitys efe74ead59 Reports SDL version on startup (bug #520) - Mika,Nic
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1300 8092fc87-c524-0410-9efc-e669fe64eaf9
2003-12-10 23:31:08 +00:00
gewlitys 363f1e0e57 Fuel usage on planet landing is now reported correctly on all situations
(bug #556), from Nic


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1298 8092fc87-c524-0410-9efc-e669fe64eaf9
2003-12-10 22:37:18 +00:00
mcmartin ecce133af3 Fine control on menu sounds (bug #449)
Smoothed out various warts in the interfaces that had to do with the
global sound resource going NULL on occasion.  Added sounds for page
up/down where appropriate.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1294 8092fc87-c524-0410-9efc-e669fe64eaf9
2003-12-05 07:29:02 +00:00
meep-eep 7b882e5025 Updating with recent uio changes.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1289 8092fc87-c524-0410-9efc-e669fe64eaf9
2003-11-02 12:52:47 +00:00
meep-eep d3938135ae Added uio_getFileLocation() and uio_getMountFileSystemType() to uio.
Also some small improvements.

I did not add uio_getPhysicalAccess, as I erroneously logged for some other
files. That function is changed a bit, but it existed before.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1284 8092fc87-c524-0410-9efc-e669fe64eaf9
2003-10-24 02:49:26 +00:00
meep-eep c4fc899bcf Fixed fuel usage estimate to selected destination on the starmap.
Original bug, not reported.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1278 8092fc87-c524-0410-9efc-e669fe64eaf9
2003-10-16 21:38:13 +00:00
avolkov 1c319adf01 updated
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1268 8092fc87-c524-0410-9efc-e669fe64eaf9
2003-10-08 10:48:07 +00:00
mcmartin 37683f849f Locking fixes (#504)
You *must* hold the GraphicsLock when calling SetFlashRect.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1265 8092fc87-c524-0410-9efc-e669fe64eaf9
2003-10-08 01:24:35 +00:00
mcmartin e94b959c9d Threadlib refactoring, phase 2.
This is a near-total reorganization.  Full details will appear in
doc/devel/threads when that document is completed.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1257 8092fc87-c524-0410-9efc-e669fe64eaf9
2003-09-23 16:33:50 +00:00
avolkov c14c2b010d Movie player message
(video playback support phase 2)


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1256 8092fc87-c524-0410-9efc-e669fe64eaf9
2003-09-21 15:58:12 +00:00
mcmartin 51aa717fc6 Migrated the GraphicsLock to an ordinary mutex; it is used exclusively
for maintaining critical sections.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1253 8092fc87-c524-0410-9efc-e669fe64eaf9
2003-09-20 07:38:23 +00:00
meep-eep 1344c87460 Extra fallback for the unlikely case that $HOME isn't set on a unix
system (fixes 493).


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1243 8092fc87-c524-0410-9efc-e669fe64eaf9
2003-09-19 03:15:00 +00:00
meep-eep 3652e93ad8 Accept spaces in argument to '--contentdir'.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1242 8092fc87-c524-0410-9efc-e669fe64eaf9
2003-09-19 01:07:47 +00:00