167 Commits

Author SHA1 Message Date
cim
bf4f6aa689 Basic dependency conflict/requires management for OXPs 2013-11-07 23:47:25 +00:00
cim
9b04c93edb Require a manifest.plist in OXZ files
identifier, version, required_oolite_version are required
title and maximum_oolite_version are processed
some others are defined but not yet used
2013-11-06 21:32:47 +00:00
Jens Ayton
939f5a2806 Disable sound.buffer logging by default 2013-11-02 19:40:22 +01:00
cim
f00d3bd2fe Start work on OpenAL support
(Really doesn't work as of this commit...)
2013-10-31 14:00:18 +00:00
cim
ba09d5ad96 Clean up logging settings 2013-09-22 14:35:16 +01:00
cim
d7b187db22 Merge branch 'master' of github.com:OoliteProject/oolite into steady-state-ecosystem 2013-09-14 17:43:52 +01:00
cim
a2334ba5f4 Add basic aegis raiders, some bug fixes in station/defense ship AI 2013-09-01 19:25:45 +01:00
Jens Ayton
053097bb7b Remove unused temporary log class 2013-08-30 16:48:07 +02:00
cim
67c8f40349 JS garbage collection
Force garbage collection at more points where a short pause is okay. Log garbage collections called in update() for tracking purposes. So far they don't seem to have been needed with the additional planned ones.
2013-08-04 20:37:08 +01:00
cim
68cbeed17b Start system populator framework.
Adds buoys, nothing else
2013-07-01 13:46:13 +01:00
Chris Morris
6437f2211a Move virtual dock warning to $oxpDevelopment category. Should consider making this enabled in test builds by default later, but for now OXP developers can adjust it themselves if they want.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5590 127b21dd-08f5-0310-b4b7-95ae10353056
2012-12-27 17:10:56 +00:00
Chris Morris
e64f74399d Fix crash bug in trackCloseContacts functionality
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5576 127b21dd-08f5-0310-b4b7-95ae10353056
2012-12-14 18:24:19 +00:00
Chris Morris
a894b4dd63 Add some high level profiling log statements, since gprof seems to miss some of the time spent in various routines.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5575 127b21dd-08f5-0310-b4b7-95ae10353056
2012-12-13 20:59:22 +00:00
Jens Ayton
07b05f6839 [Mac] Fixed some state management problems in legacy full screen controller.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5530 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-24 15:50:50 +00:00
Chris Morris
d497aebc53 Equipment condition scripts now include context of award.
NEU, cloak moved to use condition scripts rather than TL:99 hack
Base equipment now uses condition script to allow OXP writers to deny particular items at their own stations. (e.g. no fuel)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5514 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-18 16:33:41 +00:00
Jens Ayton
99f2065b9b Fully integrated new string expander.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5423 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-12 12:49:55 +00:00
Jens Ayton
6e37e3d15f More fiddling with startup logging.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5417 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-10 18:33:42 +00:00
Jens Ayton
76347c282b Tweaked startup logging.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5415 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-10 16:44:54 +00:00
Jens Ayton
9951eaba7b Script loading now uses standard search behaviour. Normalized some OOLogs in there while I was at it.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5412 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-08 21:55:51 +00:00
Jens Ayton
b3b2005bc6 Renamed misleading script.trace log message classes, and simplified the legacy script subset.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5410 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-08 17:32:54 +00:00
Jens Ayton
d942817f9b Removed legacy script detailed trace facility. If you're still debugging legacy scripts, you're doing it wrong.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5408 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-08 16:50:46 +00:00
Jens Ayton
00660249a6 Weeded out unused logcontrol.plist entries, and renamed a few.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5407 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-08 16:26:08 +00:00
Jens Ayton
7ee42fcbf5 Tagged some more performance bottlenecks.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5330 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-15 21:44:41 +00:00
Jens Ayton
63de7edcc6 Missing logcontrol entry for r5324.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5325 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-14 00:11:36 +00:00
Chris Morris
44f1494b13 Initial addition of "Visual Effect" entities.
- effectdata.plist defines them
 - VisualEffect JS representation
 - System.addVisualEffect()
 - System.breakPattern and Station.breakPattern properties to allow override of usual break pattern
 - No appearance on scanner yet
src/Core/Entities/OOVisualEffectEntity and src/Core/Scripting/OOJSVisualEffectEntity will need adding to XCode project, please.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5212 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-19 17:09:51 +00:00
Jens Ayton
e638ea259b Removed vestiges of Groolite; Growl and Notification Center notifications appear above the game anyway in 64-bit now, and fixing Groolite for 32-bit ain't gonna happen.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5206 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-18 16:47:46 +00:00
Jens Ayton
52ad424bf8 Reorganized handling of mouse cursor visibility, adding GameController
property mouseInteractionMode which also reflects the distinction between
flight mode with mouse control on and flight mode with mouse control off.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5205 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-18 16:09:15 +00:00
Chris Morris
37703e68c3 Change allowPlayerDocking to disallowedDockingCollides (with approximately reversed meaning)
Fix some bugs with player docking clearance in new docking code
Disable logging of "ship could not launch because there aren't any launch docks"


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5130 127b21dd-08f5-0310-b4b7-95ae10353056
2012-07-24 16:51:28 +00:00
Chris Morris
11f70da5f7 Adjust missile damage to account for relative velocity.
Exact values in oolite-missile.js are provisional and may need to be adjusted after wider testing.
Should get the best of both low and high frame-rate behaviours when it's finished.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4868 127b21dd-08f5-0310-b4b7-95ae10353056
2012-04-21 12:12:05 +00:00
Jens Ayton
df1412c57b Shaving the yak fantastic.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4773 127b21dd-08f5-0310-b4b7-95ae10353056
2012-02-11 15:53:58 +00:00
Eric Walch
3db424c845 The dumping of the entity list when the universe is full can now be controlled through the logcontrol.plist. Default is no dumping.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4622 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-17 14:25:20 +00:00
Jens Ayton
35ecbe0fab Removed logging, which isn't getting us anything. Also reenabled JavaScript usless-expression warning.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4536 127b21dd-08f5-0310-b4b7-95ae10353056
2011-05-04 07:05:17 +00:00
Marc
5b83750a31 More on fuel prices:
- implemented dynamic version of fuelChargeRate.
 - removed protected fuel_charge_rate variable from shipEntity object.
 - initial implementation of post-MNSR - more accurate - fuel ratio calculations, bracketed by '#if 0's

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4532 127b21dd-08f5-0310-b4b7-95ae10353056
2011-04-29 21:27:55 +00:00
Jens Ayton
a943c4d41a Cleaned up various script.foo.trace log message classes so they can actually be used to debug stuff.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4500 127b21dd-08f5-0310-b4b7-95ae10353056
2011-03-31 20:41:56 +00:00
Jens Ayton
037592aea8 Removed unused log message class.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4449 127b21dd-08f5-0310-b4b7-95ae10353056
2011-03-10 16:02:05 +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
8434e83af3 [Mac] Support for game pads that actually describe themselves as game pads rather than joysticks.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4399 127b21dd-08f5-0310-b4b7-95ae10353056
2011-02-23 22:26:50 +00:00
Jens Ayton
1bb89377ce Added logging for about-to-load-JavaScript, and enabled it by default (for 1.75.1) to catch a crasher. http://aegidian.org/bb/viewtopic.php?f=3&t=9223
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4395 127b21dd-08f5-0310-b4b7-95ae10353056
2011-02-22 21:27:54 +00:00
Jens Ayton
0deb3f4d6c Added logging of reason for quitting - log message class exit.context, off by default.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4367 127b21dd-08f5-0310-b4b7-95ae10353056
2011-02-17 15:21:48 +00:00
Jens Ayton
2edd4b4122 Squelched all ship.setUp.missiles messages, and removed roleSet.deprecated.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4329 127b21dd-08f5-0310-b4b7-95ae10353056
2011-02-12 13:40:55 +00:00
Jens Ayton
22e30e422f JavaScript stack traces now include local variables. Stack trace configuration behaviour changed: instead of logcontrol.plist settings, traces for errors and warnings can be separately enabled/disabled through the debug console, or through preferences if debug OXP is not installed. Default is on with debug OXP, off otherwise. Settings in the debug console are persistent, as are showErrorLocations and showErrorLocationsDuringConsoleEval now.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4055 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-14 15:48:05 +00:00
Jens Ayton
473e4e5c5e Mac startup messages now reflect reality, and are more fine-grained in debug builds.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3976 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-03 17:25:11 +00:00
Marc
0b850bb061 undid wrongly committed change.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3974 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-03 15:42:16 +00:00
Marc
36e064d1ee Minor cleanup:
- changed strings returned by the new playerWillSaveGame event for consistency with the other Oolite specific strings: 'autoSave' is now 'AUTO_SAVE', etc...
- tidier / simpler to read fuel calculation code, made fuel price slightly more variable...
- rewrote a very misleading (wrong as per r3972) comment.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3973 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-03 15:34:28 +00:00
Jens Ayton
a02272fdcd Added bugzilla link for the use strict bug to comment in logcontrol.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3964 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-03 00:44:01 +00:00
Jens Ayton
c34f7e03f1 Enabled ECMAScript 5 strict mode in all built-in scripts.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3958 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-02 17:54:54 +00:00
Jens Ayton
6d86b802e8 JS String and Number objects can now be coerced to NSString and NSNumber using JSObjectToObject(). In practical terms, this means callObjC() now works on them. Also cleaned up some error messages pertaining to callObjC().
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3910 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-26 14:04:32 +00:00
Jens Ayton
5bf81d659d Joystick code cleanup
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3877 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-18 18:16:44 +00:00
Jens Ayton
61bbc84257 Reinstated prematurely removed logcontrol entry. Minor cleanup.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3671 127b21dd-08f5-0310-b4b7-95ae10353056
2010-07-15 09:23:58 +00:00
Jens Ayton
0e9b8e2aad Use NSMutableDictionary instead of OOCache in OOCacheManager, since OOCacheManager caches are never pruned, thus obviating the only feature of OOCache. (Note: OOCache is still used by OOTexture and OOEncodingConverter, which do use pruning.)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3669 127b21dd-08f5-0310-b4b7-95ae10353056
2010-07-14 17:55:06 +00:00