584 Commits

Author SHA1 Message Date
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
Eric Walch
c1a3e4c425 - Added some missing keys to verifyOxp.plist
- Minor AI changes.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3018 127b21dd-08f5-0310-b4b7-95ae10353056
2010-02-13 17:55:02 +00:00
Jens Ayton
a90629799d Added lightsActive JS ship property and shader binding, tied into switchLightsOn/switchLightsOff.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3013 127b21dd-08f5-0310-b4b7-95ae10353056
2010-02-09 16:56:04 +00:00
Nikos Barkas
5c44527f4c Fixed comment making reference to obsoleted galactic hyperspace behaviour identifier to eliminate potential confusion.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3005 127b21dd-08f5-0310-b4b7-95ae10353056
2010-02-05 10:50:46 +00:00
Eric Walch
e8ae0f1f23 AI tweaks
- Added a few extra tests for OFFENCE_COMMITTED so attack on clean ships around the station are better registered.
- Raised the jump range for an exitingTrader to outside the mass lock range of a heavy torus station. (Won't affect other traders as ships should never reach this range.)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3003 127b21dd-08f5-0310-b4b7-95ae10353056
2010-02-02 21:06:21 +00:00
Eric Walch
6dcb052dc2 AI tweaks
- Added a few extra tests for OFFENCE_COMMITTED so attack on clean ships around the station are better registered.
- Raised the jump range for an exitingTrader to outside the mass lock range of a heavy torus station. (Won't affect other traders as ships should never reach this range.)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3002 127b21dd-08f5-0310-b4b7-95ae10353056
2010-02-02 21:05:10 +00:00
Eric Walch
41d0d79ad7 - SystemInfo.systemsInRange now does not find the current system.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3000 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-30 17:26:51 +00:00
Jens Ayton
4284da31cd Ships with the same model but different material dictionaries now work properly. Changed mechanism for saving and restoring wormholed ships.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2994 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-23 22:20:55 +00:00
Jens Ayton
f9603b2f0b Support for explicit per-vertex normals and tangents. Also support storing material names out-of-line for less redundancy/smaller files.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2989 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-22 13:10:31 +00:00
Marc
152e889b32 - tweaked new fuel prices.
- integrated fuel_charge_rate with the verifier & clamped it between 1/3 & 3x of the calculated fuel prices.
- disabled new fuel prices for the time being.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2985 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-21 11:47:16 +00:00
Jens Ayton
c2860317a4 Re-enabled energy bomb until post-MNSR.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2984 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-20 21:51:31 +00:00
Jens Ayton
64b4d4e9e3 Minor cleanup; made fallback material as weird-looking as it used to be.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2973 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-16 11:57:00 +00:00
Nikos Barkas
1cca29a600 Made joystick mapper screen strings localizable. Attempt to control long strings from messing up the stick mapper screen (test and fine tuning may be required).
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2972 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-15 21:38:03 +00:00
Nikos Barkas
0e1226ca80 Roll year to 2010.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2969 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-14 16:58:32 +00:00
Marc
8245dcf40c Systems in G5-G8 which are supposed to have pink or vast oceans now do. (individual values might need tweaking)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2967 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-13 12:32:31 +00:00
Marc
3320a6bc4d - Faster lights on/off implementation for shaders (as per bug #16268), included within a slight lighting & update method rewrite. Not directly usable as dimmer switch yet, but can be easily adapted to that purpose.
- OOGL wrapper added to a few stray opengl instructions from a previous commit.
- Possible fix for lower end graphic cards F7 lighting direction bug, as reported by a_c.
- Hopefully the last rename for the 'old' setSunCenterPosition method from rev2936

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2962 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-11 20:53:02 +00:00
Jens Ayton
cd760213e7 Energy bombs are now only available in strict mode. Strict mode-compatible equipment is now explicitly flagged instead of using count (and thargon is now strict-compatible).
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2960 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-10 22:00:18 +00:00
Jens Ayton
93e82f18c6 Fixes for debris_role.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2956 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-10 15:26:25 +00:00
Jens Ayton
4dd43e3581 Asteroids and boulders can now specify custom debris roles. Setting a planet texture to a non-existent texture now has no effect instead of producing a black planet.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2954 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-10 12:40:21 +00:00
Marc
193a5b5c4c - Lights on on/off switch added to shaders, could also be used as a dimmer switch in the future. :) This should finally fix bug #16268: Lighting issues for shaders.
- HUD whitelisting, part 0.5!

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2952 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-10 10:23:20 +00:00
Jens Ayton
f1393d68b5 Cleanup; fixed a bug in default shader with normal mapping; less harsh shadows on shaderless new planets.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2950 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-09 20:18:21 +00:00
Jens Ayton
458fa19a7a Advanced cross-platform multiplication sign technology.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2949 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-09 20:16:02 +00:00
Marc
4022a5e9ee Oops! Corrected a warning to display only when appropriate to do so, and some minor tidying up...
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2943 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-09 12:36:38 +00:00
Jens Ayton
d2b156ec5d Systems in G1-G4 which are supposed to have pink or vast oceans now do.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2937 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-07 23:46:33 +00:00
Marc
bb5e6e963d - fix: oolite.setScreenBackground() & oolite.setScreenOverlay() from rev2921 ( the latter was called .setScreenForeground() before ) now change background & overlay for as long as the current GUI screen is still active, as originally intended.
- change: mission.runScreen now accepts the 'overlay' parameter (was 'foreground', which isn't recognised anymore).
- fix: report_screens now call the guiScreenChanged() event too.
- new: added the following keys to screenbackgrounds.plist: 'mission_overlay', 'overlay', 'docked_overlay', 'paused_overlay', 'paused_docked_overlay'. If viewing a gui screen when pause was started, and paused_overlay/paused_docked_overlay produce a texture, the overlay texture is displayed instead of the 'Paused - press P' message.
- fix: save game screen now behaves more like other screens - it responds to the various F keys (while still allowing numbers to be typed in), and the [back] & [more] onscreen buttons work when clicked.

- bouns fixes: random bugfix to a deprecated function redirect, and the 'overwrite game?' mini screen now responds to the translated y/n keys instead of hardcoded ascii values.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2928 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-04 06:22:35 +00:00
Eric Walch
f502f30e66 - planets now rotate around their poles, even script added ones
- changing orientation by JS script now correctly changes the rotation axis
- relocated the "stationLaunchedShip" handler
- escorts looking for a new master won't find masters that are busy targeting the escort.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2923 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-01 11:19:14 +00:00
Marc
b30952a7dd - Textures NFS: fastest texture generation yet! It might be a bit difficult to make it faster.
- New oolite.setScreenBackground() & oolite.setScreenForeground() functions. Can be used within gui change events to dynamically override screenbackgrounds.plist settings.
- fixed '( Furry Frogs)' (& similar) display glitch in F7 screen: it now reads '(Furry Frogs)'.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2921 127b21dd-08f5-0310-b4b7-95ae10353056
2009-12-31 04:30:17 +00:00
Marc
6f2ee3d132 - Reverted pirates to full nastiness!
- Stopped dumping atmosphere textures for now.
- Harmonised TL to 98 for NPC-only equipment. And reworded comments!
- Windows & linux now don't show detailed planet options when compiled with NEW_PLANETS any more.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2914 127b21dd-08f5-0310-b4b7-95ae10353056
2009-12-27 16:45:11 +00:00
Eric Walch
2f48ec24a2 - The default route for system.addShiptsToRoute() is now withchpoint->station (not witchpoint->planet)
- NPC ships can now be awarded with EQ_SHIELD_BOOSTER  and EQ_SHIELD_ENHANCER by script. (added EQ_SHIELD_ENHANCER as a npc only equipment)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2912 127b21dd-08f5-0310-b4b7-95ae10353056
2009-12-25 12:09:46 +00:00
Marc
13b3d272c8 - Custom Screens Part IIa: most glitches fixed, added custom background file to Oolite with predefined galaxy chart backgrounds. (Part IIb coming up: tweaks to the project file on macs)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2909 127b21dd-08f5-0310-b4b7-95ae10353056
2009-12-24 22:43:46 +00:00
Marc
c010a69056 - Pause now works when docked. If paused when docked, no options are available. Added new translation string "game-paused-docked".
- Added 3 javascript properties to ships: isCargo, isDerelict and isRock (the last one identifies both asteroids and rock hermits)
- Tidying up!

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2906 127b21dd-08f5-0310-b4b7-95ae10353056
2009-12-23 23:00:53 +00:00
Jens Ayton
ca61fb9709 Hermite interpolation for less awful planet normal maps. All-zero alpha channels are now also ignored by debug dumper.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2897 127b21dd-08f5-0310-b4b7-95ae10353056
2009-12-20 19:41:20 +00:00
Jens Ayton
ca8bdfa70e Return values and semicolons for all!
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2890 127b21dd-08f5-0310-b4b7-95ae10353056
2009-12-17 07:33:10 +00:00
Marc
7c2a544db2 - oops!
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2889 127b21dd-08f5-0310-b4b7-95ae10353056
2009-12-17 06:31:40 +00:00