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

3039 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc
aa0e3e913a - fixed typo in checklist 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3711 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-25 13:55:12 +00:00
Jens Ayton
66ad3928a7 Fixed galactic hyperspace, completely disabled in r3467/r3469. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3708 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-25 12:33:06 +00:00
Marc
461adb7268 - oops! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3707 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-25 12:09:18 +00:00
Marc
6ddd61a87f - more assert fun, but with quaterinions! :) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3706 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-25 12:00:52 +00:00
Jens Ayton
aa8cbd1978 Softened one more assert in OOJSVector. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3705 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-25 11:49:16 +00:00
Jens Ayton
b204309937 Corrected nonnull attributes for JS vector functions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3704 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-25 11:44:34 +00:00
Jens Ayton
649669ac9c Clarification on what can and can't be NULL in JSObjectGetVector. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3703 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-25 11:41:55 +00:00
Marc
76abce69b6 - Trunk fix: reverted an over-zealous assert from rev3594 that was causing a CTD, instead of just rejecting invalid values. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3702 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-25 11:29:41 +00:00
Marc
8bdfe5043c - fix: all sunskimmers should now have adequate heat insulation. (trunk & maintenance) 
- fix: removed ghost exhaust plumes visible when launching after quick docking. (trunk & maintenance)
- removed duplicate and conflicting MAX_UNIVERSAL_ID definition. Might have occasionally created duplicate universalIDs (trunk & maintenance)
- refactoring & cleanup of various addShip methods. Hopefully didn't break anything, and possibly fixed #17215 - 'Lollipops' flash in wrong spot when creating new ships. (trunk)
- some code cleanup (trunk)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3701 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-24 15:28:42 +00:00
Marc
dee27e6e88 - fixed unwanted scanner zoom reset when switching HUDs. (manifest & trunk) 
- code cleanup (trunk)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3699 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-22 20:27:19 +00:00
Jens Ayton
1cc13388dc Relaced two bogus implementations of -speed with one that actually works. Should only affect AIs trying to intercept drifting targets, though. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3698 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-22 15:00:39 +00:00
Jens Ayton
e115885f85 Fixed various collection-mutated-during-iteration bugs introduced in r3559. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3697 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-22 14:51:14 +00:00
Marc
6e61764764 - fix: wrong distance was displayed when resetting the target to current location in short range chart, noticed when switching back from long range chart. And removed travel time display if travel distance equals zero. (maintenance & trunk) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3696 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-21 18:34:00 +00:00
Jens Ayton
e555b472bd Cleaned up profusion of internal ExpandDescription...() variants. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3694 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-20 20:08:14 +00:00
Jens Ayton
714254fc16 More complex handling of expandDescriptions() overrides which actually works. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3693 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-20 20:07:13 +00:00
Jens Ayton
af2f82194c Restored legacy script engine string interpolation behaviour. (Bug #17193) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3692 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-20 19:42:35 +00:00
Jens Ayton
9f096cce0c Track vertex->face references in OOMesh loading to avoid O(m*n)-time algorithm for normal/tangent generation. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3691 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-20 19:12:59 +00:00
Marc
1716d54ac2 - fixed: Bug #17193 - Inline expand{Description|MissionText}() subst. priority. 
Substitution priority for expandDescription() & expandMissionText(): local, inline overrides now take precedence over mission variables and description.plist entries. This includes a fix for the corresponding leqacy script bug: local variables now take precedence over description.plist entries! ( maintenance & trunk )

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3690 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-20 16:00:31 +00:00
getafix
d1bc46dceb Applied Linux .desktop file improvement, as suggested in [Bug #17367]. (trunk & maintenance) 
Updated installation instructions for Linux .package files. (trunk & maintenance)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3689 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-19 22:39:52 +00:00
getafix
92b0b82ab4 Removed Linux PulseAudio dependency (trunk & maintenance). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3687 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-19 11:17:28 +00:00
Marc
b87a841e0f More stuff to do when bumping versions! :P 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3686 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-19 10:24:19 +00:00
Marc
85f9c04f5e - fix: show docking denied message only when station is in range. (trunk & maintenance) 
- various docking fixes ported to maintenance.
- updated maintenance changelog.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3685 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-19 09:41:23 +00:00
Jens Ayton
58be4de57b Fixed copy & paste error preventing shader program linkage from being verified properly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3682 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-18 12:17:11 +00:00
Nikos Barkas
8145667895 Unused Variables Patrol reporting offending variable eliminated. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3681 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-18 08:54:28 +00:00
Marc
99919cf0d4 - fix: no more bleached procedural planets on the F7 screen. (trunk & maintenance) 
- change: the position of the light illuminating the F7 screen now varies depending on the planet being shown - switchable at compile time(trunk)
- minor cleanup: there should be less wrongness with the planet orientation on the F7 screen now. (trunk)
- ai bugfix from rev3677 ported to maintenance.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3680 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-18 07:28:54 +00:00
Jens Ayton
e1e3541ae7 Rolled back r3678: messaging behaviour is a feature, not a bug, and convertor is a valid, albeit less common, spelling. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3679 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-17 19:08:53 +00:00
Marc
a170b5219a - rev3676 redux: the 'equipment destroyed' message is shown, if a script destroys the equipment, rather than show no message at all. Corrected a spelling mistake. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3678 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-17 17:51:12 +00:00
Eric Walch
6ee5ad11c4 Fixed bug with "exitting" pirates that wee blocked 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3677 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-17 16:35:16 +00:00
Jens Ayton
7145983a9d Equipment damage message is now suppressed if equipment is removed by a script in response to equipmentDamaged(). Also, it is now possible to remove damaged equipment with a script without repairing it first. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3676 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-17 12:51:25 +00:00
Jens Ayton
ace6bdf294 Fixed memory leaks in persistentFileReference. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3675 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-16 19:21:36 +00:00
Nikos Barkas
748b857484 Unbroken SDL builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3674 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-15 16:31:45 +00:00
Jens Ayton
4803800f1f Fixed copyright headers that got lost somewhere along the line. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3673 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-15 13:18:36 +00:00
Jens Ayton
6d4a55504a [Mac] screen shots directory can now be moved around (on the same volume). If it is renamed, Oolite deliberately ignores it and creates a new one on the desktop. The dock tile plug-in has not yet been updated. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3672 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-15 13:15:12 +00:00
Jens Ayton
61bbc84257 Reinstated prematurely removed logcontrol entry. Minor cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3671 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-15 09:23:58 +00:00
Marc
b29631c6f0 - change: if no weapon_energy is entered inside a turret's shipdata entry, the standard turret energy of 25 is used instead. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3670 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-14 23:34:28 +00:00
Jens Ayton
0e9b8e2aad Use NSMutableDictionary instead of OOCache in OOCacheManager, since OOCacheManager caches are never pruned, thus obviating the only feature of OOCache. (Note: OOCache is still used by OOTexture and OOEncodingConverter, which do use pruning.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3669 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-14 17:55:06 +00:00
Jens Ayton
8328dd8101 Cleaned up some copyright notices by special request. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3668 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-14 17:01:24 +00:00
Jens Ayton
9b395f61f2 Checked in comment missed in previous commit. Also, previous commit fixed a crash in JS callObjC() when methods return nil. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3667 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-14 16:29:12 +00:00
Jens Ayton
5b08d67a9e Fixed a couple of exceptions due to OOShipGroup mutation while being enumerated (backported). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3666 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-14 16:23:48 +00:00
Nikos Barkas
18727ce3bd Added caracal to contributors' list. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3665 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-11 17:20:03 +00:00
Marc
570a81ab35 Docking cleanup: 
- fix: all autopilot options (and docking clearance) now follow the same, consistent rules: no docking help at main stations if fugitive, no docking help at other stations if hostile.
- fix: no more 'docking clearance revoked' messages after 'no docking clearance needed' if player / station becomes hostile.
- change: hostile stations don't send friendly 'come on in' messages anymore.
- change: shift-c and c can now be used interchangeably to exit autopilot mode.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3664 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-11 01:28:12 +00:00
Marc
2cf12c159e - Linked resale value to amount of broken subentities. 
- Tweaked maintenance costs surcharge for repairing subentities.
- Minor code cleanup. 

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3663 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-10 13:03:27 +00:00
Nikos Barkas
6693eefd83 Made missile_load_time visible to JavaScript and ensured that it cannot be set to a negative value. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3662 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-09 12:22:03 +00:00
Marc
79976ad1ed A bunch of frangible ships changes, might be revised soon: 
- save games now remember whether the player ship's subentities are destroyed or not, and show them on the integrated load screen.
- maintenance overhaul now repairs subentities too. An extra fee is added to the price, proportional to the number of destroyed subentities.
- new js function: ship.restoreSubEntities() - repairs all subentities, returns false if no subentities were restored.
- new js property: ship.subEntityCapacity - the number of undamaged subentities the ship comes with.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3661 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-08 07:23:01 +00:00
Marc
46dbbb0396 - Trunk only: new key added to savegame: 'target_system_name'. Needed to identify which overlapping system is being targeted when saving the game. This should fix the last of the overlapping systems oddities. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3660 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-06 00:55:54 +00:00
Marc
0f26babb2d - fix: loading a game saved from an overlapping system should not get confused any more. 
- regression fix: loading a save game remembers the previously targeted system. (might still get confused by overlapping systems)
- minor code cleanup

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3659 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-05 23:22:18 +00:00
Marc
d55f4b758f - rev3642/3649 fix: after game over Oolite won't restart automatically. (trunk and maintenance) 
- fix: compile error when DOCKING_CLEARANCE_ENABLED isn't (trunk)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3658 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-05 02:55:49 +00:00
Marc
27fbf520d1 - ported individual stations' station_roll setting to maintenance. 
- fix: searching for one overlapping system by name in the long range map now should always identify the right system. (trunk & maintenance)
- docking clearance: all stations/carriers should now refuse docking clearance to hostile ships (trunk)
- more copyright cleanup

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3657 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-05 01:24:52 +00:00
Marc
a94d4b5bac - station_roll can now be used inside individual stations' shipdata.plist. If not found, use the systemwide override inside planetinfo.plist if defined, or standard station roll, as before. (trunk) 
- more copyright fun: replaced instances of em dash with '-' to help syncronise updates better, added copyright info to the profiling stopwatch.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3656 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-04 22:32:30 +00:00
Marc
65dff53391 - added one missing copyright info, and updated copyright notices in maintenance. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3655 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-04 18:39:27 +00:00