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

1982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikos Barkas
717de3c0e3 New JavaScript method in the PlayerShip class: queryCargo. Can take zero or one parameters (nore than one are ignored). Returns the array of cargo loaded (name, tonnage and units) if no parameter is given, or the quantity of the cargo item which name is passed as parameter. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2486 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-12 21:47:32 +00:00
Jens Ayton
adc87a348d Fix for logging of bad AI switches -- http://aegidian.org/bb/viewtopic.php?t=6677 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2485 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-12 21:35:22 +00:00
Jens Ayton
e7814e5056 Flashers with a frequency of 0 now always have full intensity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2483 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-12 12:36:33 +00:00
Jens Ayton
db25437cc5 Mac-specific: reduced overall audio volume to compensate for out-of-range floating point values in some of our audio files - the worst observed being -1.341681. Scaling the master volume by 1/1.341682 (-1.275 dB) to compensate for now, need to remaster bigbang.ogg to work around this (but need custom software since we don't have an original and sound editors tend to clip to normal range when loading). This workaround almost certainly wouldn't work for other platforms since I'm pretty sure SDL uses the integer decoder, which will provide clipped "raw" data. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2481 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-12 11:24:29 +00:00
Jens Ayton
712097c550 Gave sparks the slimming treatment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2480 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-12 10:44:29 +00:00
Eric Walch
fee7ea9350 Corrected last nova script change. Stopped NPC ships from consuming fuel on deceleration. Increased NPC deceleration in speed range above max_speed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2478 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-11 19:21:46 +00:00
Nikos Barkas
374e7b59a2 Fixed severe brokenness in the Windows installer script. If an old version of Oolite exists, it can now be removed correctly before current one is installed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2476 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-11 17:55:34 +00:00
Nikos Barkas
49b68beaa2 Fixed break in SDL builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2475 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-11 16:18:55 +00:00
Jens Ayton
68d44cb438 Sundry OOGL()-ification, and added temp code to dump the instance size of various entity classes at startup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2474 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-11 15:06:58 +00:00
Jens Ayton
d2d7bf66bc Behaviour change: ship clipping distance now takes flasher radius into account. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2473 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-11 15:06:00 +00:00
Jens Ayton
3b1f0e97df Fix for GL matrix stack overflow. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2472 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-11 15:04:50 +00:00
Jens Ayton
877d6cd9bb Mac-specific audio stuff: possible fix for sporadic, extremely bad audio artefact (short burst of extremely loud noise followed by system forcibly dropping volume until sound system is reset). Added code to catch any other such situations, silence the affected buffer and report the problem. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2471 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-11 15:04:08 +00:00
Jens Ayton
7a4c6f8b39 Anti-aliased stars by adding a black border and scaling the billboards up to compensate - mip-mapping takes care of the rest. (To support this, star textures are mip-mapped even in reduced detail mode.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2470 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-11 11:28:59 +00:00
Eric Walch
0c110122f5 Corrected station mode of advanced and basic compass. Stationmode now only turns on in main-planet aegis. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2469 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-11 09:12:12 +00:00
Jens Ayton
92e949f53e Fixed harmless warning in non-Mac builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2468 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-10 23:22:00 +00:00
Jens Ayton
8a9c0b0551 Factored exhaust plumes into a separate class. Moved instance variables used only by exhaust entities into said new class, saving several megabytes of memory. Added Entity memory consumption (not including drawables and materials) to FPS display as a graphic reminder that they're still too big. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2467 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-10 23:13:20 +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
7d68b5ebe4 Stop spewing OpenGL state info when shift key is pressed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2464 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-10 19:50:39 +00:00
Jens Ayton
ae58b9979b OpenGL state cleanup: more glPushAttrib(), less trying to do it manually and getting it wrong. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2463 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-10 18:39:37 +00:00
Nikos Barkas
72db4ee904 Fixed nova mission. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2461 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-10 15:49:51 +00:00
Michael Werle
c7bd78d83a Minor tweaks to automated Debian version numbering from 1.73-maintenace. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2460 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-09 21:43:07 +00:00
Jens Ayton
0367dbe7cd Copied over 1.73.3 changelog to trunk. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2458 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-09 21:21:21 +00:00
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