4014 Commits

Author SHA1 Message Date
meep-eep 1a42d65a63 Some fixes, enhancements for environment handling.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1424 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-11-23 23:53:15 +00:00
meep-eep 1b317db686 mention -C/--configdir
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1423 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-11-23 00:31:53 +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 a3eda1d6cd Make user config dir configurable on the command line (bug #645).
Also, the environment variables UQM_CONFIG_DIR, UQM_SAVE_DIR, UQM_MELEE_DIR,
are checked for default values. This may not be a good idea permanently,
but it was the easiest way to make it possible to have UQM_SAVE_DIR and
UQM_MELEE_DIR depend on UQM_CONFIG_DIR. It will probably change with the new
resource system.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1421 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-11-23 00:25:46 +00:00
meep-eep f090ae624b Add 'exec' so that the sh process is no longer in memory when the game
is started.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1420 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-11-14 15:26:03 +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 3fd290e160 Applied Nic's patches for Chmmr, the StarBase Commander, Druuge,
Melnorme, and Druuge. (sometimes in modified form)


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1418 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-10-29 20:18:25 +00:00
meep-eep 67f6c31908 Fixed a bug where a value past the end of an array could be read
(though it would never be used).


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1417 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-10-15 12:19:29 +00:00
meep-eep 0844322152 Consistent capitalization of "HyperWave".
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1416 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-10-14 10:48:44 +00:00
mcmartin a18a2c9674 Conditioned out buggy scaler-change code (Bug
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1415 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-10-09 08:15:39 +00:00
meep-eep a2532e94f6 Fix for bug #516. From Nic.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1414 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-10-05 21:15:52 +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 22bdca4e4b Changes for SunOS compatibility.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1412 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-10-01 05:49:10 +00:00
meep-eep a147718f13 Typo in "mmrnmhrm" fixed.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1411 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-09-23 05:44:57 +00:00
mcmartin 27c966d8c2 Easily tweakable options may now be tweaked in the setup menu.
Two that "should have been easy but aren't" have skeleton code
implemented, but the user cannot effect them.  Changing the scaler
interacts poorly with OpenGL, and switching between PC and 3DO music
is inconsistent.

GfxFlags has been moved out of sdl_common into gfx_common, as these are
now truly global properties.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1410 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-09-06 13:10:25 +00:00
meep-eep 29771f050f Consistent use of the word "alphabetical" (replaced "alphabetic").
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1409 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-09-05 03:29:57 +00:00
meep-eep e58eed70e1 Made seperate entries for Tore and Espen. Removed their email address.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1408 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-09-05 01:43:24 +00:00
meep-eep 892291c7a5 Used var unitialised.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1407 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-08-12 22:43:47 +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
gewlitys c9fdd4e3a5 Removed misplaced line which messed some things
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1405 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-08-09 00:16:41 +00:00
meep-eep 445c95b6b3 Corrected message in error reporting "content dir" instead of "config dir"
in one location.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1404 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-08-03 04:32:35 +00:00
meep-eep 8ed46a7cd6 Changed default menu and coarse scan mode to PC.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1403 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-08-02 17:39:43 +00:00
meep-eep 730970b08e Added a routine for displaying the (active) spheres of influence.
Some cleanups according to our coding standards.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1402 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-08-02 13:43:26 +00:00
meep-eep 2010ebdf17 Mentioned the saved game location. Also mentioned that the "Application Data"
folder on Windows may be hidden.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1401 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-08-02 03:47:16 +00:00
meep-eep 544d32cd9c Correction
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1400 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-07-30 20:06:55 +00:00
meep-eep 892570d109 Added reference to Xcode Tools for Mac OS X.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1399 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-07-30 19:54:48 +00:00
meep-eep f1fdfb0252 I interrupted the last commit, so there may have been an inconsistency
in CVS.
Reverting back to old file.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1398 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-07-21 18:57:00 +00:00
meep-eep b969447df9 Added checks to see if uio_fseek() succeeds.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1397 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-07-21 17:13:44 +00:00
meep-eep 7dc88a9385 Define DEBUG in 'Debug info + strict compile checks' mode too.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1396 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-06-28 01:03:44 +00:00
meep-eep 06e4ad66ba fixed some warnings
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1395 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-06-26 15:27:49 +00:00
meep-eep 1bc0106e6d Custom detection for SDL_mixer (and SDL_image) as done with SDL.
For Darwin.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1394 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-06-24 16:48:59 +00:00
meep-eep fa7bb889e9 Text and timestamp fix.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1393 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-06-22 18:50:41 +00:00
meep-eep 7e5fd86b2c Disentangled ESCORT_WORTH and ESCORTING_FLAGSHIP for better readability
and to get rid of a warning.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1392 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-06-17 05:03:28 +00:00
meep-eep 2f84f38c4b little fix, and another warning removed.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1391 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-06-17 02:52:25 +00:00
meep-eep 8298d4c4a8 removed some warnings
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1390 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-06-17 02:25:42 +00:00
meep-eep a58d30cd63 got rid of some warnings
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1389 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-06-17 02:22:38 +00:00
meep-eep eff9355f88 get rid of warning
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1388 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-06-17 02:18:24 +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 8aa026c23b Eliminated some MSVC (?) warnings.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1386 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-06-16 16:21:44 +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 93a5344c71 Renamed debug.c and debug.h to uqmdebug.c and uqmdebug.h to help
the crippled MS dev studio cope.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1383 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-06-15 17:58:19 +00:00
meep-eep aeeda8d7ba Forgot about the 10 fuel that can be present in the ship apart from in
the fuel modules.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1382 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-06-15 13:48:06 +00:00
meep-eep bb773c1246 Little bug fixed; Release builds should work again.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1381 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-06-15 10:52:10 +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 243c8e4a13 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@1379 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-06-14 00:30:58 +00:00
meep-eep 54d0cde87e 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@1378 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-06-13 22:32:41 +00:00
meep-eep ecaa02203d 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@1377 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-06-10 14:14:04 +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 918fead64a email for the developpers fixed
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1375 8092fc87-c524-0410-9efc-e669fe64eaf9
2004-06-09 23:54:13 +00:00