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

369 Commits

Author SHA1 Message Date
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
204bb2248d Made logging-echo-to-stderr preference work on all platforms; updated header comment in logcontrol.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2021 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-31 12:51:48 +00:00
Jens Ayton
8275ac7cc0 Removed now-pointless logging-show-app-name option. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2015 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-27 21:43:34 +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
Nikos Barkas
819c878a0c Made procedurally textured planets a game option. Requires definition of the ALLOW_PROCEDURAL_PLANETS macro. Procedurally textured planets as a debug flag remains by defining the ALLOW_PROCEDURAL_PLANETS_AS_DEBUG_FLAG. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2006 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-21 18:22:43 +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
Jens Ayton
14e48aad0e Removed unused port_radius attributes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1978 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-07 23:49:45 +00:00
Jens Ayton
c434cb64f1 Implemented AI method scanForNearestShipMatchingPredicate:. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1977 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-07 23:27:49 +00:00
Jens Ayton
0319297410 Fix for AI restart in policeInterceptAI as per http://aegidian.org/bb/viewtopic.php?p=65011#65011 . 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1964 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-04 00:45:24 +00:00
Nikos Barkas
c910d93bc9 Fixed a syntax error in the Cloaking Device mission script. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1952 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-01 17:20:54 +00:00
Jens Ayton
ced2067f48 Bad flasher definitions, and bad subentity definitions for frangible ships, no longer stop a ship from loading. Fixes to suppress spuripous warnings from clang static analyzer. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1945 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-31 15:45:49 +00:00
Jens Ayton
c3627ea200 Changed cloaking device pod script to use recommended way of testing for player. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1933 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-29 16:09:10 +00:00
Nikos Barkas
8882503eab Fixed the Cloaking Device mission. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1930 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-29 07:02:16 +00:00
Nikos Barkas
c0fc080213 Added docking clearance request key to keyconfig.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1926 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-28 12:17:20 +00:00
Jens Ayton
c9f22eacfb Hot new data-driven crosshairs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1911 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-17 00:40:09 +00:00
Jens Ayton
cda597ce89 Made addShips: family diagnostic messages slightly less bad. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1906 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-13 10:21:31 +00:00
Jens Ayton
e6101522ab Fixes to plist schema verifier (any delegated type would cause verification to fail silently). Added requires_docking_clearance to known keys for stations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1904 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-13 01:12:55 +00:00
Jens Ayton
a26e612250 Minor tweaks to Mac startup screen; added code for preloading/caching of all meshes, disabled until I finish some refactoring of OOMesh. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1899 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-10 19:23:01 +00:00
Jens Ayton
bc07f0e740 Changed %X string code to %N. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1893 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-05 12:33:56 +00:00
Jens Ayton
2612658ce8 Various tweaks to make reuse in tools easier. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1887 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-30 02:03:27 +00:00
Jens Ayton
1cb2df40dd Cleaned up shaders slightly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1886 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-28 20:20:58 +00:00
Jens Ayton
ab24d9efd3 Rewrote default shader to work in tangent space and support normal mapping. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1885 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-28 19:37:47 +00:00
Jens Ayton
536fc338a6 Tangent support for shaders. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1881 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-23 23:07:24 +00:00
Jens Ayton
dd1ac56784 Simpler, more efficient equipment shopping code using OOEquipmentItem, with side effect that available_for_all now parses its value correctly.. Corrected use of fuzzyBooleanForKey: in r1855. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1856 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-15 01:10:01 +00:00
Jens Ayton
19cbb04377 * Fixes to ship registry: 
- is_template is no longer inherited, causing all derived ships to be
    silently deleted. 
  - Ships whose model can’t be found are now reported and deleted from the
    registry.
  - Ships used as subentities no longer require roles. 
  - Ships with invalid subentity definitions (not exactly eight tokens) are
    now reported and deleted from the registry. 
  - New is_external_dependency key suppresses errors for missing like_ship and
    subentity references. (A ship with is_external_dependency will still be
    deleted from the registry if it can’t be properly resolved, there just
    won't be a message about it.)
 * Added missing compatibility method player.spawnOne().
 * Default galactic_hyperspace_behaviour respelled to BEHAVIOUR_STANDARD.
 * Corrected warning text in setGalacticHyperspaceBehaviourTo:.
 * Added nil check in collision detection.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1853 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-13 09:47:15 +00:00
Nikos Barkas
bfde71ea55 Fixed thargoid curses comms messages appearing out of nowhere (thanks Eric). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1848 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-09 10:05:53 +00:00
Jens Ayton
bbd9c0ef23 Ye bigge version number bumpe. Also removed deprecated JS stuff that's been around for two versions, and added :logOn and :logOff console macros. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1828 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-03 17:55:32 +00:00
Jens Ayton
0df8ba731c Copy & paste error. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1801 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-17 23:10:30 +00:00
Jens Ayton
53e8c39d94 Eating own dogfood. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1800 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-17 23:09:12 +00:00
Jens Ayton
f575d75530 Added JS EquipmentInfo, wrapper around OOEquipementType. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1796 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-16 22:04:29 +00:00
Nikos Barkas
d30e46fb02 Fix a little issue where docking clearance cancellation messages would appear on screen even if no clearance had been given, every second time player pressed 'L'. Reverted AI code fix from previous commit, as it was resulting in idle ships being launched from stations. Set default rock hermit docking clearance requirement to no. Adjusted a little the docking clearance messages to make sense also in the case the issuing station is not a main one. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1792 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-11 08:30:12 +00:00
Michael Werle
addc42eb68 Changes to Docking Clearance functionality (Feature Request #4327): 
* Now works at all stations, not just main stations
* Player ships get placed into a 'docking queue' when requesting clearance
  * Station notifies player when queue-slot expires and gives chance to extend
  * Player can cancel docking-request
* Stations not requiring docking clearance now respond with an appropriate message



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1790 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-08 06:58:32 +00:00
Nikos Barkas
5e8da50afc Added the key stations_require_docking_clearance to the universal section of planetinfo.plist. Added logging of native display mode under Windows and Linux. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1772 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-28 10:25:13 +00:00
cmdrjames
7814a2ba28 Fixes for AI from: Eric Walch 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1771 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-26 20:10:24 +00:00
Nikos Barkas
711b189d38 Further improvements to docking clearance. Penalty of 5 percent of credits amount with a ceiling of 5000 Cr applied for anauthorized docking. Station responses to docking clearance selected from lists. No penalty applied when sun is going nova. Only fugitive players are denied clearance to dock. All the above still needs -DDOCKING_CLEARANCE_ENABLED to be compiled in. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1768 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-23 09:51:14 +00:00
Nikos Barkas
9ed1b38567 Very basic initial implementation of docking clearance request. DOCKING_CLEARANCE_ENABLED must be defined in order to compile this in. Moved related hardcoded strings out to descriptions.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1765 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-21 13:01:19 +00:00
Jens Ayton
8b5d9523c0 Some missing shipdata verifier things. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1757 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-01 19:15:52 +00:00
Jens Ayton
3f07f2230c Fiddling with script converter, and bunch of scripting changes as a result: added player.rank, player.legalStatus, system.countShipsWithPrimaryRole(), system.pseudoRandomNumber, system.pseudoRandom100, system.pseudoRandom256; renamed Ship.shipDescription to Ship.name and Ship.shipDisplayName to Ship.displayName. Also, JS console script now strips out trailing line breaks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1755 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-01 18:21:21 +00:00
Jens Ayton
c3da65606f Fixed some OXP verifier issues, twiddled OOCocoa.h so clang static analysis works again. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1749 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-29 20:44:06 +00:00
cmdrjames
03e2e67761 [ Bug #13945 ] escorts don't have turrets in 1.71.2 
There was a look which didn't stop when it got to the ship which owns the subentity, and went up the chain to the group leader.  I have also changed docking behaviour, as during my testing I found that anyone docking would ignore me when I attacked it.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1746 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-25 11:14:53 +00:00
cmdrjames
75806ac5e3 Simple fix for traders crashing after launch. Discussed here: http://www.aegidian.org/bb/viewtopic.php?t=4906&highlight= 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1744 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-25 09:27:55 +00:00
Jens Ayton
2e5fbccf83 Yet more legacy sound code stripped out for the great interface simplicity win. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1737 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-22 14:43:25 +00:00
Jens Ayton
35d09e3f75 Updated remaining old-style sound code. Afterburner loop fixed to use a single sound file instead of two identical ones. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1736 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-21 20:48:24 +00:00
Nikos Barkas
8a91fa3be7 Implemented the reticle_target_sensitive key in hud.plist. If set to true, selected targets that pass through the center of the reticle cause the targetting box to change color to red. Default is false. Also added a couple of missing break statements in OOJSTimer.m. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1731 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-14 18:36:42 +00:00