cmdrjames
8ac6b1dd3c
better docking AI from Eric Walch
...
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2097 127b21dd-08f5-0310-b4b7-95ae10353056
2009-03-18 00:42:56 +00:00
cmdrjames
47213c7a5e
fix for pirate cove defense-ships not working
...
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2096 127b21dd-08f5-0310-b4b7-95ae10353056
2009-03-18 00:39:57 +00:00
Jens Ayton
886bfccbab
Applied dsalt's libespeak patch. It doesn't work for me, but the build is fine if not built with make libespeak=yes so it doesn't hurt anything.
...
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2091 127b21dd-08f5-0310-b4b7-95ae10353056
2009-03-15 16:14:03 +00:00
Nikos Barkas
01eb2aaf3f
Implemented the key cloak_indicator_on_status_light in hud.plist, default to NO. When set to YES, it will shift the colour of the status light towards blue whenever the player is cloaked.
...
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2084 127b21dd-08f5-0310-b4b7-95ae10353056
2009-03-05 02:05:17 +00:00
Jens Ayton
2c86763a5c
Mucking about with shader effects. Fixed an inconsistency in oolite-font.plist.
...
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2082 127b21dd-08f5-0310-b4b7-95ae10353056
2009-03-01 13:40:33 +00:00
Nikos Barkas
d12f5ceb06
Oh, it's 2009 already ;-)
...
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2067 127b21dd-08f5-0310-b4b7-95ae10353056
2009-02-16 11:19:24 +00:00
Marc
0ebb54a9e4
Advanced compass key binding: Oolite/win detects non-US keyboards now, and assumes they're UK ones. Option screen from paused: switching to strict/unrestricted mode now works ok. Experimentally activated 'begin new game' from paused - doesn't seem to cause trouble so far. Mouse control bugfixes: when mouse control is meant to just work in fullscreen, switching to windowed now disables it. SDL: Mouse cursor now shows as intended!
...
Game over screen now displays ranking as well as credit, minor strings cleanup. (yes, there's another one to translate...)
Ported mouse & 'paused strict mode' fixes to 1.72-maintenance.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2066 127b21dd-08f5-0310-b4b7-95ae10353056
2009-02-15 21:05:19 +00:00
Nikos Barkas
be5b4ff96c
Hostile autopilot targets will now refuse to issue docking instructions.
...
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2062 127b21dd-08f5-0310-b4b7-95ae10353056
2009-02-13 15:28:27 +00:00
Marc
644557d6b1
some refactoring of intro/demo screens, removing some duplicate code. fixed a wrong DESC string, and possibly completed the great DESC string migration. cleaned up a small part of the SDL gameView code. Splash screen can now be enabled by #defining SDL_SPLASH 1.
...
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2061 127b21dd-08f5-0310-b4b7-95ae10353056
2009-02-13 11:22:27 +00:00
Nikos Barkas
0a161f1c4d
Fixed a 'control reaching end of non-void function' warning. Updated the nova mission script to use the new sun.hasGoneNova method.
...
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2057 127b21dd-08f5-0310-b4b7-95ae10353056
2009-02-12 17:39:42 +00:00
Jens Ayton
8f841d5e62
Deprecated system.goingNova and system.goneNova in favour of existing Sun equivalents.
...
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2055 127b21dd-08f5-0310-b4b7-95ae10353056
2009-02-11 19:36:20 +00:00
Jens Ayton
022f22173b
Fixed normal-mapping bug in default shader.
...
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2054 127b21dd-08f5-0310-b4b7-95ae10353056
2009-02-11 19:26:31 +00:00
Jens Ayton
58549d3c73
New subentity stuff now knows a dock when it sees it.
...
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2053 127b21dd-08f5-0310-b4b7-95ae10353056
2009-02-11 18:46:16 +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
Marc
e6cc1b416e
Odds and ends: 'frozen target' bugfix bugfix by Cmdr James, code cleanup for fullscreen switch in windows/linux by mwerle, & brightened demo ships display. Added splash screen and application icon to windows & linux versions and discovered a few more strings to translate (they're on the splash screen at startup - mac only for now)
...
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2049 127b21dd-08f5-0310-b4b7-95ae10353056
2009-02-11 03:47:23 +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
ca68c038a4
JavaScript tweaks: deprecated entity IDs; made Entity.position and Entity.orienation read/write since their read-onliness wasn't really accomplishing anything; added toSource() method to Vector and Quaternion; Vector() and Quaternion() constructors can now be called without the new keyword, allowing the use of call() and apply().
...
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2038 127b21dd-08f5-0310-b4b7-95ae10353056
2009-02-07 12:53:09 +00:00
Jens Ayton
dbde672d01
"Small" change to group and escort handling, now with explicit group objects. I really must stop making "small" changes. (N.b.: JavaScript ShipGroup currently fails to work in interesting ways.)
...
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2028 127b21dd-08f5-0310-b4b7-95ae10353056
2009-02-06 16:13:36 +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
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