Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,362 Commits 1 Branch 0 Tags
Commit Graph

1362 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
016ce3e69e Bow before my remote cache-flushing skills! And also my actually-trying-to-build-before-checking-in skills. Um. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1472 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-09 15:43:53 +00:00
Jens Ayton
f68d550d8e Added JS Ship methods dumpCargo(), ejectItem() and ejectSpecificItem(). Spotlight indexer now indexes required.plist max_version for display in More Info. Fix for internal consistency in default fragment shader's handling of specular exponents. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1471 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-09 15:27:06 +00:00
Nikos Barkas
e52d57affe Fixed a small problem with the JavaScript legacy_addShipsWithinRadius method (radius is a double but was passed to the arg list as an integer). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1470 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-09 15:23:09 +00:00
Nikos Barkas
cd2d1a72da Eliminated a few warnings on the SDL builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1469 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-09 13:31:21 +00:00
Jens Ayton
e8a6374816 Probable fix for compiler looking for OOCAfoo headers when building for SDL. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1468 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-09 10:49:55 +00:00
Marc
91358f71a2 More station defence stuff. Special cargo expanded and amended: it can now be saved, and no containers can be loaded on board while the special cargo is in the hold - scooping cargo will not work, and purchasing & awardCargo are only allowed for small valuables. Added a few more strings for translations. Minor code tidy up. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1467 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-09 04:10:42 +00:00
Jens Ayton
8745195035 JS can now use customsounds.plist redirection - bracketed sounds are transparently looked up in the plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1466 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-08 22:34:33 +00:00
Jens Ayton
3f74d1b923 Got Instruments working and fixed several small leaks. Currently mostly seeing occasional leaks of OOWeakReferences to ships (but the ships themselves aren't leaked and OOWeakReferences are only 8 bytes.) Cobbled together a class for handling groups of sources for related sounds, so that e.g. the number of simultanous scrape sounds is limited. Moved bits of player launching logic from pollDockedControls: to leaveDock: (which is also called from other places). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1465 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-08 17:16:10 +00:00
Jens Ayton
fe418babea Tested under a stricter compiler and fixed some warnings. Removed -[OOSound stop] under OS X, OOSound's an OOMusic's pause/resume and related methods, which have done nothing under OS X since pre-1.65; all call sites have been #if 0-ed out, and need to be replaced with use of OOSoundSource. -[OOSound stop] is still there in the SDL implementation, but is for the use of OOBasicSoundSource only. May have broken build for SDL by fiddling with prototypes. Removed all uses of deprecated-in-OS-X methods -[NSString cString] and -[NSString lossyCString]. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1464 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-07 20:09:56 +00:00
Marc
b17ba19a77 Bugfix: main stations now properly defend themselves. On default systems, the main station launches up to 8 defence ships, other stations launch up to 3. 
Key max_police sets the main stations defenders / nr of system patrols.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1463 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-07 00:10:14 +00:00
Jens Ayton
2b89827eb3 Graphics fiddle: scarred alloy is now only scarred on one side, and has a specular intensity map (if shaders enabled); both types of alloy are now shinier. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1462 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-06 18:13:57 +00:00
Jens Ayton
f2e5df82db More work on the sanity of subentity backreferences. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1461 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-06 17:27:01 +00:00
Jens Ayton
864998dbd7 Made Entity owner an OOWeakReference. This is more efficient than the universalID method, and completely avoids bugs due to getting entities with recycled IDs. It also might help with ship.subentity.sanityCheck.failed issues. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1460 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-06 00:22:46 +00:00
Jens Ayton
73cec5cdc3 Generalized r1458 danging-subentity-backreference fix. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1459 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-05 23:52:25 +00:00
Jens Ayton
5f09cc936a Fixed a bug where subentity relationships would be messed up by -becomeLargeExplosion (currently only used for the player). Better diagnostics for bad AIs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1458 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-05 23:45:09 +00:00
Jens Ayton
4c3cf42f7e Fixed a small leak in the previous revision. Unified the various missile/ident locked-on strings. Made :: console macro work for methods with an argument string, as in :: playSound: boop.ogg. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1457 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-05 11:26:12 +00:00
Jens Ayton
e2a2be7f46 Started looking at laser drawing bug, ended up doing lots of cleanup of subentity handling instead. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1456 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-05 00:06:05 +00:00
Marc
2ca6f60d5c GnuMake cleanup: just the one logcontrol file now, and removed compiler warnings from PlayerEntityLegacyScriptEngine 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1455 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-04 20:32:38 +00:00
Jens Ayton
aaee1b7fcb Fixed testing-related breakage. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1454 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-04 02:02:15 +00:00
Jens Ayton
7c242079fc New skies even for gnusteppy people. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1453 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-04 01:43:42 +00:00
Jens Ayton
3671b45b17 Silenced sky setup messages; stopped making player-fired missiles dump AI debug messages; collection-extracty cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1452 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-03 22:43:18 +00:00
Jens Ayton
ef3cb81251 Multi-texture skies are go. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1451 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-03 22:02:53 +00:00
Jens Ayton
84412f33cc Added safeScriptActionOnTarget:, removed some unused code, fixed copy&paste error in sky setup, added sanity check to ensure the main station is in fact a station. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1450 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-03 20:41:08 +00:00
Nikos Barkas
74ae10a5c9 Resolution for bug #12659 (scripted cargo pods do not award cargo when scooped). Added the CLASS_CARGO scan class to alloy and splinter in shipdata.plist, so that they don't appear unscoopable and with legal status when spawned by scripts. Finally, yes, you guessed it, more strings externalized. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1448 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-03 06:46:40 +00:00
Marc
8db171cf6a bugfix for cloaking device mission, new string added: 'autosave-commander-name' 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1447 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-02 20:41:07 +00:00
Jens Ayton
dcd634c714 Improved script.debug.trace output for conditions, just because. Added script.trace and script.debug.trace to Debug OXP menu. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1446 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-02 19:45:51 +00:00
Jens Ayton
959dc99d88 Added big fat deprecation warning for scriptActionOnTarget:. Added skanky code to avoid running world scripts more than once with certain player states (such as STATUS_EXITING_WITCHSPACE). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1445 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-02 18:56:24 +00:00
Jens Ayton
1a75b7f6bf Fix for version number in GNUstep builds. Removed a minor redundancy in new JSConsole consoleMessage implementation. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1444 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-02 16:28:36 +00:00
Marc
f4bb06a43a Bugfix - removed crash when loading save game with 'stale' oxp missiles (see http://aegidian.org/bb/viewtopic.php?p=47921&highlight=#47921) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1443 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-02 14:53:51 +00:00
Marc
889bdbbbdb Bugfix for very long passenger names in the Carrier Market. Change to Console.consoleMessage: ConsoleMessage('message') is now shorthand for ConsoleMessage('command-result','message'). Added Autosave option, with associated translations strings. bugfixes ported to 1.70-maintenance. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1442 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-02 05:31:43 +00:00
Jens Ayton
674aa0d0e0 Most legacy script methods now show the name of the current script if an error occurs, but this only works for world scripts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1441 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-01 23:22:03 +00:00
Jens Ayton
fda95ca90a r1438 redux. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1440 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-01 22:05:11 +00:00
Jens Ayton
ddf50cf43e Fixed Xcode project to stop changing Basic-debug.oxp/requires.plist to require version 1.70 when building release builds; fiddled with project to reduce number of places version number is specified. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1439 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-01 21:01:00 +00:00
Jens Ayton
101f811d72 Fix for Mac builds when there are spaces in the project path. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1438 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-01 20:40:29 +00:00
Jens Ayton
cf87bfe72f Fix for argument-may-be-clobbered warning in optimized Mac builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1437 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-01 20:18:41 +00:00
Nikos Barkas
f856ec3814 Changed hex representation of GH fixed coordinates to decimal, because [PlayerEntity setGalacticHyperspaceFixedCoords] seems to have a problem reading hexadecimal representations into unsigned char arrays, making the default coordinates (0,0,0) instead of (96,96,0). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1436 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-01 09:12:39 +00:00
Jens Ayton
9fb7456e20 (Woops, thought I did this last night.) Implemented stack for temporary local variables for non-world legacy scripts. (Previous approach was quite thoroughly broken, as it didn't allow reentrancy and broke locals for world scripts.) Moved -descriptionComponents and such into new OOCocoa.m, and added -shortDescription. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1433 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-29 15:48:00 +00:00
Marc
0b82d17102 Minor fixes: subentity dealloc patch for players' ships with subentities, and better comms feedback for DebugConsole.py 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1432 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-29 00:48:20 +00:00
Jens Ayton
27d4002e2c Twiddled Xcode project to behave in the presence of system-wide libOgg/libVorbis installations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1431 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-28 22:33:35 +00:00
Jens Ayton
1fd76123cc JS mission.choice is now read-write, mission.resetMissionChoice() deprecated. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1430 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-27 22:50:40 +00:00
cmdrjames
30a479f8aa Correct a bug I had introduced, where the refund value for fitted lasers is out by a factor of 10 (due to not correcting for prices expressed as price*10) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1429 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-27 22:24:14 +00:00
Nikos Barkas
1d5898fc0a Made the planet derivative suffix (like -ian for Laveian) user definable, might be useful for translation purposes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1428 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-27 08:57:24 +00:00
Nikos Barkas
4184df3da4 Two more hardcoded strings found and migrated to descriptions.plist (I wonder when they are going to end, they continuously seem to come up). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1427 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-27 07:03:25 +00:00
Jens Ayton
fe22632e96 More of the same bug fix to prefix script. Added JS systemNameForID() and systemIDForName() methods. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1426 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-26 18:07:17 +00:00
Marc
d528e563d4 Bugfix for player.dockedStationName 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1425 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-26 14:20:12 +00:00
Jens Ayton
cec97f0baf shipHitByECM() JS event now has a pulsesRemaining parameter. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1424 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-26 11:01:40 +00:00
Jens Ayton
e95e3fd521 Most AI reactToMessage: calls now also have a script event; see http://www.aegidian.org/bb/viewtopic.php?p=47620#47620 . Some cleanup and optimization. Added command-line hack to graph difference between Vector.random() and Vector.randomDirectionAndLength() as in http://wiki.alioth.net/index.php/Image:Randomvectordistribution.png . 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1423 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-26 01:54:26 +00:00
Nikos Barkas
0d0681de10 Fixed typo in GNUstep makefile. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1421 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-25 17:44:44 +00:00
Jens Ayton
cc056a6a75 Legacy foo_actions can now have local variables, which are cleared when the _actions completes. Marked DebugConsole.py executable for unices. Fixed bugs in vector randomization code, and added a third randomizer which provides an even distribution of lengths (but uneven distribution in space). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1420 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-25 16:22:15 +00:00
Jens Ayton
9c70bad9cf Missing files. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1416 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-25 11:40:00 +00:00