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

1042 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
9c9fc237c3 Unbroke Mac build (again). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1311 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-15 07:23:57 +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
454eb762ec Made newly added ship entities get crews only if they are not scanClass CLASS_CARGO or CLASS_ROCK. This way, when scooping scripted cargopods or boulders, for example, the correct scooped commodity is diplayed, instead of messages of the type 'You have captured a slave'. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1306 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-12 12:17:14 +00:00
Jens Ayton
804b2fea93 Fix for Asps not having lasers when bought. Subentities no longer count as kills (trunk only). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1305 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-09 01:11:38 +00:00
Nikos Barkas
8e769c7393 Fixed the selling ship with subentities causes crash bug. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1303 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-07 08:47:29 +00:00
Nikos Barkas
be3510bb9b Unbroke Mac build. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1302 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-07 06:39:49 +00:00
Nikos Barkas
c594f60e6b Fixed a few memory leaks (SDL builds only). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1301 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-05 11:26:05 +00:00
Nikos Barkas
1be12913a6 Fixed that weird bug where when one had many saved games in a folder, when selecting some of them, one would be thrown to an irrelevant gui screen instead of actually loading the saved file. Also corrected a comment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1299 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-05 10:05:33 +00:00
Nikos Barkas
6eb7c6b5c4 Bugfix: When docked with a non-primary station, the New Game option would be unreachable in the menu, although it was shown as available. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1297 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-04 13:23:32 +00:00
Nikos Barkas
07e3eec3c0 Improve speed of traversing saved games list by writing the current system name in the save file. When Oolite displays summary information about the saved game, it will try to look for this string. If the current system name string does not exist, it will fall back to using galaxy seed and coordinates to extract the system name. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1296 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-03 18:30:51 +00:00
Jens Ayton
2a2e31de07 More copyright strings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1295 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-02 14:38:49 +00:00
Jens Ayton
f2f194ee49 Fixed a bunch of warnings under Windows, some of which even made sense. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1294 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-02 14:35:54 +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
d6fcfe75d4 Missiles now use the accuracy variable to determine how well to track targets. Accuracy must be more than 1.0 and less than or equal to 10.0, otherwise it is ignored. Made the required Advanced Nav Array tech level equal to 7, as it was meant to be. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1291 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-01 15:38:28 +00:00
Jens Ayton
0fdae9aaa6 Fix (not very good) for crash when disconnecting remote debug console. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1290 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-30 12:55:08 +00:00
Nikos Barkas
5a426d635a Remove unnecessary duplicate assignment of legalStatus variable when purchasing ship (acknowledgment to Cmdr James for catching this). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1286 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-28 14:06:45 +00:00
Nikos Barkas
6ca231f13d Fixed bug #12791 (Purchasing a ship with an upgraded laser does not reward the laser). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1284 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-27 09:05:38 +00:00
Jens Ayton
3b655a4db4 Fix for plist cache-related crash when switching to/from strict mode. Fix for hang when trying to buy a ship if you don't happen to own a missile. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1283 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-24 23:06:03 +00:00
Jens Ayton
a97c9fd093 Fixed a few leaks, notably one that became serious on the short-range chart screen. Fixed some warnings when building for Windows. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1282 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-24 13:59:30 +00:00
Nikos Barkas
837407e4ac Fixed a small bug that was there since 1.65, whereby switching to equip ship screen would sometimes display information for equipment other than the normally selected missile, because selectedRow was not set correctly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1279 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-23 12:44:10 +00:00
Jens Ayton
de3b08129a Extremely minor tweaks; just synching two different working copies. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1278 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-23 10:59:56 +00:00
Nikos Barkas
b59aa4338e Do not allow fuel injectors on NPC ships if we are on strict mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1276 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-21 06:40:36 +00:00
Nikos Barkas
cb8b00e71b Fixed crash on attempting to select game to load. Note: The printf %llu modifier for unsigned long long may have to be used wherever credit quantities must be displayed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1275 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-14 08:00:19 +00:00
Jens Ayton
4919cb197e Changed OOCreditsQuantity to uint64_t. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1274 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-13 11:53:25 +00:00
Nikos Barkas
1dd0b50f52 Fix for trade-ins (like selling missiles or replacing lasers) not working. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1272 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-13 10:54:44 +00:00
Jens Ayton
3e845c4299 Fix for scanForRocks AI method only finding boulders. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1271 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-10 13:57:52 +00:00
Nikos Barkas
d2c81836ad Fixed laser purchasing mishandling bug in equip ship screen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1269 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-10 11:16:21 +00:00