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

1076 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nikos Barkas
2df3399e06 Resolved music not looping problem in SDL builds. Removed 'interface may not respond to method' warning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1349 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-06 11:41:13 +00:00
Jens Ayton
cb2342e395 Removed call to -resetMissionChoice from -[PlayerEntity clearMissionScreen] because Eric said so, and sounds like he knows what he's doing. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1348 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-05 22:53:10 +00:00
Jens Ayton
51d4b0f5c5 Fixes for scanner and weapon range issues in scripts (submitted by Kaks). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1347 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-04 18:09:10 +00:00
Jens Ayton
6894d2669e Fix for setting Entity.energy (submitted by Kaks on board). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1346 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-04 09:04:15 +00:00
Jens Ayton
5950961729 Possible fix for crashes related to blowUpStation (dangling reference). Stopped caching OOMusic instances in ResourceManager. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1345 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-03 18:58:52 +00:00
Jens Ayton
97dbeb3910 Implemented JavaScript music interface. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1344 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-03 15:59:33 +00:00
Jens Ayton
cba45c8e05 Broke music control out into a separate controller in preparation for JavaScript music interface. As a side effect, mission music should work on SDL builds, and the theme music should loop. I hope. To do: add music Off/On/iTunes control to config menu. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1343 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-03 15:44:24 +00:00
Jens Ayton
68ff8d3fae Fix for scan class searches. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1342 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-03 11:52:42 +00:00
Jens Ayton
d552b1bb33 Told makefile about JS sound stuff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1341 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-03 02:37:45 +00:00
Jens Ayton
f11b6fae14 Implemented JS sound interface. Moved some more generic JS ObjC wrapper stuff into OOJavaScriptEngine. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1340 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-03 02:16:23 +00:00
Jens Ayton
907340dfc8 Fix for missionScreenEnded not being called when launching during a mission screen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1339 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-03 00:27:44 +00:00
Nikos Barkas
d6be045ba9 Corrected a small parse error in oolite-font.plist that was preventing the white star character from appearing on the GNUstep builds (thanks Ahruman). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1338 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-02 10:58:00 +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
d3db589df3 Added 'don't use runLegacyScriptActions()'. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1335 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-01 18:27:54 +00:00
Nikos Barkas
b5ff48d62d Disabled code checked in at revision 1318, that would permit user script usage of runLegacyScriptActions. Now using the pre-1318 code again. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1334 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-01 14:39:59 +00:00
Nikos Barkas
f89bd82b8f i18n: Some languages, like German, use capitalized adjectives and nouns. If the key lowercase_ignore is set to true in descriptions.plist, Oolite will capitalize weapon and species descriptions whenever required (currently shipyard and contracts screen). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1333 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-31 10:06:10 +00:00
Nikos Barkas
26ade7650f i18n: Differences between singular and plural adjective forms are now taken into account when building the species name in the passenger contracts screen. Oolite will expect a total count of 8 subarrays in descriptions.plist, inhabitants key (5 standard + 3 singular adjective forms). If it fails to find eight, it falls back to the standard scheme used up to now. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1332 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-30 16:56:29 +00:00
Nikos Barkas
036704ee3c Slightly better fix for laser bug. Corrects laser hiding itself behind sun without affecting the appearance of all other particle entities. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1330 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-29 10:57:20 +00:00
Nikos Barkas
5883f93a80 Fixed lasers disappearing behind the sun bug. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1328 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-29 10:20:02 +00:00
Jens Ayton
a84fd956b1 Added cache profiling code for new text encoding converter. Cache hit rate is over 99.9%. Cleaned up file comments. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1327 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-28 09:52:19 +00:00
Nikos Barkas
2d0f47c98d Updated GNUmakefile with new source file. Fixed warning in HeadUpDisplay.m 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1326 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-28 08:42:34 +00:00
Jens Ayton
07fc2a25b6 Fixed some bugs in OXP verifier. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1325 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-28 01:24:40 +00:00
Jens Ayton
519322f118 Cleaned up a little. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1324 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-27 23:45:49 +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
4d4ff0de25 Fixed unmarkSystem crash. Made ship AI send a beingAttacked message to scripts when a missile is fired against ship. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1321 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-27 12:04:34 +00:00
Jens Ayton
2175f6add3 Font texture is now single-channel alpha map instead of RGBA. Fixed compiler warning for OS X. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1320 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-26 22:15:58 +00:00
Nikos Barkas
5f204ee828 Changed handling of equipment.plist merging. Variable names are now somewhat better and the code itself is targetted to apply only on equipment.plist, which was the original intention anyway. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1319 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-21 17:25:08 +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
a4590f0579 Fixed crash in shipyard screen (thanks Influence D). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1317 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-20 09:50:44 +00:00