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

70 Commits

Author SHA1 Message Date
Nikos Barkas
d97720b1a7 Even more hardcoded strings found and externalized. Are they ever going to end? 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1658 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-29 10:55:00 +00:00
Nikos Barkas
132a643af6 Two more hardcoded strings out to descriptions.plist 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1636 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-14 14:14:13 +00:00
Jens Ayton
ff322eafcb Fix for bounty and contract market credits display bugs. Fix for rounding of credits quantities. Added troubleshooting code to scanForNonThargoid. Suppress script.javaScript.context.create messages. Made property list extractors for strings auto-convert numbers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1601 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-30 19:13:02 +00:00
Jens Ayton
fba5cb83b1 Removed redundant [UNIVERSE gui] calls in PlayerEntityControls. Added Spotlight indexing of system name and made ship name visible in Get Info window (OS X only). Added new formatting functions for credit quantities, used throughout. DESC() now returns the key if no string can be found, to avoid exceptions. I18Ned OXP incompatibility message. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1581 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-23 16:56:23 +00:00
Jens Ayton
07d8d4ae50 I18ned Groolite mode strings. Use typographic multiplication sign for screen resolution strings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1578 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-22 16:13:03 +00:00
Jens Ayton
b07b78a42d Fix for formatting mismatches between unsigned long long credit quantities and %d format specifiers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1575 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-20 21:58:06 +00:00
Jens Ayton
a3cd6cf6ca Stuff from r1565-r1566, now with not doing the svn in src/. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1567 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-20 15:02:38 +00:00
Marc
6ef2d66b16 JS Bugfix: changes to local system properties (tech level, government, etc...) now take effect immediately. Minor change to a new description string. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1545 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-06 00:18:03 +00:00
Marc
cc9f7cd857 Energy unit changes: energy units recharge rate adjusted to offer a better challenge to the player, and naval/extra energy unit purchase behaviour more flexible (see resolution of Bug #13507, Naval Energy Unit bug in berlios). Warnings added if energy units are going to be removed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1544 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-05 16:12:59 +00:00
Jens Ayton
69003c93ed Added Thargoid Curses to SystemDescription.dot output, and changed the Eat Foo, Bar! insult to use more varied values of Foo. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1521 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-28 09:31:35 +00:00
Marc
3990d547dc Minor plists cleanup, added player.equipmentStatus & player.setEquipmentStatus, to allow damaging and repairing equipment via javascript. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1511 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-25 03:38:50 +00:00
Marc
96330a81a4 Demo2 bugfixes & changes: demo ships calculated at each update, missing/broken ship models displayed as question marks on demo screen, missing textures displayed as no-textures-material. Updated question mark mesh and no-textures-material. Hopefully did not introduce any new bugs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1497 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-21 16:54:43 +00:00
Jens Ayton
9cfe8c910a Removed all magic equipment flags. Moved equipment list into ShipEntity. Ship loading and saving now mostly uses OOCollectionExtractors, and is generally simpler and more robust. Be on the lookout for interesting new equipment-handling bugs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1490 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-16 23:16:07 +00:00
Jens Ayton
f67b87aa0d Ahruman's dazzling distraction attack strikes again. All beep, boop and click sounds now go through customsounds.plist. Setting the player's target through JS now works more or less as expected (locks on ident, with UI feedback, unless a missile is selected in which case current missile is locked on to the new target). Custom sound tags can now expand to other custom sound tags (with recursion checking), and final results are cached. No actual progress on the nova script I thought I was working on. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1477 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-11 19:49:46 +00:00
Jens Ayton
627e5a9b57 shipWillLaunchFromStation() is once e again called for the player. Ejected items and debris are now spawned with 85% of the parent's cabin temperature. Incompatible OXP message is now loaded from descriptions.plist, but only the internal descriptions.plist; listing incompatible OXPs and generating the messages later would be a better approach. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1476 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-11 08:25:42 +00:00
Jens Ayton
197119ccc8 All scripts now JavaScript -- adopted somewhat twiddled versions of Eric's scripts, with the cleanup stuff removed (premature optimization is the root of all evil; I'll put it back in if anyone has profiling information indicating it's actually a win). Moved the mission screen function into global-prefix as a generally-available utility function. Wrote JS scripts for the two remaining ships using death_actions. Added Ship.explode(), which kills any ShipEntity through energy damage including the main station. Once again made blowing up the main station with blowUpMainStation (or explode()) work. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1473 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-10 00:01:30 +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
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
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
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
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
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
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
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
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
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
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
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
Nikos Barkas
8a388b2b6a Escorts are now working again, hopefully without side effects. Replaced acute accent with apostrophe in the main digrams string in descriptions.plist, because it was causing invalid planet names generation. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1336 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-02 09:25:16 +00:00
Jens Ayton
c812e61ad9 More data-driven text rendering with eight-bit encoding support. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1323 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-27 23:37:56 +00:00
Nikos Barkas
40007231b6 Fixed a problem where a ship having a script pre-assigned would not get its scriptactions set. Ships getting destroyed now can respond to whom and why queries for shipDied. Removed hardcoded text from trumbles script. Fixed a typo in descriptions.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1318 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-21 07:29:31 +00:00
Nikos Barkas
c47f8db6aa Fixed a small problem with the shader effects option being displayed incorrectly. Some more strings externalized. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1316 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-19 10:57:41 +00:00
Nikos Barkas
e7f0b0e316 Made the Y/N response on the intro1 screen user settable. Also fixed a problem with descriptions.plist that was generating incorrect planet descriptions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1315 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-18 07:16:19 +00:00
Nikos Barkas
049a9ab4eb A few more hardcoded strings externalized. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1314 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-17 17:32:46 +00:00
Nikos Barkas
7b68d32e5f Fixed a bug in the contracts screen, where premium and fee for passengers would be displayed incorrectly, as a result of attempting to display unsigned long longs as ints. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1313 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-17 16:45:32 +00:00
Nikos Barkas
869baca25a Made arrays mergeable like dictionaries, thus enabling for example OXP created equipment to override the standard one instead of being added on top of it. More internationalization farming outto shipdata.plist. By now, all (or almost all) game strings should have been externalized. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1312 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-16 08:27:38 +00:00
Nikos Barkas
295fa03c8e Even more game strings moved to descriptions.plist for the purposes of making Oolite multi-language capable. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1310 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-14 18:35:12 +00:00
Nikos Barkas
0bce1be2ed More game strings moved out to descriptions.plist. Also added the commsMessageByUnpiloted method, but its code is disabled until approved for inclusion. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1309 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-14 07:18:46 +00:00
Nikos Barkas
00da1bed7e Farmed out all displayable constant game strings to descriptions.plist, as a first step in adding full multilingual support to Oolite. Testing required. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1308 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-13 14:24:10 +00:00
Nikos Barkas
d9e11be684 Tweaked missile accuracy so that it is handled in a saner way than before. Valid values for accuracy of missiles are now from 0.0 to 10.0, as one would expect and m.a. is clamped to this range at entity initialization. Also updated the date strings appearing in the game to reflect new year change. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1292 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-02 06:25:41 +00:00
Nikos Barkas
b047c76b40 Fix legal status not displaying. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1013 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-09 08:54:16 +00:00
Jens Ayton
9137ef4581 Clean-up of various methods in connection with documenting uniform binding mechanism. Tweak to syntax for said mechanism. Bumped version number to 1.69. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1011 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-08 12:59:08 +00:00
Jens Ayton
05e5a0282f Hack to change Apple plist DTD to GNUstep plist DTD at runtime for XML plists. Added license clarification to OOFastArithmetic.m. Updated year in startup copyright message. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@876 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-30 12:19:21 +00:00
Jens Ayton
ec55398a9d Broke cache out into separate OOCacheManager class. Moved cache (under OS X) to ~/Library/Caches/org.aegidian.oolite/Data Cache.plist. Use binary plist format (on OS X) for cache. Detect byte sex mismatch in cache handling. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@831 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-06 23:50:32 +00:00
Giles Williams
91320d4db4 tweaks to planet textures - planet-shader removed 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@739 127b21dd-08f5-0310-b4b7-95ae10353056
 2006-08-21 19:02:44 +00:00
Giles Williams
9d7c7cf11f more work on planet textures and shaders 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@734 127b21dd-08f5-0310-b4b7-95ae10353056
 2006-08-18 23:42:55 +00:00
Giles Williams
715de84b12 improvements to docking subroutines 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@605 127b21dd-08f5-0310-b4b7-95ae10353056
 2006-06-23 10:19:27 +00:00
Giles Williams
8f35abf10b replace percent symbol with text 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@589 127b21dd-08f5-0310-b4b7-95ae10353056
 2006-06-17 08:43:50 +00:00