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

2806 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
8a9a1e7b83 Added new debug function: console.writeMemoryStats(). Estimates total memory use by entities and textures, and how much texture data is visible (i.e. relevant to GPU swapping). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3434 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-30 14:51:13 +00:00
Jens Ayton
e532171d9d Fixed a faulty diagnostic. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3433 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-30 11:54:22 +00:00
Marc
5b70a00b4b - one more fix for the day! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3432 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-30 01:54:19 +00:00
Marc
307e0643a7 - 3425 redux: fixed remaining bugs from that commit, hopefully found them all. 
- no more distorted textures when reduced detail is on.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3431 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-29 23:51:16 +00:00
Jens Ayton
e12b40f5e2 Changes to the shader mode through the debug console is no longer saved. The reduced detail setting is now exposed through the console (also not saved), and disabled by the material test suite. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3430 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-29 19:42:46 +00:00
Nikos Barkas
834e09c007 Got stick mapper to see the correct foreground/background methods. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3429 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-29 19:10:06 +00:00
Jens Ayton
01afc05c13 Fixed lack of specular mapping on default-shader objects in reduced detail mode, then limited default-shader materials to three texture maps in reduced detail mode. Who uses reduced detail mode and shaders anyway? Reduced detail mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3428 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-29 19:09:34 +00:00
Jens Ayton
4f9b0a21d5 Fixed several issues with textures in shaderless mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3427 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-29 18:41:42 +00:00
Jens Ayton
4a33bc8f5a Centralised texture loading for backgrounds and overlays, and set options so textures aren't shrunk in reduced detail mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3425 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-29 17:55:03 +00:00
Jens Ayton
51c754eb84 Cargo/alloys from dying ships, and escape pods, now inherit parent's temperature. Temperature inheritance behaviour changed so ejecta from very hot ships are also very hot, and ejecta from ambient-temperature ships are not extra cold. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3424 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-28 11:17:45 +00:00
Marc
60fe22388f - Oops, thanks A_C! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3423 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-28 11:06:07 +00:00
Marc
1c1a42d3a3 - fix: status screen now correctly reports present & hyperspace systems. As a result, overlapping systems don't seem to get mixed up any more. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3422 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-28 08:34:06 +00:00
Marc
89f0b8a4b2 - bugfix for bug #017176: Background/overlay interference. Instead of the generic mission_overlay key we now have two keys: mission_overlay_with_title & mission_overlay_no_title, to allow overlays designed for the two different screen layouts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3420 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-27 22:39:25 +00:00
getafix
fe17da1d83 Fixed no oolite entry in the Games menu for some distros, 
for autopackage package installation.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3419 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-27 19:09:09 +00:00
Nikos Barkas
bce176a53b Ensure that Material Test Suite starts up on SDL builds also when the suite and the Debug.oxp are installed, but the debug console app itself is not running. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3418 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-27 09:30:01 +00:00
Marc
21587b3f4d - new js function: player.ship.awardEquipmentToCurrentPylon(equipmentInfoExpression) 
Similar to ship.awardEquipment(), allowed only while a missile/mine is being launched, and replaces the missile/mine currently being launched with the specified missile/mine.
Returns true if the replacement was successful, false otherwise.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3417 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-27 01:28:02 +00:00
Jens Ayton
ee25d0586e Use chnagedScriptHandlers.plist to handle renamed event handlers - in this case, shipTargetDestroyed/shipDestroyedTarget and shipTargetLost/shipLostTarget. This generates appropriate deprecation warnings and all that jazz. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3416 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-26 22:23:52 +00:00
Jens Ayton
4f306f2b3b Moved JS setScreenBackground() and setScreenForeground() into global object. oolite object is for info about application. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3415 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-26 21:42:14 +00:00
Jens Ayton
9ee645891d Removed some scary commented out code that looked as though it should be necessary, but actually isn't. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3414 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-26 21:34:32 +00:00
Jens Ayton
925970619e Cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3413 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-26 21:01:32 +00:00
Jens Ayton
0e00274072 Material test suite now runs on startup and does not require debug OXP. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3412 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-26 20:58:16 +00:00
Jens Ayton
d0fc6e191b Removed old nameless missile/mine armed messages (not used). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3411 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-26 19:42:12 +00:00
Jens Ayton
9a0347a4b5 Tidying up a bit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3410 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-26 19:34:40 +00:00
Jens Ayton
e65f1a3cf5 Added EquipmentInfo.allEquipment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3409 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-26 19:34:27 +00:00
Jens Ayton
badbc4b8c5 Restored old Ship.hasEquipment() behaviour, added deprecation warning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3408 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-25 19:35:53 +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
6ee2a9e059 Ship.hasEquipment() now temporarily generates a warning rather than an exception if called with a _DAMAGED key. In this case, it works as before. If the key doesn't have a _DAMAGED suffix, it now checks for the existence of both the damaged and undamaged versions, which is the correct new behaviour. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3406 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-24 20:27:12 +00:00
Jens Ayton
88276c144a Changed error for subentities with zero orientation to a warning, since it's fixable (and in fact already was being fixed). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3405 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-24 19:47:02 +00:00
Jens Ayton
141bd16b1a Actually disabled the thing I said I disabled in 3403. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3404 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-24 19:38:05 +00:00
Jens Ayton
c1bf8843ae Disabled attempt to distiguish between boolean and integer NSNumbers when converting to JS values, because that distinction cannot be made in GNUstep. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3403 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-24 19:25:58 +00:00
Jens Ayton
944c001ff2 Fixed cascading error for broken old-style subentity declaration. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3402 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-24 19:19:58 +00:00
Darren Salt
5f76bbccb3 Fix up GeForce 5xxx matching for correctness (in case of 5-digit numbers). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3401 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-23 22:30:26 +00:00
Darren Salt
54f1e8c304 Oops. Missing backslash. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3400 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-23 22:29:02 +00:00
Darren Salt
5bd3ce8aba Fix up Intel 8xx/9xx matching. 
Remove a duplicate \d; require a word break before matching an 8 or a 9.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3399 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-23 22:11:39 +00:00
Darren Salt
64907426fd Tighten Radeon R300 matching to exclude R4xx while still including RS4xx and RC4xx. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3398 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-23 22:08:14 +00:00
Jens Ayton
9258c94c9e Made a note of the fact that -[OOMesh calculateVertexTangents] makes no sense whatsoever. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3397 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-22 15:50:26 +00:00
Nikos Barkas
f2c21e455d Lasers are shown at the end of the equipment list again, like they have always had. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3396 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-22 15:45:37 +00:00
Jens Ayton
b2c11bf6f2 Fixed nasty, nasty uninitialized variable in r3391. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3395 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-22 15:00:15 +00:00
Jens Ayton
e548b72068 Use correct face area calculation when generating tangents for model with explicit normals but implicit tangents. Keep broken calculcation for normal-smoothing for bugwards-compatibility with existing models. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3394 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-22 14:49:18 +00:00
Darren Salt
e0edf2e740 Extend Radeon R3xx detection. 
* Match R400 series, RC410, RS480; AIUI, same shader capabilities as R3xx.
* No point in matching on "Tungsten", which is only relevant for Intel hw.
* Disable line/point anti-aliasing when using Mesa (done in software).
* Handle classic Mesa and Gallium3D separately for clarity (for now) and
  for future divergence wrt anti-aliasing.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3393 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-21 22:36:34 +00:00
Jens Ayton
58fa60d9df Made gpu-settings.plist regexps more general, and added ATI R300 family. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3392 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-21 20:27:06 +00:00
Jens Ayton
8f66eb050b Refactored default material set-up for comprehensibility and graceful degradation. (Bug #17175) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3391 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-21 15:52:59 +00:00
Jens Ayton
dd205c915b Fixed a shader error when using normal map but no specular lighting at all. Odd thing to do, but valid. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3390 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-21 15:01:48 +00:00
Jens Ayton
852bcd9b4a Added check for GL_MAX_TEXTURE_IMAGE_UNITS_ARB, and exposed GL_MAX_TEXTURE_IMAGE_UNITS_ARB and GL_MAX_TEXTURE_UNITS_ARB to JS (pertains to bug #17175) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3389 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-21 12:35:57 +00:00
Jens Ayton
c34d78f428 Introduced specular_modulate_color and emission_modulate_color as per bug #17175, and renamed illumination_color to illumination_modulate_color to match (but not diffuse_color or ambient_color, as these can still be either overall colours or modulating colours depending on whether there's a diffuse map). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3388 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-20 19:41:49 +00:00
Jens Ayton
f74836f3b5 An OXP can now cause the debug console object to be created even if the debug OXP is not loaded (basically a special case for the material test suite). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3387 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-20 19:03:43 +00:00
Jens Ayton
ef28620dca More explicit handling of support for systems without texture combiners. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3386 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-20 16:50:10 +00:00
Nikos Barkas
a7a18ecbcc Fixed texture combiners crash on systems with OpenGL version less than 1.3. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3385 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-20 14:03:07 +00:00
Eric Walch
6bd4f90ccd Fixed an addShip() positioning bug introduced with 3375 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3384 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-19 21:24:49 +00:00
Jens Ayton
f0c0738233 Relaxed requirements for JS ship.hasEquipment()/canAwardEquipment(): they now return false instead of throwing an exception when passed a non-existent equipment key, unless it ends with _DAMAGED. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3383 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-19 20:43:14 +00:00