1137 Commits

Author SHA1 Message Date
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
Jens Ayton
a420a4dbe6 Global JavaScript methods (which aren't constructors) now have names starting with lowercase letters, in accordance with JavaScript norms. There are compatibility aliases for the old forms. Log() and LogWithClass() merged into single log(). All JavaScript compatibility aliases for deprecated forms are now implemented in JavaScript, in the new oolite-global-prefix.js script. Changed all copyright notices regarding the project as a whole from 2004-2007 to 2004-2008.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1414 127b21dd-08f5-0310-b4b7-95ae10353056
2008-02-24 21:07:20 +00:00
Nikos Barkas
a88d505c40 Yet another forgotten string moved to descriptions.plist. Fixed bug in escortAI, where escorts would fall to a state of idleness after returning from intercept, due to lack of UPDATE actions in the BEGIN_BUSINESS state (thanks go to Eric Walch for the fix).
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1413 127b21dd-08f5-0310-b4b7-95ae10353056
2008-02-24 10:04:01 +00:00
Jens Ayton
77afca6f3a Fix for fatal crash in getting description for planets. Minor geometry cleanups. Made it possible to filter cache pruning log messages by cache.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1412 127b21dd-08f5-0310-b4b7-95ae10353056
2008-02-23 20:57:08 +00:00
Jens Ayton
5acb8980b4 Matrix transformation complete. Welcome to the real world. (Also merged and simplified three occurances of 'new billboard routine' and disabled compass 'fix' that inadvertantly gave players an Advanced Space Compass.)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1411 127b21dd-08f5-0310-b4b7-95ae10353056
2008-02-23 19:45:29 +00:00
Jens Ayton
23965376ba More incremental OOMatrix stuff. I really ought to figure out why Xcode's snapshot feature isn't working...
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1410 127b21dd-08f5-0310-b4b7-95ae10353056
2008-02-23 18:08:44 +00:00
Jens Ayton
13743e695f Fix for -[PlayerEntity drawRotationMatrix] type inconsistency. Added native functions and JavaScript functions to generate random vectors.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1408 127b21dd-08f5-0310-b4b7-95ae10353056
2008-02-22 22:53:24 +00:00
Jens Ayton
ace4952e87 If you guessed it was more matrix stuff, you weren't wrong.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1406 127b21dd-08f5-0310-b4b7-95ae10353056
2008-02-22 17:50:41 +00:00
Jens Ayton
4084c76c74 I can't believe it's more matrix stuff[TM]. (Also preparing the ground for cameras more directly.)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1405 127b21dd-08f5-0310-b4b7-95ae10353056
2008-02-22 16:42:57 +00:00
Jens Ayton
589fc6ffbf Made JS player.galacticHyperspaceFixedCoords a vector (with a 0 z coord), and player.setGalacticHyperspaceFixedCoords() take a vector or two numbers.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1404 127b21dd-08f5-0310-b4b7-95ae10353056
2008-02-22 16:10:35 +00:00
Jens Ayton
736f05edbe More matrix twiddling; weapon_facing=starboard now works in custom data views.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1403 127b21dd-08f5-0310-b4b7-95ae10353056
2008-02-22 15:52:41 +00:00
Jens Ayton
8a940f724c Mission choices are now sorted. Converted missiontext.plist to OpenStep syntax, and hotted it up with proper quotation marks and apostrophes. Changed magic numbers in -checkForAegis from integer to float literals. Hid entity.linkedList.verify.error message by default.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1402 127b21dd-08f5-0310-b4b7-95ae10353056
2008-02-22 15:26:40 +00:00
Jens Ayton
4b3a74e847 Added script events for planet and station proximity events. Fast PowerPC square root approximation is now actually used. Redefined nil and Nil to be type-pedantic under Cocoa (as they are under GNUstep). Waved a rubber chicken to appease the compiler.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1401 127b21dd-08f5-0310-b4b7-95ae10353056
2008-02-22 11:56:23 +00:00
Marc
c5b9b92365 Bugfix for isNearPlanetSurface (Eric Walch) - Might still be too close to the surface.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1400 127b21dd-08f5-0310-b4b7-95ae10353056
2008-02-21 15:59:00 +00:00
Marc
d963217b1c Yet another escorts fix. System patrols now get their escorts assigned properly. Fix for 'sticky text' on display, needs more testing to ensure the bug is really gone. Minor tidying up of code, replaced objectForKey with stringForKey in a few places.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1399 127b21dd-08f5-0310-b4b7-95ae10353056
2008-02-21 13:01:06 +00:00
cmdrjames
cb2520b622 Bug #11692
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1398 127b21dd-08f5-0310-b4b7-95ae10353056
2008-02-20 23:47:09 +00:00
cmdrjames
5549fc57fe Fix for collision handing (especially to avoid breaking the main station), plus refactoring of some of the ship setup to reduce duplication
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1397 127b21dd-08f5-0310-b4b7-95ae10353056
2008-02-20 21:37:32 +00:00
cmdrjames
2eb8933ff2 Full support for aft lasers in shipyard. Side lasers should work if defined in a plist, but we dont offer random "upgrades" to them in the shipyard. These correspond to bug:012362 and bug:012363
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1396 127b21dd-08f5-0310-b4b7-95ae10353056
2008-02-20 21:11:21 +00:00
Nikos Barkas
d55403fd1b Externalized the (N/A) damaged equipment string. Inserted the load-previous-commander-(yes/no) keys in descriptions as a guide for people doing translation OXPs. Updated the contributors.txt file.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1395 127b21dd-08f5-0310-b4b7-95ae10353056
2008-02-20 07:16:01 +00:00
Nikos Barkas
579eb6aa33 Made intergalactic jump destinations user controllable. The planetinfo.plist key galactic_hyperspace_behaviour determines if the jump will be 1) the standard Oolite type (no isolated systems can be reached), 2) all systems are reachable or 3) fixed coordinates arrival, set by the key galactic_hyperspace_fixed_coords in planetinfo.plist. Also implemented JavaScript control methods PlayerSetGalacticHyperspaceBehaviour and PlayerSetGalacticHyperspaceFixedCoords and the inquiring equivalents player.galacticHyperspaceBehaviour, player.galacticHyperspaceFixedCoords_x and player.galacticHyperspaceFixedCoords_y.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1393 127b21dd-08f5-0310-b4b7-95ae10353056
2008-02-18 15:25:02 +00:00
Nikos Barkas
d406332d27 Fixed breakage in GNUstep build.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1392 127b21dd-08f5-0310-b4b7-95ae10353056
2008-02-18 07:54:25 +00:00
Jens Ayton
f3b04b3a0e More matrix simplifications. No, really! All these format conversions I'm adding make things simpler!
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1391 127b21dd-08f5-0310-b4b7-95ae10353056
2008-02-17 21:59:01 +00:00
Jens Ayton
1df2a18a3d Further work on matrix reform. Kinda.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1390 127b21dd-08f5-0310-b4b7-95ae10353056
2008-02-17 20:49:01 +00:00
Jens Ayton
f8cb607c60 Checked in OOLight and OOCamera; not used yet but referenced in Xcode project.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1389 127b21dd-08f5-0310-b4b7-95ae10353056
2008-02-17 20:03:54 +00:00
Jens Ayton
761eea774d Re-enabled setting up of legacy_launchActions, etc. (Bit of a misunderstanding there: while custom ship scripts are not supposed to use runLegacyScriptActions, oolite-default-ship-script.js is, and requires these properties to be set.)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1388 127b21dd-08f5-0310-b4b7-95ae10353056
2008-02-17 16:38:59 +00:00
Marc
f748995a16 A better fix for ship.bounty, plus 2 other minor js fixes.
Added setScript() method to change js script attached to a specific ship.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1387 127b21dd-08f5-0310-b4b7-95ae10353056
2008-02-17 15:59:40 +00:00