33 Commits

Author SHA1 Message Date
Jens Ayton
46c40ec186 More graceful handling of disappearing docking target.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3308 127b21dd-08f5-0310-b4b7-95ae10353056
2010-05-09 15:21:06 +00:00
Jens Ayton
29e904f0f6 More work on player shader binding issue: implemented ProxyPlayerEntity class.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3052 127b21dd-08f5-0310-b4b7-95ae10353056
2010-03-03 21:23:31 +00:00
Jens Ayton
a4382b451f Fixed bug where space dust velocity ignored inertial velocity of player, taking only thrust into account. Exposed player velocity to JS. Initial work on fixing player-only shader binding issue described at http://aegidian.org/bb/viewtopic.php?p=103930#103930 .
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3051 127b21dd-08f5-0310-b4b7-95ae10353056
2010-03-03 18:04:06 +00:00
Jens Ayton
a90629799d Added lightsActive JS ship property and shader binding, tied into switchLightsOn/switchLightsOff.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3013 127b21dd-08f5-0310-b4b7-95ae10353056
2010-02-09 16:56:04 +00:00
Marc
3320a6bc4d - Faster lights on/off implementation for shaders (as per bug #16268), included within a slight lighting & update method rewrite. Not directly usable as dimmer switch yet, but can be easily adapted to that purpose.
- OOGL wrapper added to a few stray opengl instructions from a previous commit.
- Possible fix for lower end graphic cards F7 lighting direction bug, as reported by a_c.
- Hopefully the last rename for the 'old' setSunCenterPosition method from rev2936

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2962 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-11 20:53:02 +00:00
Marc
193a5b5c4c - Lights on on/off switch added to shaders, could also be used as a dimmer switch in the future. :) This should finally fix bug #16268: Lighting issues for shaders.
- HUD whitelisting, part 0.5!

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2952 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-10 10:23:20 +00:00
Nikos Barkas
c2edf2238f Fixed a typo in whitelist.plist and removed references to methods removed in previous commit.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2781 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-24 21:15:40 +00:00
Jens Ayton
9bbc3845c1 Fixed questionable use of release in launchIndependentShip:, and moved some trivial aliases of launchIndependentShip: into whitelist aliasing mechanism.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2780 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-24 18:37:41 +00:00
Jens Ayton
07902c2b70 Whitelisted setPrimaryRole: for AIs, and made setStateTo: a normal method.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2734 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-11 15:24:34 +00:00
Eric Walch
d80f8a1bfd Added a AI command "setThrustFactorTo:" Re-added the group feature for missiles with Thargoid scanclass after having seen some friendly fire going on between a thargoid and a tharglet.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2713 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-27 17:27:33 +00:00
Eric Walch
19ad69a4f3 Added AI commands: setCoordinatesFromPosition and checkEnergy. Used these commands in pirateAI.plist to send pirates back to their original position after a fight so they keep together as a group.
Player now sends "CARGO_DUMPED" to all ships in range. Pirates with cargo room can now react on this.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2518 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-19 10:12:54 +00:00
Eric Walch
eba04c02fc Added an AI command "checkAegis" that recalls the aegis messages. When traders or patrols go into a wayPointAI.plist or an interceptAI.plist they sometime miss this message. Now they can use checkAegis on RESTART.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2369 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-03 19:44:45 +00:00
Jens Ayton
f5981205f7 Removed defunct method groupID from shader whitelist; suppressed some noisy log messages.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2351 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-01 21:56:53 +00:00
Jens Ayton
6a9c1ff4e8 Updated whitelisting mechanism to allow both world script actions and AI actions in the following script types: ship actions (called through JS ship.runLegacyShipActions), rescued character scripts, scriptActionOnTarget:/safeScriptActionOnTarget:. System script_actions are restricted to world script actions.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2304 127b21dd-08f5-0310-b4b7-95ae10353056
2009-08-23 16:16:54 +00:00
Eric Walch
87a4359592 Added setStateMachine: to the whitelist as alias of setAITo:
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2296 127b21dd-08f5-0310-b4b7-95ae10353056
2009-08-20 09:23:41 +00:00
Eric Walch
fb4f1d6690 Added AI command "setSpeedToCruiseSpeed". Populator no longer changes AI for ships with auto_ai is false. Bounty for script added pirates and traders follow now populator rules when auto_ai is true.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2271 127b21dd-08f5-0310-b4b7-95ae10353056
2009-08-01 11:56:30 +00:00
Eric Walch
758a6d0b1c Added a checkOwnLegalStatus command and used it for a career selection for escorts. Added a playerBoughtNewShip eventhandler. Hardcoded Xeer back in missiontext were it revers to the previous galaxy.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2266 127b21dd-08f5-0310-b4b7-95ae10353056
2009-07-26 11:20:42 +00:00
Eric Walch
7842440808 Added a new AI command launchIndependentShipWithRole. Gave sunskimmers heatshielding so they get a chance to jump. Added missile delay to sunskimmerAI.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2259 127b21dd-08f5-0310-b4b7-95ae10353056
2009-07-24 19:51:37 +00:00
Eric Walch
706bb46790 Fixed rare bug in various AI files. Added a randomPauseAI command and added a delay to trader reactions on incoming missiles.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2229 127b21dd-08f5-0310-b4b7-95ae10353056
2009-07-08 16:20:10 +00:00
Jens Ayton
d950757ccb Exposed abortAllDockings and throwSparks (or more precisely, setThrowSparks:YES via a shim aliased as throwSparks) to AI. Fixed a typo in an error message.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2219 127b21dd-08f5-0310-b4b7-95ae10353056
2009-06-24 21:59:00 +00:00
Jens Ayton
5dac3c459e Reload speech stuff when changing game modes on all platforms; avoid exception due to mutating escort list while iterating it; made legalStatus_number alias of commanderLegalStatus_number (implementations were identical).
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2098 127b21dd-08f5-0310-b4b7-95ae10353056
2009-03-20 15:27:56 +00:00
Jens Ayton
557a353cc4 Subentity definitions can now be dictionaries, and this is now used as the internal format. Ship registry now uses mutable dictionaries for entries while working on them for simplicity, and uniques strings and numbers once done for efficiency (in the same way binary plist generation does for the cache... I really should double-check that GNUstep does that). Also simplified handling of external views, fixing a crashing bug (triggered the third time the player died) in the process.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2051 127b21dd-08f5-0310-b4b7-95ae10353056
2009-02-11 17:37:20 +00:00
Jens Ayton
f16fde924e Whitelisted exitAIWithMessage:
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2047 127b21dd-08f5-0310-b4b7-95ae10353056
2009-02-09 22:45:54 +00:00
Jens Ayton
3c89480647 AI tweaks: added exitAIWithMessage: and messageSelf:, made exitAI alias of exitAIWithMessage: RESTARTED, added optional message parameter to JS Ship.exitAI().
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2044 127b21dd-08f5-0310-b4b7-95ae10353056
2009-02-08 20:39:48 +00:00
Jens Ayton
614341a04d Implemented dropMessages: and debugDumpPendingMessages AI commands. Added experimental dealyedReactToAttackAI, and used it in planetPatrolAI.plist (which was previously ignoring missiles).
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2022 127b21dd-08f5-0310-b4b7-95ae10353056
2009-01-31 14:16:53 +00:00
Jens Ayton
475398f489 Full sript whitelisting support. Some script actions and conditions could do with pre-sanitizing.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2013 127b21dd-08f5-0310-b4b7-95ae10353056
2009-01-25 20:15:42 +00:00
Jens Ayton
164fd3f2e9 Implemented whitelisting for legacy script conditions, and accidentally optimized evaluation while at it. Conditions for world scripts are currently sanitized (i.e. whitelisted, aliases resolved, syntax checked and partially tokenized) on the fly; this will be cached once sanitizing is implemented for actions. Deleted unused class OOLegacyEventHandlerScript.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1998 127b21dd-08f5-0310-b4b7-95ae10353056
2009-01-16 01:24:01 +00:00
Jens Ayton
7e258819b9 Implemented shader uniform binding whitelisting.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1997 127b21dd-08f5-0310-b4b7-95ae10353056
2009-01-13 08:51:46 +00:00
Jens Ayton
3997e2c835 Merged -[ShipEntity nearestPlanet] and -[ShipEntity nearestLargeBody]. Cleanup. Added uniform bindings to whitelist.plist.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1996 127b21dd-08f5-0310-b4b7-95ae10353056
2009-01-12 19:47:11 +00:00
Jens Ayton
7c2ab9b595 It's a good idea to save everything before checking in.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1995 127b21dd-08f5-0310-b4b7-95ae10353056
2009-01-12 18:32:43 +00:00
Jens Ayton
46c7fef016 Whitelist fixes based on forum suggestions.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1994 127b21dd-08f5-0310-b4b7-95ae10353056
2009-01-12 18:19:27 +00:00
Jens Ayton
b02f108735 Implemented AI validation OXP verifier stage. Removed invalid and unused shuttleAI.plist.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1993 127b21dd-08f5-0310-b4b7-95ae10353056
2009-01-12 18:04:02 +00:00
Jens Ayton
3b1db9072d Work towards securing legacy scripts, AIs and shader uniform bindings by whitelisting methods. Game will now print an error message if non-whitelisted methods are used in AIs; in 1.74, this will be changed to dropping non-whitelisted commands from AI actions. My intention is to have similiar mechanisms in place for scripts and uniform bindings by 1.73 release.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1991 127b21dd-08f5-0310-b4b7-95ae10353056
2009-01-11 15:53:01 +00:00