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

2030 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
4b8e979dbd Because I'm an idiot, this commit contains two completely unrelated big changesets. 
1. Cache tweaks:
* No longer try to delete 1.67-era cache file.
* On-disk cache is ignored when switching to strict mode (instead of nuking it).
* Avoid redundant caching of AIs, mesh file contents (in-memory only) and resolved paths for meshes.
* Cache sanitized scripts.
Also, factored out lots of copying in script sanitizer into one OODeepCopy() at the end (which coalesces identical strings across the whole script).

2. CollectionExtractors cleanup:
All OOCollectionExtractors category methods on Foundation classes now have an oo_ prefix. This is good design anyway, but sort of came to a head when it turned out Zbond-Zbond's crash was caused by an incompatible -[NSMutableDictionary setFloat:forKey:] method from a third-party input manager hack.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2411 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-06 15:56:32 +00:00
Jens Ayton
35bab8295a Scripts are now reloaded (and re-startUped) when the game resets. This is more robust and also fixes the problem of OXP scripts running in strict mode. Also, persistent timers are gone. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2409 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-05 23:27:41 +00:00
Jens Ayton
052f2b6cc2 Found some more caches to flush when switching to strict mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2408 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-05 22:44:23 +00:00
Jens Ayton
54e96964ff Fixed minor leak in Snow Leopard resulting from the recent crash report enhancement. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2407 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-05 21:58:21 +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
cmdrjames
9c01b00084 Fix, so that options are correctly set (in xcode 3.1 not sure about 3.2) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2405 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-05 20:44:42 +00:00
Jens Ayton
fd530bd5c6 Workaround for a nasty little SpiderMonkey bug/misfeature (supposedly fixed in 1.8): converting a JSObject or jsval to a JSFunction discards its context information, so effectively callbacks implemented using JS_CallFunction() were not closures. The workaround is to use jsvalues and JS_CallFunctionValue() instead. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2404 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-05 20:21:45 +00:00
Jens Ayton
0586f0a832 JS SystemInfo changes: added read-only properties coordinates, galaxyID and system, method distanceToSystem(), and static method filteredSystems(). Undefined SystemInfo properties are now undefined rather than null. Also added prefix helper function to get SystemInfo for all systems in a given range (default: 7 ly). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2403 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-05 18:19:23 +00:00
Jens Ayton
3c7c65dbc7 Change log now refers to 1.73.2 rather than 1.73.1. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2401 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-05 16:45:20 +00:00
Nikos Barkas
de89d0bf3f Upodated CHANGELOG.TXT with last moment bug fix. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2398 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-05 15:57:27 +00:00
Nikos Barkas
3597b155ec Fixed bug that allowed players to get rich quickly by selling missiles at start of game and then going to the shipyard screen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2395 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-05 15:51:23 +00:00
Jens Ayton
8293a67ecc Fixed an oversight that was causing traderInterceptAI.plist to be excluded in Mac builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2394 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-05 14:16:55 +00:00
Jens Ayton
a62ae1e237 Minor nitpick for change notes: effect of bug fixes is more important than their tracking numbers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2392 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-05 13:37:40 +00:00
Nikos Barkas
30468176c7 Updated CHANGELOG.TXT with the 1.73.1 version changes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2390 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-05 13:21:48 +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
8204f7c6af Texture dispatch manager tweak: don't include manual-thread-pool version when NSOperation is guaranteed to be available (currently, when building for Mac OS X 10.5 or later, i.e. the Mac 64-bit version). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2387 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-05 11:38:26 +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
bd6755f77d Re-removed irrelevant warnings from vector/quaternion constructor special cases, and clarified comments. (See r2335, r2349) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2385 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-05 11:33:00 +00:00
Michael Werle
d7ed9045cf Automatic Debian version numbering 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2384 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-05 09:40:57 +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
Michael Werle
2eb7f0e45b Bugfix to autopackage, and added a target to the Makefile. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2380 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-04 16:44:01 +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
Marc
da8da6183d bugfix for bug #15454 - legacy scripts inside CARGO_SCRIPTED_ITEMs now work again. Tested with ore processor 1.52. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2375 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-03 23:27:18 +00:00
Jens Ayton
3b36f20058 Fixed build issue for debug OXP in Debug/x86_64 configuration. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2374 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-03 22:38:42 +00:00
Jens Ayton
c9a743ed9d Include thread names in Mac OS X 10.6 crash reports (finally, ooSetCurrentThreadName: is actually doing something useful). Backporting because, er, well, that's what ooSetCurrentThreadName: was originally for, so making it actually work is a bug fix, right? 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2372 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-03 21:34:57 +00:00
Jens Ayton
c59c9743e1 Got the project building with Clang, which revealed a number of syntax errors. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2371 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-03 21:08:03 +00:00
Jens Ayton
00077466ab Various tweaks and a handfull of hacks to get Oolite building for x86_64 OS X. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2370 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-03 20:01:35 +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
61feaa3ec9 Fixed four possible array bounds violations in special-case merging for equipment.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2367 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-03 17:35:28 +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
b15825ddfd Administrative updates for OS X: Xcode projects are now marked as requiring Xcode 3.1 rather than 3.0 (3.1 is an update for Leopard). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2364 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-03 15:57:44 +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
Michael Werle
28bc447fc5 Minor updates to the Debian man page and changelog and tweaked build rules slightly to include contributors.txt and not compress the OoliteRS.pdf file. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2359 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-03 06:36:25 +00:00
Nikos Barkas
55f93a9ab3 Committing Eric's fix for not switching to the equip ship screen if the gui screen has changed after buying an item (like in the case of a mission screen). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2357 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-02 20:49:43 +00:00
Jens Ayton
98b5e2400c Fixed every single Clang static analyzer warning for Oolite itself... although it fails to parse some files. In the process, cleaned up some messy code and fixed a bug where a certain error would not be displayed by the plist validator. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2356 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-02 17:18:11 +00:00
Jens Ayton
97aedf381b Fixed build under Xcode 3.2 (Snow Leopard). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2355 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-02 15:24:18 +00:00
Nikos Barkas
cf44ab2e7f Fixed SDL build warning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2354 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-02 12:46:46 +00:00
Jens Ayton
fd60071a53 Fix for somehow broken checkin of r2352. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2353 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-02 12:23:38 +00:00
Jens Ayton
2923413335 Changes to input handling to ignore command-key combos in Mac OS X, with special exception for command-F and command-Q which are handled directly in full-screen mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2352 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-01 21:58:01 +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
Marc
02fcc8dea1 - ported v2346 fix to maintenance 
- updated InfoPlist.strings to 1.73.1 in maintenance 
- restored deprecated warnings for quaterninons and vectors in trunk

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2349 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-01 20:32:39 +00:00
Eric Walch
8544740711 Only show arrivalReport when docked in case a script puts something in during flight. When baseprice of player ship in shipyard is zero, return zero as total value. A value of zero already indicates something was wrong with the playership and calculating further can only lead to a negative total value but will be wrong anyhow. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2346 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-01 15:16:26 +00:00
Nikos Barkas
6681e6591b Some more version bump updating. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2345 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-01 06:19:13 +00:00
Marc
3ce6a6e807 * laser buying fix. - damn :( 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2343 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-31 18:39:55 +00:00
Eric Walch
1668f1597e Docking clearance now also sends the messages DOCKING_REQUESTED and DOCKING_COMPLETE to its own AI. So carriers now can react on it by stopping when clearance is given. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2342 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-31 18:10:42 +00:00
Marc
b62fd002fe * tentatively added new shipRemoved(Bool removeDeathActions) event. 
* refactored initWithGameView and reinitAndShowDemo

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2341 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-30 22:20:46 +00:00
Darren Salt
9a25bab0d2 Bump .deb version number. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2340 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-30 20:01:47 +00:00