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

393 Commits

Author SHA1 Message Date
Eric Walch
d7c3922fba - Corrected delay in: sendAllShipsAway. 
- Corrected key for hostile messages in dockingClearance.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2740 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-12 21:25:32 +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
Nikos Barkas
bde26b04df Fixed incorrect display of distance and time on Advanced Navigational Array when unreachable systems were targeted. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2725 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-06 16:32:58 +00:00
Gary Wong
b5315d49e8 Added "x_origin" and "y_origin" keys to HUD dictionaries, to allow 
HUDs to specify dial and legend positions with respect to arbitrary
parts of the screen.

Modified the default HUD to use "y_origin" so that the appropriate
parts of the display are aligned with the screen bottom, for any
aspect ratio.

(Co-ordinate #defines in HeadUpDisplay.h have NOT yet been updated, for
compatibility with any custom HUDs which might rely on them.)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2719 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-03 17:36:18 +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
Nikos Barkas
84800c9134 Allow break pattern model to be specified externally. This works similar to the docking clearance: The default is set in the 'universal' section of planetinfo.plist under the 'default_breakpattern_model' key and is used for both hyperspace and docking pattern. Docking pattern can be overriden for each station by setting the key 'docking_pattern_model' in its shipdata. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2684 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-20 20:28:12 +00:00
Marc
228ae5a9f5 - change: hyperspace tunnel colour now scriptable from inside planetinfo.plist 
- comment cleanup inside constrictor hunt.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2681 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-18 19:30:31 +00:00
Nikos Barkas
48416ff810 Committed Svengali's converted-to-OpenStep-format plists. Now all core resources property lists should be in OpenStep format. Added Svengali to contributors list. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2675 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-16 16:05:12 +00:00
Michael Werle
8abfd996a4 Named missile-armed messages, as per http://aegidian.org/bb/viewtopic.php?t=6895 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2670 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-12 21:22:01 +00:00
Jens Ayton
233dd3131e Cleaned up APIENTRY stuff, and implemented polygon sprite combine callback, thus enabling self-intersecting polygons. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2666 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-10 22:36:17 +00:00
Jens Ayton
bc3a113b0f Incomplete support for general polygons in missile icons. (In case of splodey, setting the OLD_ICONS macro in HeadUpDisplay.m to 1 will revert to the old drawing code.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2661 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-10 12:23:24 +00:00
Michael Werle
7bb913afe0 - Tweaked new docking-clearance-request-updates messages as discussed. 
- Renamed docking-clearance resource strings to be more consistent.
- Fixed slow-gpus plist; it was causing exceptions in MacOS


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2647 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-07 20:26:02 +00:00
Marc
9e27ce2410 - restored commodities.plist as it was before my testing... 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2643 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-06 18:00:41 +00:00
Marc
a7c2cd2578 - hopefully last tweak to the way available cargo is computed... 
- tidied up some warnings, and added a test condition against changing cargo values when Special Cargo is in use.
- corrected a silly mistake in the manifest commodity setter.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2641 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-06 16:12:50 +00:00
Jens Ayton
287da97963 Weekend of SVN Death fixes: partial fix for planet texture mapping suckiness (disabled by default, see FIXED_TEX_COORDS in PlanetEntity.m). Fixed crash when constructing JS timer with invalid parameters. Some cleanup and stuff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2636 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-05 13:13:06 +00:00
Marc
5ee5e3479e * New: ship.maxMissiles read only property. NB: NPCs always return the current number of missiles on board, due to current underlying engine limitations. 
* Change: load failure prefix string altered to avoid the silly sounding 'Saved game failed to load. Could not load file.' That now reads 'Failed to restore saved game. Could not load file.': half as mysterious! :)

* Game Over fixes:
- after game over, Oolite now restores the last saved game. 
- there should be no more 'xyz broken equipment' messages after dying now.

I'm fairly sure I haven't broken anything there, but will port to maintenance after some more testing.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2616 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-28 15:06:18 +00:00
Marc
560e5501b1 * Autosave fixes ( trunk & maintenance ): 
- no more autosave immediately after a restart.
- removed duplicate screen message during autosave.
- autosaved commander name is now 'CommanderName (autosave)' instead of 'autosave' as before.

* Trunk:
- changed the name of the autosave description key inside plist.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2609 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-27 03:10:39 +00:00
Marc
b132eb31fd * Fixed the NEU availability issues once again. Please don't un-fix. 
* Fix for the last-ever-I-promise graphic glitch with find system on the long range map. 

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2599 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-25 17:06:51 +00:00
Jens Ayton
0889ca77a4 Minor tidying up. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2592 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-25 13:25:19 +00:00
Marc
a0a1b592c2 Trunk: 
* any found system in galaxy map is now restored properly from save games.
* various found system bugfixes.
* corrected new nova mission string typo.

Maintenance & Trunk:
* friendlier handling for missing ']' in expandDescription: will return the unexpanded string instead of nil, plus warning integrated better with logcontrol.plist

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2590 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-25 12:38:47 +00:00
Jens Ayton
e390b42dbe Made buoys shinier, because I can. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2572 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-21 22:46:36 +00:00
Nikos Barkas
b278fc15f3 Fixed missing planet name in Constrictor mission. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2571 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-21 22:34:51 +00:00
Nikos Barkas
4d9210bc48 Fixed a build warning. Added the missing display_name shipdata key to the list of keys known to the OXP verifier. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2552 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-21 08:42:37 +00:00
Jens Ayton
c988131375 Data cache writes are now asynchronous, for great snappy. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2537 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 22:03:36 +00:00
Jens Ayton
30beac1d47 Updated prefs screen to reflect Groolite disabled status. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2531 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 20:23:08 +00:00
Marc
239d132e3b - yet another equipment screen tweak - corrected 2 other minor interface glitches 
- fixed 'subentities disagreeing with parent' bug (when selling ships with subentities)

- windows change: -verify-oxp now gives proper feedback when finished.(thanks Eric)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2519 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 12:17:27 +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
Marc
71a6fb6822 - More gui related fun with the equipment purchase screen. It should now be clear that trying to purchase the same weapon for a particular weapon mounting as the one already there will not do anything. Various code tweaks needed to allow for that interface change. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2509 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-16 04:07:11 +00:00
Marc
09f4cc02e7 * equipment purchase screen part 4: 
- Name of mounted weapons shown while purchasing new weapons.
  - 3 new translation strings added to the equipment purchase section.
* beaten some of the present GUI 'code' into submission to get the above to work.
* repositioned the background for novae system info screen.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2508 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-16 01:10:49 +00:00
Marc
6517563d99 - added the new shipdata keys to the list of known keys in the verifier. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2503 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-13 21:56:08 +00:00
Jens Ayton
6769ee509f Renamed oolite-javascript-errors.plist to javascript-errors.plist for internal consistency (config files aren't subject to namespace issues). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2495 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-13 15:42:34 +00:00
Marc
3cb2045315 - many nova bugfixes, should now be more difficult to break the nova mission. Sun flares up at random intervals inside the nova system. 
More testing required.
- systemInfo float values are now properly treated as numbers.
- minor code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2491 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-13 01:25:18 +00:00
Darren Salt
7ccaa67565 Add a control senitivity/method indicator. 
Also add an example (commented out) to the default HUD.

The indicator is a transparent black disc with a dot and a circle.
The dot is missing if in mouse mode.
The circle is missing if there are no detected joysticks.
When in "sensitive" mode, the circle (if present) is green, else it is grey.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2466 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-10 22:16:44 +00:00
Jens Ayton
7237dcfcec Removed badly-thought-out supposedly-unique roles for built-in ships. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2423 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-07 18:47:10 +00:00
Marc
9a7c0885ff - Oolite now saves strict / unrestricted mode settings, and starts up accordingly. 
- minor code tidying up, including Universe init /reinit functions.
- selling prices are now more accurate.
- removed unused startup strings, and a mac compile warning.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2418 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-07 00:31:42 +00:00
Jens Ayton
26f3650ef6 Added warning when trying to switch to a non-existant AI. Fixed ship inspectors. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2406 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-05 21:39:26 +00:00
Nikos Barkas
c85995c8d3 Fixed -availableCargoSpace to give correct report also in the case of the player carrying special cargo. Cache rebuild is now reported in the log. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2389 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-05 12:10:11 +00:00
Jens Ayton
d421b35e93 Added log message for when finding the return type of a method used in a shader binding fails - might help track down Griff's alertCondition bug. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2386 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-05 11:37:34 +00:00
Jens Ayton
5ab5370e36 Tore out the homebrew plist parser with great relish (and a dash of ketchup). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2383 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-04 19:26:56 +00:00
Jens Ayton
238d0feaee Moar property lists: slow-gpus.plist (matching patterns for GPUs where we should default to simple shaders, unimplemented); shipdata-overrides.plist (fixes for known, minor, third-party problems; currently suppresses one harmless error from griff_spacebar_subent_template); script-patches.plist, similar auto-patcher for third-party scripts (unimplemented). Also, syntax error reports for legacy scripts now provide a sort of path to the problem, e.g. assassins.0.do.321.do.1.conditions.0, which just happens to provide information needed to write script-patches.plist entries. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2382 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-04 19:00:30 +00:00
Jens Ayton
15dae1b410 Random unexpected feature of the week: refactored texture loading dispatch into a separate class (instead of class methods in OOTextureLoader), and added an implementation that uses NSOperationQueue rather than hand-rolled thread pool if available (OS X 10.5, GNUstep 0.19). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2381 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-04 17:28:59 +00:00
Jens Ayton
14a50d9d12 Enabled shipData.load.shipyard.unknown warning. Backported, because at the time of the 1.72 release I said it would be enabled in 1.73. This will result in swathes of warnings for Realistic Shipyards users, but since Lestradae has announced his intention of not updating to the override plists that were introduced specifically for his benefit, this is entirely his fault. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2377 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-04 12:06:47 +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
00fc0dccbe Fixed proceeed typo. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2368 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-03 19:16:12 +00:00
Jens Ayton
cb8524ae91 Improved reporting of AI stack overflows. Also added a test case, which I hope to make a habit of. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2366 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-03 16:44:52 +00:00
Michael Werle
734938237f Fix the various 'targetting' spelling errors. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2360 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-03 14:09:05 +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
9781d2b9d1 Fixed possible but unlikely cause of crashes in JavaScript error handling, and improved log message classes for JS errors (symbolic names instead of magic numbers). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2308 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-23 20:49:25 +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