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

817 Commits

Author SHA1 Message Date
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
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
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
3df2a3e3dd Implemented HUD dial whitelisting. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3370 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-18 19:26:26 +00:00
Marc
9813c80369 * changes to docking effects: 
- rock hermits have a docking tunnel consistent with their docking slot.
- when in strict mode, use ring.dat for all docking (as per oolite 1.65 - 1.73).
- renamed the new docking 'rings' as oolite-tunnel.dat and oolite-rocktunnel.dat.

* fix: stopped ship.exitSystem() from generating a clone of itself after leaving the system.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3360 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-15 23:07:02 +00:00
Jens Ayton
ccc8c14de3 Fixed a retain imbalance in OOMultiTextureMaterial. Temporarily disabled OOTEXTURE_RELOADABLE because it breaks OOMultiTextureMaterial in complex ways (and attempt at a simple fix failed horribly). Updated material test suite to handle simple-shader-only case. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3347 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-14 17:22:58 +00:00
Jens Ayton
2474ea35a4 Documentation of maximumShaderMode in console script. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3346 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-14 17:12:42 +00:00
Jens Ayton
a7cf62d05f Support for GPU-specific settings. Dust now works/isn't slow (depending on platform) on GMA9xx. Default shader mode is now FULL except on 9xx/GeForce 5200. Full shader mode is disabled on GMA9xx. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3339 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-14 12:45:10 +00:00
Jens Ayton
3de5adccc1 Centralized setting of GL_POINT_SMOOTH and GL_LINE_SMOOTH, since they're never deliberately disabled. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3338 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-14 09:53:02 +00:00
Marc
77047570b3 * Change to startup 'load previous commander Y/N?': 
- in unrestricted mode, the question is asked only if at least one save file can be found. 
  - in restricted mode, the question is asked at all times, like in Elite.
* Change to restart look & feel:
  - a spinning cobra is now shown after all restarts, like in Elite.
  - 'restricted/strict mode enabled' is now shown only when switching between strict/unrestricted mode.
* Logging of searchPaths.dumpAll now happens at startup, and if search paths change due to switching between strict/unrestricted mode. 

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3320 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-11 21:07:45 +00:00
Jens Ayton
766259e7bf Planet textures can again be changed via JavaScript. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3319 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-11 20:41:14 +00:00
Jens Ayton
084248f98f Tiny tweaks: renamed AI methods scanFor{Nearest|Random}Merchantmen to ...Merchantman (with compatibility aliases). Removed all Light 0 stuff from shaders. Belatedly bumped cache format version for changed dust shader. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3314 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-09 23:13:12 +00:00
Jens Ayton
1d7b85b918 Slight dust shader optimization. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3313 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-09 19:37:09 +00:00
Jens Ayton
5599e4f375 More dust fun: dust box repeating is now handled in shader, so dust is now static geometry in shader mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3312 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-09 19:23:06 +00:00
Jens Ayton
7c674d3d4a Dust draws with vertex arrays, warping is applied in shader (which allows for more customization as a side effect). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3311 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-09 18:22:53 +00:00
Jens Ayton
46c40ec186 More graceful handling of disappearing docking target. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3308 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-09 15:21:06 +00:00
Jens Ayton
edf647f4e5 Dust is now more subtle, especially in shader mode. It also scales smoothly instead of jumping between dot sizes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3304 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-08 22:51:33 +00:00
Jens Ayton
8392bee4a5 Fade dust motes to clear instead of black when shady. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3298 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-06 18:22:53 +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
Nikos Barkas
b41ae4d829 Added missing 'OXP(s) containing messages found' message in descriptions.plist. The path of the OXP with messages echoed to the log is now the last path component only. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3291 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-05 17:11:41 +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
Nikos Barkas
cac50efa67 i18n'ed a spoken message. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3275 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-02 22:51:00 +00:00
Jens Ayton
12016a853b Cleaned up redundant dual licensing headers as previously discussed. Gosh, there's a lot of them. Feel free to ad your name or 'and contributors' as appropriate. Also, excluded unused classes OOCamera and OOLight from build, but didn't delete them. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3263 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-02 12:32:43 +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
Eric Walch
f4e872077a - Increased the strength of the Constrictor a bit when fighting against more experienced players. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3210 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-24 08:32:23 +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
91ed7e8c5a Use renamed colour attributes in built-in shipdata. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3181 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-21 19:18:09 +00:00
Jens Ayton
45380f2f9e Changed coordinate scheme for non-shader/default-shader cube maps to be based on vertex positions rather than normals. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3180 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-21 19:12:26 +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
Marc
ed3f7e28ce - added new default 'tunnel' shape - docking/undocking. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3167 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-16 06:53:57 +00:00
Jens Ayton
c9cdbc7631 Added extra shader validation, controlled by DEBUG_SHADER_VALIDATION flag. Removed DEBUG_ENTITIES and merged DEBUG_OCTREE and DEBUG_OCTREE_TEXT into DEBUG_OCTREE_LOGGING. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3148 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-11 16:03:43 +00:00
Jens Ayton
d8d5393d4e Workaround for Svengali's GLSL preprocessor bug. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3132 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-07 22:35:24 +00:00
Nikos Barkas
32f250e957 Compass can now have a color definition in hud.plist. Fixed a bug where having an alpha value defined for scanner would result in it being ignored when an rgb_color key was also defined. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3127 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-06 11:00:19 +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
Marc
a58863656d Updated verifier schema with rev3091's changes, and added two stray keys to both verifier files. :) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3094 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-02 21:19:40 +00:00
Eric Walch
79e39c5f6e - added a shipKey: market, to define a local market for stations with primaryRole as the default market. 
- added a shipKey: hasScoopMessage, to be able to suppress the standard scoop massage for cargo.
- added the JS method: setCargo to set cargo type and quantity for barrels.
- Scripted cargo that is awarded a content (either by setCargo or the skipKey cargo_carried) is not removed from the universe on scooping but stays in the hold of the scooper.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3091 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-02 19:29:12 +00:00
Jens Ayton
a79eae0acc Better error logging when loading a saved game fails. Fixed up some script comments. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3080 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-26 23:07:23 +00:00
Jens Ayton
02e4b2bf8a Fixed Mac build. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3060 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-13 15:05:22 +00:00
Jens Ayton
29e904f0f6 More work on player shader binding issue: implemented ProxyPlayerEntity class. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3052 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-03 21:23:31 +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
Eric Walch
955390d1c4 - Moved both fine messages to the arrival report screen. 
- Removed a backdoor to do contract runs in a strict game.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3039 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-24 20:28:47 +00:00
Marc
132f95e13f When in strict mode, savegames with oxp player ships cannot be loaded. Added the appropriate error message. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3030 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-15 02:22:33 +00:00
Marc
41cd953184 - Verifier: removed duplicated key entry in verifyOXP.plist and brought its associated schema up to date. 
- Scripting: added ship.canAwardEquipment() to check if a specific equipment item is compatible with that ship.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3029 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-15 01:41:14 +00:00