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

1960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikos Barkas
de84c2050a Added as parameter to handler shipLaunchedFromStation the station ship launched from. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2448 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-09 07:48:02 +00:00
Marc
3d70c340d5 - Once an entity is tractored, all other ships will lose interest immediately. Tested with 256 splinters, and 128 + 64 scavengers. Works! & hardly a single death... :) closing bug #12344 now 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2447 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-09 01:14:54 +00:00
Marc
16a0d260fe - reduced the chances of two ships going for the same loot. Needs more work. 
- system.info.sun_gone_nova will take effect immediately, making the sun go nova, and killing the whole population instantly. No save or load possible inside a nova system!
- minor code tidying up!

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2446 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 23:25:52 +00:00
Nikos Barkas
98ecf379d8 Bugfix: If the player is in a system that has gone nova, no planet is shown in the system data screen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2444 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 22:02:20 +00:00
Jens Ayton
adffb84308 More dead code eliminated. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2443 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 20:29:42 +00:00
Jens Ayton
9d49273c57 Fixed an apparent bug in velocity transfer in explosions that lead to one party dying. If crashes start behaving oddly, it means that wasn't a bug after all. (Also removed some more dead code.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2442 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 20:14:45 +00:00
Jens Ayton
33c3787b58 Yet more static analyzer fun: removed an unused ivar from Cocoa MyOpenGLView. Fixed bug where AI method dropMessages: didn't work if more than one message was specified. Fixed missing break; in a switch in energy unit trade-in handling. Removed some bits of dead code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2440 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 20:07:57 +00:00
Jens Ayton
d83e9031c8 More static analyzer fun: fixed flagrant abuse of -init in -[Universe reinitAndShowDemo:], don't create a nav boy if creating a station fails, get systeminfo before asking it for a government in [-Universe witchspaceShipWithPrimaryRole:] (so skipping of escorts in safe systems works). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2438 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 19:28:13 +00:00
Jens Ayton
ff6df1ed8e OOGL()-ified HUD code, and fixed some Clang static analyzer issues (yes, I've found some more of those). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2437 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 18:24:18 +00:00
Nikos Barkas
2e03c6dff4 Updated a couple of previously forgotten files with the new location of Oolite's Reference Sheet. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2436 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 17:34:15 +00:00
Nikos Barkas
7211bc690c Moved the Oolite Reference Sheet to the Doc folder. Not sure what it was doing in installers/win32, really. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2434 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 17:14:34 +00:00
Jens Ayton
d0a94e7ad2 Fix for long AI description in universe.objectDump, which according to Commander McLane "seems funny". (Reported at: http://aegidian.org/bb/viewtopic.php?p=86182#86182) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2433 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 16:59:08 +00:00
Jens Ayton
88ff4d26ea Found yet another cache that needs resetting for strict mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2432 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 15:16:12 +00:00
Jens Ayton
c50eec56f8 Cleaned up among feature macros; updated log header appropriately; simplifed log header generation a bit; fixed clean build of Mac debug configuration (Debug.oxp no longer wants OoliteDev.app). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2430 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 15:06:22 +00:00
Jens Ayton
6244814f2f Fixed Mac Deployment configuration (it isn't supposed to be exporting anything). Log header now lists [GLSL Shaders] and [OXP Debug Features] as appropriate. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2429 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 13:54:06 +00:00
Marc
e93b8aa9ee Mac build: 
- really removed all traces of 10.3 from the build settings now(probably)
- changes to codebase to enable Deployment builds to link properly, might affect other platforms builds.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2428 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 13:37:28 +00:00
Marc
ea62edcb5e * mac builds on trunk: 
- removed all stray references to 10.3, and testRelease should now build properly on PPCs too.
- Still couldn't correct the 4 missing debug exports from Deployment.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2427 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 09:05:30 +00:00
Marc
cc12a609bc - got it to compile & execute ok on Xcode 3.1 for debug & test release configurations. There are still 4 -exported_symbols missing from the deployment configuration, though... 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2426 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 08:26:30 +00:00
Jens Ayton
982bd06d68 Tweak to Xcode project: Oolite is now named Oolite.app in all configurations, to avoid an incompatibility between Xcode 3.2 and Xcode 3.1. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2425 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-07 21:53:05 +00:00
Jens Ayton
7d85d3391d New! Hardcore OpenGL error checking action. Compile time option (OO_CHECK_GL_HEAVY) to check for OpenGL errors before and after, ideally, every single GL function call. (Exception: for immediate-mode drawing, checking is done before glBegin() and after glEnd().) Temporarily enabled by default in Mac debug builds for compatiblity testing. Oh, and fixed a bug where shader programs that fail to build could sometimes be deleted twice. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2424 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-07 20:37: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
Jens Ayton
b3b6eceae0 Fixed Mac 64-bit build. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2421 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-07 16:39:33 +00:00
Marc
1048f96928 - more code cleanup from yesterday. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2420 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-07 12:30:50 +00:00
Marc
19bb8eef5e - better handling of has_shipyard and proper handling of is_carrier. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2419 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-07 11:14:00 +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
Marc
0c7db188f0 - Fix for crash on long range map (bug was present only in trunk & windows) 
- it's now possible to use 'h' & 'p' on the long range map, at all times.
- Added escort_role, escort_ship, has_shipyard, is_carrier, and scan_class keys (they override escort-role, escort-ship, hasShipyard, isCarrier and scanClass keys, which are still kept for backward compatibility.)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2417 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-06 21:43:27 +00:00
Jens Ayton
57bd5e742e Fixed minor obscure crash when game tried to draw exhaust trails. Who needs those, anyway? 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2416 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-06 19:21:21 +00:00
Jens Ayton
ea629fbeb4 Beginning of a lightweight replacement for ParticleEntity, currently used for flashers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2415 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-06 19:07:53 +00:00
Jens Ayton
2580bb0220 Fix for exception in equipment.plist merging when using OSE and Fuel Collector OXPs at once. More generally, squashed NSRangeExceptions when using OOCollectionExtractors for arrays (nil is returned instead). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2413 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-06 16:42:11 +00:00
Jens Ayton
6d147ce179 SDL fixes for r2411. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2412 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-06 16:11:57 +00:00
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