754 Commits

Author SHA1 Message Date
Michael Werle
c085bcdd2b Autopilot controls revamp, as discussed.
- c now tries to dock either at the players' current target, a nearby station, or the system main station.
 - Shift-C does the same, except attempts a fast-dock if the station allows it.
Added a new key 'allowsFastDocking'. Defaults to YES for the system main station, and NO to all other stations.
 - Shift-D is no longer used.
Also, autopilot will no longer engage on Condition Red.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3783 127b21dd-08f5-0310-b4b7-95ae10353056
2010-10-28 19:55:35 +00:00
Nikos Barkas
8f6c69079f Weapons online/offline toggle control can now be assigned to joystick button too.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3776 127b21dd-08f5-0310-b4b7-95ae10353056
2010-10-22 22:30:09 +00:00
Nikos Barkas
0fa1256a88 Added the weapons down message on the small hud too.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3775 127b21dd-08f5-0310-b4b7-95ae10353056
2010-10-21 10:16:48 +00:00
Nikos Barkas
05694cebdc Implemented weapons lockdown toggle. Defaults to '_' and the weapons online/offline status is saved in the player's savefile. Affects lasers, missiles, mines and energy bomb.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3774 127b21dd-08f5-0310-b4b7-95ae10353056
2010-10-21 09:27:33 +00:00
Eric Walch
b4e88583c5 - changed code that made that every entity, including subentities got an escortGroup.
- further tweaks in jink setting for dealing with high speed approach
- added code to route1patrol that allows escorts in this AI to sometimes start escorting again.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3771 127b21dd-08f5-0310-b4b7-95ae10353056
2010-10-17 10:51:23 +00:00
Eric Walch
97733ee069 - added report messages for pilots that have both a bounty and an insurance.
- ships that become a hulk are now removed from any group they belonged to.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3766 127b21dd-08f5-0310-b4b7-95ae10353056
2010-10-05 19:11:24 +00:00
Eric Walch
9838e68a1c - allow a player ship that is to big for a dock to launch.
- small changes to the jink values and test locations for proximity
- allow proximity warnings for stations in certain situations.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3764 127b21dd-08f5-0310-b4b7-95ae10353056
2010-10-02 15:27:06 +00:00
Eric Walch
7b0c256e99 - launchPolice and launchDefenseShip now add the ships in front of the launchQueue.
- escorts can no longer, wrongly, escorting ships that already entered witchspace.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3760 127b21dd-08f5-0310-b4b7-95ae10353056
2010-09-24 11:12:36 +00:00
Eric Walch
5042c648eb - Added a size check for launching and docking ship.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3759 127b21dd-08f5-0310-b4b7-95ae10353056
2010-09-19 09:30:46 +00:00
Eric Walch
3c099b9a59 - Added AI command: thargonCheckMother for a more efficient thargon handling.
- Improved the thargletAI slightly.
- Changed policeInterceptAI so that launching ships without target immediately clear the launch area.
- Moved the constrictor script from shipData to the worldScript. (to prevent problems with bad oxp copies of the constrictor)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3752 127b21dd-08f5-0310-b4b7-95ae10353056
2010-09-16 20:13:01 +00:00
Marc
9adaf521b7 - more accurate aft laser resell price.
- some code cleanup.
- OXP change: added new shipdata.plist key 'hyperspace_motor' if set to NO, no NPCs or player ships can enter witchspace on their own. Defaults to YES if not specified. Fuel injection and galaxy jumps are not affected by this change. New translation strings added and GUI screens updated to accommodate this change.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3739 127b21dd-08f5-0310-b4b7-95ae10353056
2010-08-21 13:43:09 +00:00
Jens Ayton
d16dc20f0b All scripts now use underscore prefix for custom properties. Also general cleanup and linting.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3732 127b21dd-08f5-0310-b4b7-95ae10353056
2010-07-30 21:54:50 +00:00
Jens Ayton
723846018e Exposed global object as property of itself, instead of fiddling around with silly functions where it's needed.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3730 127b21dd-08f5-0310-b4b7-95ae10353056
2010-07-30 20:00:46 +00:00
Jens Ayton
cbf12be920 Asteroids spawned as post-nova debris are now effectively heat-proof. This is achieved with a new standard role: cinder.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3728 127b21dd-08f5-0310-b4b7-95ae10353056
2010-07-28 15:00:14 +00:00
Marc
cabe9792c7 Undocking in interstellar space is now possible:
- to enable the new functionality, added the interstellar_undocking key to station/carriers. If "interstellar_undocking" = YES; , the station will remain where it is instead of moving to the nearest system, as it's always been the case up to now.
- quick fix to the nova mission to take this new possibility into account.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3725 127b21dd-08f5-0310-b4b7-95ae10353056
2010-07-28 12:01:39 +00:00
Jens Ayton
fc0d9a962d removeCargo now recalculates available cargo space. Specifying an empty string for a ship's script now acts as though no script was specified.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3723 127b21dd-08f5-0310-b4b7-95ae10353056
2010-07-27 20:06:55 +00:00
Jens Ayton
07b8dfa646 Trumble random reset fix as per http://aegidian.org/bb/viewtopic.php?p=115179#115179
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3722 127b21dd-08f5-0310-b4b7-95ae10353056
2010-07-27 18:34:08 +00:00
Jens Ayton
e94eddecea Accumulated minor cleanup.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3720 127b21dd-08f5-0310-b4b7-95ae10353056
2010-07-26 19:37:31 +00:00
Marc
78f2a3ac05 Trunk only for now:
- fix: if looking at the commodity market while in hyperspace, just show 'Commodity Market' with null values as opposed to '(Nearest System) Commodity Market' - new translation string.
- fix: Stop fuel scoop activity indicators when standing still inside the corona and no scooping is actually taking place. 

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3717 127b21dd-08f5-0310-b4b7-95ae10353056
2010-07-26 11:50:58 +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
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
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
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
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
Marc
2448a4f38f - OK, now all copyright notices inside the code should be up to date!
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3654 127b21dd-08f5-0310-b4b7-95ae10353056
2010-07-03 18:45:37 +00:00
Eric Walch
aacb61e8fb behaviour_fly_from_destination now does let a ship fly in the correct direction.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3650 127b21dd-08f5-0310-b4b7-95ae10353056
2010-07-03 10:11:00 +00:00
Marc
fe9d9da2f9 * fixed inconsistent disabling of 'custom view' key while in flight: it's now disabled only in the long range map (to allow input of system names), enabled everywhere else.
* reduced - but not yet eliminated - the blue flash caused by wrongly drawn exhausts after hyperspace jumps.

- minor comments & log output cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3644 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-30 18:18:31 +00:00
Jens Ayton
8e9e906b76 Backported generalization of SystemInfo.systemsInRange() (oops - intended to do that for 1.74.1). Don't use multi-texture materials on hardware which doesn't support it.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3639 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-28 18:15:31 +00:00
Jens Ayton
637b7042ef Updated trunk changelog.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3630 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-27 17:38:31 +00:00
Jens Ayton
cf36d4f7fa Added JS system.scrambledPseudoRandomNumber().
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3614 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-26 15:46:26 +00:00
Jens Ayton
c54fe64bbf Updated Mac OpenGL context handling to be slightly more similar to recommended best practice. Doesn't actually _follow_ best practice because best practice only works in Snow Leopard. Also, avoid unnecessary graphics reset during startup.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3611 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-26 13:18:31 +00:00
Jens Ayton
8749abb049 Switched gpu-settings.plist to a dictionary, for useful merging behaviour. Added explicit precedence setting.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3589 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-22 20:39:41 +00:00
Nikos Barkas
c3061d4029 Fixed some breakage in equipment.plist. Upgraded Windows GNUstep base library to version 1.18.0.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3584 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-21 07:46:03 +00:00
Marc
e84a0d339c - fix: short range map highlight should have dealt with system info icons, as well as system names. (trunk & maintenance)
- more equipment tweaks, hopefully sensible ones. (trunk)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3583 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-21 01:18:02 +00:00
Marc
fb228765e3 Corrected mission text typo. (trunk & maintenance)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3579 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-19 19:56:05 +00:00
Jens Ayton
6ded4261b2 Cleaned up canAwardEquipment - now admits the existence of canAwardMultiple equipment, and has less redundancy. Added available_to_player and available_to_NPCs properties for equipment. Exposed five new equipment properties to JS.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3578 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-19 19:18:41 +00:00
Jens Ayton
16b8d30f54 Trumbles are no longer listed as equipment on status screen - hard-coded in maintenance, equipment attribute in trunk.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3577 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-19 18:36:10 +00:00
Jens Ayton
fc408bd911 Disabled shaders for that horrible lying VirtualBox thing.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3574 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-19 15:50:25 +00:00
Eric Walch
749ea7de08 Make sure the mission version of the constrictor always has a bounty, even when a constrictor version from a third party is chosen.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3571 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-19 13:37:34 +00:00
Jens Ayton
b084484661 Implemented stack trace for AI recursion error.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3570 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-19 13:10:55 +00:00
Jens Ayton
86436966f2 Re-enabled maximum_shader_level settings (trunk).
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3569 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-19 11:50:35 +00:00
Jens Ayton
be0ba9331c Disabled shady dust on GMA 9XX systems (where vertex shaders are handled on the CPU).
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3568 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-19 11:45:00 +00:00
Jens Ayton
b5c5b5547d Tidied up prefix script a bit. Use longer timeout when loading scripts (accidentally omitted from r3550. Sorted JS Ship methods.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3566 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-19 09:42:04 +00:00
Marc
46c4badaa7 - Change: Thargons will now use the standard 'EQ_THARGON' identifier internally. Should still accept the non-standard 'thargon' identifier as a an alias - there might well be related breakages! (trunk)
- Change: reworded debug console error messages. (trunk & maintenance)
- Comment cleanup. (trunk)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3561 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-18 08:41:35 +00:00
cmdrjames
4249c7ef7b Deferred changes that I have been waiting for end to code freeze.
Slight change to laser purchasing which should end the problems with some configurations not being possible.
Add scripting for overriding fuel scoops so that people can have scooping effects for their own equipment or can do clever stuff with extra suns or whatever.
Some rationalisation of magic numbers, so we check constants or methods rather than inline magic numbers.
Little bit more logging.
Change time spend in wormhole to be 3/4 of full jump, maths to prove it is optimal for gameplay available from PhantorGorth.  Time of flight discussed in thread http://aegidian.org/bb/viewtopic.php?t=7917

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3549 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-15 20:38:40 +00:00