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

1305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jens Ayton
0a1cd36e8d Made previously Mac-specific log header cross-platform (mostly; more information is included under OS X). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1386 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-17 15:37:12 +00:00
Jens Ayton
b73d9d98ec Work on replacing two different matrix types with different problems with one type that may have less problems. (I need the matrix to implement generalized cameras. I need the cameras to implement generalized lights. I need the lights to solve a problem with shaders. There might be an additional advantage or two to being able to place a camera anywhere rather than attached to the player, though.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1385 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-17 00:50:01 +00:00
Jens Ayton
890204c26d Added missionChoiceWasReset() script event for whatever it is Eric's doing. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1384 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-16 22:28:38 +00:00
Jens Ayton
3e9a143508 Fixed previous fix to not do the wrong thing when launching from a non-main station not near the main planet. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1383 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-16 22:18:51 +00:00
Jens Ayton
faba4ddcfb Fixed bug where space compass would display planet icon instead of station icon after launching. Probably the oldest and simplest bug I've fixed. :-) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1382 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-16 22:15:11 +00:00
Nikos Barkas
cc117db0d0 Fixed a problem with descriptions not being set up properly when rebuilding cache, due to them being loaded before Cache Manager. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1381 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-16 17:08:25 +00:00
Jens Ayton
e965807751 Checked in a bunch of clean-uppery stuff from a broken branch I'm trying to fix. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1380 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-15 10:44:20 +00:00
Marc
d430e8b149 bounty / legal status = 0 fix 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1379 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-15 01:32:05 +00:00
Jens Ayton
ced18da6a3 Added optional missionKey parameter to JS mission.setInstructionsKey() to allow use from ship scripts and other non-world-script contexts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1377 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-14 18:51:04 +00:00
Jens Ayton
0715cd3f1e * Random name generation once again uses typographic apostrophe (no, it's _not_ an acute accent), but now properly excludes it for system names. 
* Removed pointless cache for relatively rarely used commodity display name lookup.
* Added playerEnteredNewGalaxy(newGalaxyNumber) script event.
* Changed descriptions.plist to OpenStep format.
* Descriptions.plist is now loaded before the first time it's used.
* -[Universe descriptionForKey:] and thus DESC() can now select a random string from an array.
* Added -[Universe descriptionForArrayKey:index:] for localization array lookups.
* Removed hard-to-localize [is-word] in favour of [system-description-string], and [adjusting-word] in favour of [clock-format] and [clock-format-adjusting].
* Removed redundant description strings [long-range-chart-find-planet] and [gameoptions-back].
* Moved mass-unit-to-string mapping to OOConstToString.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1376 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-14 17:23:24 +00:00
Nikos Barkas
8048f2f214 Fixed a small issue, where a ship set up with like_ship would get the display_name of its 'parent', if it happened to not have one of its own. Now, the display_name of the parent ship is used only if the ship we are trying to set up has neither display_name nor name in its dictionary. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1375 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-14 16:38:29 +00:00
Marc
0477d0e98e Fix for spawnship & possible fix for stations defenders, improved escorts logging. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1374 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-14 00:19:40 +00:00
Marc
3453859282 Corrected overuse of DESC to handle laser descriptions again. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1373 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-13 21:32:09 +00:00
Jens Ayton
98a4baf994 Tweaked SpiderMonkey build setup warning message. Fixed a cosmetic problem with -[AI dumpState]. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1372 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-13 11:55:19 +00:00
Marc
a5fd85ed95 Small tidying up of setUpEscort code and translation string handling, added the credit symbol to the ship purchase & planet info screens. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1371 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-12 21:04:59 +00:00
Jens Ayton
c5cec4efe2 Possible fix for JS mission.setBackgroundImage(). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1370 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-12 10:44:22 +00:00
Nikos Barkas
3d21ef4a20 For consistency, replaced shipInternalDescription JavaScript method with shipDisplayName. Made shipDescription return the ship name, like it was before. I believe it is cleaner this way. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1369 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-12 10:10:37 +00:00
Jens Ayton
d39e2d4149 Cleanup of tools directory (missed one). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1368 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-12 10:04:47 +00:00
Jens Ayton
89d2153413 Cleanup of tools directory. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1367 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-12 10:04:06 +00:00
Nikos Barkas
6253b91791 One more (forgotten) string moved out to descriptions.plist for i18n purposes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1365 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-12 07:14:29 +00:00
Nikos Barkas
acae755a7a Better method naming for the recently added commander_shipdisplayname script method. Remove a warning from GNUstep builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1364 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-11 16:40:58 +00:00
Nikos Barkas
d5a8ef0b56 Added the commander_shipdisplayname string substitution, updated trumbles mission accordingly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1363 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-11 13:00:02 +00:00
Jens Ayton
a6e6dbb6cc Removed redundant mapping of tab to space (done in code and in font generator). Exposed commodity display names to JavaScript as global DisplayNameForCommodity(). Made commodity symbolic name -> display name mapping case insensitive. NOTE: this changes keys in descriptions.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1362 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-11 12:21:11 +00:00
Nikos Barkas
5b7047074e i18n: Added support for displayName for ship entities. If displayName has not been defined in a ship dictionary, it is set to be same as name. This enables backwards compatibility with scripts that use for example the dockedStationName script method. Changed shipDescription JavaScript method to return displayName and introduced shipInternalDescription that returns the ship name. Added dockedStationDisplayName in script methods. Removed a temporary encoding log class that was creating plenty of clutter in the game log. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1361 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-11 07:52:19 +00:00
Jens Ayton
03f321da01 Font encodings now specified as descriptive strings. After much fiddling to get fonttexgen to use a PDF for the custom symbols, gave up and generated a big bitmap instead. Generated 1024x1024 Cyrillic font texture, other encodings coming soon. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1358 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-10 17:48:08 +00:00
Jens Ayton
77cde62c7b Made commodity display names localizable via descriptions.plist. Probably missed some cases. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1356 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-09 17:16:43 +00:00
Jens Ayton
65574daac5 Fix for ReferenceErrors when more than one JavaScript context active. Added various logs and script messages to debug escort issues. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1355 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-09 16:37:34 +00:00
Jens Ayton
7ef7991d91 Fix for free Fer-de-Lance bug. Custom escort AIs now set to FLYING_ESCORT state if appropriate. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1354 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-09 15:01:27 +00:00
Jens Ayton
bf6826ce39 Patches from Kaks: support for 'abs' co-ordinate system, and auto_ai support for escort set-up. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1353 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-07 19:51:00 +00:00
Jens Ayton
4c290ac3eb Fix for OOBasicSoundSource. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1352 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-07 18:48:18 +00:00
Jens Ayton
93c67d30d3 Added name property to SDL OOSound and OOMusic implementations. Possible fix for looping sounds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1351 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-07 18:06:34 +00:00
Jens Ayton
eaecc89efb Rewrote OOBasicSoundSource to match OOCASoundSource. Probably broke something in the process. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1350 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-07 11:08:35 +00:00