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

127 Commits

Author SHA1 Message Date
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
Jens Ayton
b084484661 Implemented stack trace for AI recursion error. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3570 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 13:10:55 +00:00
cmdrjames
4249c7ef7b Deferred changes that I have been waiting for end to code freeze. 
Slight change to laser purchasing which should end the problems with some configurations not being possible.
Add scripting for overriding fuel scoops so that people can have scooping effects for their own equipment or can do clever stuff with extra suns or whatever.
Some rationalisation of magic numbers, so we check constants or methods rather than inline magic numbers.
Little bit more logging.
Change time spend in wormhole to be 3/4 of full jump, maths to prove it is optimal for gameplay available from PhantorGorth.  Time of flight discussed in thread http://aegidian.org/bb/viewtopic.php?t=7917

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3549 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-15 20:38:40 +00:00
Jens Ayton
00ffca2f26 Implemented rudimentary stack backtrace for JavaScript. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3548 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-15 20:28:22 +00:00
Jens Ayton
528abd2ac6 Implemented time limiter for JavaScript scripts. Set to be extremely aggressive for testing. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3528 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 18:51:07 +00:00
Jens Ayton
1edaad2aba Fixed temporary object rooting problems when converting dictionaries and arrays to JS representations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3509 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-12 19:36:22 +00:00
Jens Ayton
e2b45e4db1 More mesh cache logging fun. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3442 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-30 21:27:49 +00:00
Jens Ayton
7b2045182f Added logging of mesh loading. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3440 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-30 21:00:15 +00:00
Jens Ayton
3973891e2b Silenced warning when using missile with no corresponding equipment.plist entry (because that was historically not required). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3407 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-24 20:35:58 +00:00
Jens Ayton
2f96be77ce Playing with the log again: list loaded world scripts vertically, note end of loading spew. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3293 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-05 18:02:00 +00:00
Jens Ayton
ca362e50cb Rewrote screen shot log message in English. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3288 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-05 13:42:37 +00:00
Jens Ayton
85dd68422f Fixed texture corruption on graphics reset, and enabled reloading of textures from files. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3228 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-26 18:52:39 +00:00
Jens Ayton
6ca55f587e Added logging of shader mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3227 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-26 18:24:16 +00:00
Jens Ayton
2cc1846926 Compile-time option for OOTexture to reload textures from files on graphics reset instead of keeping an otherwise unused copy in memory, but disabled because it exacerbates problems with textures getting confused on graphics reset. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3217 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-25 10:44:24 +00:00
Jens Ayton
66fbfc1c1c ...and logging of texture size limits. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3192 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-22 13:54:23 +00:00
Jens Ayton
889c86aa47 Added logging of texture rescaling. Changed all textureLoader.foo log message classes to texture.load.foo. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3191 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-22 13:49:50 +00:00
Jens Ayton
ab623a5c94 * Big unified emission and illumination map thingy for non-shader mode. Known 
limitations:
  - causes synchronous wait for component textures to load.
  - Component textures are cached unnecessarily.
* cleanup of material dictionary handling.
* Added foo_color variants of material colour key names.
* Added illumination_color material property.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3178 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-21 18:21:29 +00:00
Jens Ayton
fa25226d5f Cube mapping (for diffuse map) supported in default shader. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3123 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-05 14:32:33 +00:00
Jens Ayton
a4382b451f Fixed bug where space dust velocity ignored inertial velocity of player, taking only thrust into account. Exposed player velocity to JS. Initial work on fixing player-only shader binding issue described at http://aegidian.org/bb/viewtopic.php?p=103930#103930 . 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3051 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-03 18:04:06 +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
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
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
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
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
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
a7469b97c5 Fixed JS Ship.escorts returning ship itself. Suppressed error spew when a sound can't be resolved. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2221 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-03 09:20:13 +00:00
cmdrjames
fc710b9b1a Finally commit a change to heat handling after seeing a comment from micha about it (was discussed on forum a few weeks ago) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2121 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-05 15:05:11 +00:00
Marc
5b55c9bea1 Bugfix/update: customSounds tokens (e.g. [@boop]) can now be arrays too. Resolved some dangling inheritances inside logcontrol.plist & updated a couple of errors & warnings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2104 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-26 14:12:35 +00:00
Marc
6a2fca0aeb Planet refactoring II: textured planets now show up in system data screen. System data screen better optimised. Prices inside the gui are now either padded(goods market), or right aligned (equipment, shipyard, passenger/carrier market) - minor adjustment to carrier market premium. All in-flight screens now switch to forward view when starting hyperspace jumps. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2102 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-25 03:57:38 +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
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
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
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
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