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

48 Commits (master)

Author SHA1 Message Date
cim 948dc08c01 Weapon type could now be any string depending on what equipment is present. 2015-01-17 14:36:42 +00:00
cim e8c3178b26 Some updates to OXP verifier config 2015-01-04 21:42:37 +00:00
cim d5329b467c Update the OXP verifier for some recent shipdata.plist changes 2014-04-13 18:24:31 +01:00
Marc 53b1c1407d * OXP related compass behaviour update: 
- if compass is not visible, compass mode changes are disabled.
- compassTargetChanged now fires when compass display switches from visible to invisible during in-system flight - target is null, signifying the compass is being turned off.
- compassTargetChanged now fires also after willEnterWitchspace, with target undefined, meaning the compass lost its target.
- compassTargetChanged should now fire after a witchjump to a new system, under all circumstances.

* escape_pod_role property added to shipdata, to be used in preference to escape_pod_model
- yet some more, mostly whitespaces, cleanup...


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5359 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-23 16:27:37 +00:00
Jens Ayton 548df2800a Support fire_rate shipdata key in verifier. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5313 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-10 00:21:29 +00:00
Eric Walch cea95deb2d - Changed 'setDestinationToJinkPosition' slightly to give a faster pitch reaction. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4958 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-25 21:24:22 +00:00
Eric Walch 0167b32938 - Added a new AI command 'setDestinationToJinkPosition' 
- Updated several AIs with reaction to cloaked attacks.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4954 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-22 20:06:21 +00:00
Eric Walch e334d0c798 - Added code to prevent that thargons become part of an escort group. 
- Added CLASS_MINE to the oxpVerifier.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4655 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-11-19 10:01:59 +00:00
Eric Walch 35ac9b3239 - Fixed bug in the oxp-Verifyer not recognizing 'escorts' in shipdata. 
- energy now won't get negative on long update intervals with active cloak. e.g. on exiting a wormhole.
 (should probably fully switched of during jumping)
- ported player inactive cloak behavior to npc cloak.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4653 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-11-17 17:27:04 +00:00
Jens Ayton 3b5e5cb2e3 NPC ship Q-bombs added with has_energy_bomb are now represented as EQ_QC_MINE rather than EQ_ENERGY_BOMB. This change should also make NPCs able to use Q-bombs added through scripts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4491 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-25 18:04:33 +00:00
Jens Ayton 2a8c8c7fe0 Fix exception on setting more than 16 pending escorts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4448 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-10 16:01:10 +00:00
Jens Ayton 54d5c4b350 Breakpattern entity reform. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4266 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-08 19:09:22 +00:00
Eric Walch 42eb084069 - Fixed escort position for police ships. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4178 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-29 17:50:27 +00:00
Jens Ayton 37c5982f4a Added counts_as_kill shipdata key. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4143 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-24 18:14:01 +00:00
Eric Walch fbbeea6765 Changed the shipWillLaunchFromStation handler for the player, so that the player already has a valid launch-position and launch-orientation. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4037 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-08 17:59:23 +00:00
Jens Ayton 79b1857798 Added has_patrol_ships to shipdataEntrySchema. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3940 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-31 17:29:59 +00:00
cmdrjames 3dec932e3f Add support for variable ranged turrets 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3834 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-22 23:28:59 +00:00
Marc d4f9c5b647 Added new keys to verifier files: couldn't find a reference to hudSchema.plist inside the code, though... 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3784 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-10-29 09:31:09 +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
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
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
Jens Ayton 03e7095775 Fixed OXP verifier failures for like_ship (those required keys ain't). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3447 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-02 17:34:42 +00:00
Jens Ayton c34d78f428 Introduced specular_modulate_color and emission_modulate_color as per bug #17175, and renamed illumination_color to illumination_modulate_color to match (but not diffuse_color or ambient_color, as these can still be either overall colours or modulating colours depending on whether there's a diffuse map). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3388 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-20 19:41:49 +00:00
Nikos Barkas 05b7c3b90e Each HUD component can now have independent alpha, set by the 'alpha' key in the components. Fixed punctuation in shipdataEntrySchema.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3125 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-05 16:50:22 +00:00
Marc a58863656d Updated verifier schema with rev3091's changes, and added two stray keys to both verifier files. :) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3094 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-02 21:19:40 +00:00
Marc 41cd953184 - Verifier: removed duplicated key entry in verifyOXP.plist and brought its associated schema up to date. 
- Scripting: added ship.canAwardEquipment() to check if a specific equipment item is compatible with that ship.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3029 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-15 01:41:14 +00:00
Marc 152e889b32 - tweaked new fuel prices. 
- integrated fuel_charge_rate with the verifier & clamped it between 1/3 & 3x of the calculated fuel prices.
- disabled new fuel prices for the time being.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2985 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-21 11:47:16 +00:00
Jens Ayton 93e82f18c6 Fixes for debris_role. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2956 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-10 15:26:25 +00:00
Jens Ayton 9e69f069ac Added missile_load_time to shipdataEntrySchema. Cleaned up planet miniature LOD stuff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2846 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-05 20:39:24 +00:00
Marc f7affbc01a MissionScreen RFC part II: 
* missionScreenOpportunity now fires up after loading a savegame & at startup, as well as after docking.
* fixed a mission callback related crash.
* fixed clash with fines and mission screens.
* name change for new mission.runScreen parameter shipModel: is now showModel.
* the foreground & background images now display correctly in relation to the spinning demo ship.

- code cleanup
- added missing keys to the shipdata entry schema


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2758 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-17 18:27:11 +00:00
Jens Ayton 08747ab817 Added scan_class to shipdataEntrySchema.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2754 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-16 21:25:20 +00:00
Jens Ayton 6aaf7a1e75 Committed unspeakable necromancy on the graveyard of the repository. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2331 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-29 23:09:22 +00:00
Jens Ayton 999fe7e969 Trying to convince svn that this deleted directory is really deleted. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2330 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-29 22:50:59 +00:00
Eric Walch 318b208ab6 Added 2 missing keys for verifyOXP 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2277 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-08 12:41:23 +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 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 5468ad980f Added CARGO_CARRIED to shipdataEntrySchema.plist. Rearranged IsPlanetPredicate() for better branch prediction. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1818 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-31 15:54:40 +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 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
Jens Ayton e92acd10cc Better support for cluster missiles - submunitions can now inherit their parent's target (using is_submunition shipdata.plist property). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1718 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-02 20:37:58 +00:00
Jens Ayton f2c07b5ee7 Fixed a few leaks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1684 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-04 16:01:26 +00:00
Jens Ayton 07fc2a25b6 Fixed some bugs in OXP verifier. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1325 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-01-28 01:24:40 +00:00
Jens Ayton df05fbd65f Updated version numbers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1250 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-02 20:43:08 +00:00
Jens Ayton 6a8c7976dd Added scriptInfo dictionary to ships, and global JS objects worldScripts and worldScriptNames. Fiddled with messages on both sides of debug console. Fiddled with flags on JavaScript classes, hopefully for the better. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1211 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-10-13 15:10:16 +00:00
Jens Ayton a265c06344 * Work on generic-ish JavaScript object bridging. 
* Fixed potential crashing bug in JS memory management (OOJSScript was not releasing its JS GC root).
* Fixed bug with several shipdata.plist settings being ignored in StationEntitys (bug #11684).
* Added JS Oolite object for app and JS version number checking; may add other facilities.
* Require latest version of SpiderMonkey (Gecko 1.8/FireFox 2 version) with JavaScript 1.7 support, built with JS_C_STRINGS_ARE_UTF8. 
*Made SpiderMonkey build as a subproject in Xcode for ease of debugging.
* Further fiddling with Mac debug console.
* Added has_npc_traffic attribute to StationEntity.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1157 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-09-04 23:04:09 +00:00
Jens Ayton 892c271501 Split JS system into separate file. Started on support for ship scripts (incomplete). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1129 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-08-05 11:47:09 +00:00
Jens Ayton 33588e1dfa Moved schema schema to Schemata folder. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1113 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-07-29 14:18:05 +00:00
Jens Ayton 122102af4f Cleanup; merged some very similar methods; made most HUD parameter reading use OOCollectionExtractors; made most of Universe use OOCollectionExtractors; added some schemata; moved schemata to separate folder. GNUmakefile.postamble has been updated to copy this folder into Resources/, but note that it isn't needed in final builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1112 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-07-29 14:17:30 +00:00