1661 Commits

Author SHA1 Message Date
AnotherCommander
ffe656979d Happy new year 2018-01-03 12:16:44 +01:00
phkb
e486175777 Multipage primable equip (#282)
Adds multi-page ability to primable equipment manager
2017-12-16 13:55:57 +02:00
AnotherCommander
8e417bc70a Easier to read version of the new planet diffuse lighting calculation. 2017-11-06 11:51:32 +01:00
jobi-wan
8d5277d31d Bumps master branch version number to 1.87 (#277) 2017-11-04 19:15:15 +01:00
AnotherCommander
7b58bc9382 Improved diffuse lighting on default planet shader. 2017-11-04 12:46:23 +01:00
phkb
de017b9414 Remove instances of 'vicious vicious' from planetinfo.plist 2017-10-29 09:55:58 +11:00
AnotherCommander
451665081a Version number bumped to 1.86. Code Freeze. 2017-10-17 15:36:47 +02:00
Nick Rogers
4e8a996acc Duplicate word in planet description 2017-08-10 11:50:37 +10:00
AnotherCommander
934bd29df1 Cleanup and optimizations on the default atmosphere shader. Thanks to CmdrSvengali for this contribution. Closes #254. 2017-08-07 00:16:07 +02:00
AnotherCommander
4e19314dc2 Use the length function in the atnosphere shader for calculating the length of the vector of the relative position of the player ship and the atmosphere entity. Closes #253. 2017-08-03 00:50:34 +02:00
AnotherCommander
bdb02bbe9d Target reticle colors for normal, target-sensitive and wormhole states can now be determined via hud.plist with the drawTargetReticle: dial related keys target_Rgba, target_sensitive_rgba and wormhole_rgba. Also, scripts can control these colors dynamically via the OOJSPlayerShip class properties reticleColorTarget, reticleColorTargetSensitive and reticleColorWormhole. 2017-07-16 20:28:54 +02:00
AnotherCommander
f972f6c0df Renamed the key text_standard_color to text_color for consistency. 2017-07-08 11:52:04 +02:00
AnotherCommander
73df6aa3ca Message colors are now under control of the HUD plists and scripts. The message_gui keys text_standard_color and text_comms_color control the colors of normal and incoming comms messages, while scripts can do the same by means of the JSPlayerShip keys messageGuiTextColor and messageGuiTextCommsColor respectively. This should address issue #235. 2017-07-07 19:47:24 +02:00
AnotherCommander
ef315aa88b Added the background_rgba key to the core HUD plists for reference. Default is fully transparent. 2017-07-07 11:42:14 +02:00
AnotherCommander
2e412b70a3 Added the default background_automatic key to the core hud plists. 2017-07-06 17:33:51 +02:00
AnotherCommander
4b322372a4 HUD Weapons Offline and FPS counter texts have now configurable colors by means of the rgb_color key in hud.plist. 2017-07-03 02:35:29 +02:00
phkb
6866e53437 F7 screen config and layout 2017-05-24 08:26:19 +10:00
AnotherCommander
9a7a947f6a Reverted ambient light recalibration and added the ambient_level = 0.25 line in planetinfo for each system instead. This way OXPs can change ambient level lighting on a per-system basis without requiring scripting. 2017-05-20 12:46:49 +02:00
AnotherCommander
15eb90fd79 Removed warning-generating test commodity data from Easy Start scenario. 2017-02-17 17:04:27 +01:00
AnotherCommander
16dcffc86f Experimental addition of Easy Start scenario (docked at Tionisla, 1000 Cr). 2017-02-16 20:51:48 +01:00
Kevin Anthoney
da4b3f7361 Remove jumps line from long range chart and contracts screen to avoid clashes 2017-01-25 13:16:48 +00:00
Kevin Anthoney
0dab7143a5 Merge branch 'master' of https://github.com/OoliteProject/oolite 2017-01-24 19:51:54 +00:00
Kevin Anthoney
f3c7b9e5be Add number of jumps to F6 chart screen 2017-01-24 19:50:58 +00:00
AnotherCommander
3ae3988347 Fixed incomplete implementation of class RouteElement warning and added distinction between singular and plural forms for hours and jumps on system data screen. 2017-01-23 19:40:40 +01:00
Kevin Anthoney
da688e4b5d Put systems data route info strings in descriptions.plist 2017-01-23 17:27:25 +00:00
AnotherCommander
32075335f5 Fixed broken Advanced Space Compass not being broken enough and introduced the JS PlayerShip class read/write property compassType (use with caution). 2017-01-13 15:11:23 +01:00
AnotherCommander
2ef7784b20 Happy new year! 2017-01-01 13:09:51 +01:00
AnotherCommander
b779a8f3ac Fixed fee alignment also for passenger contracts. 2016-12-10 23:02:40 +01:00
AnotherCommander
d91d4dd02f Fixed fee alignment in parcel contracts screen. 2016-12-10 22:16:59 +01:00
Nick Rogers
22bf61cc2a Adding additional system info to load screen 2016-11-29 09:27:55 +11:00
AnotherCommander
6367fd6df6 Simplifications to the atmosphere shader (removal of unused code). Thanks to Commander_X. 2016-11-13 15:31:46 +01:00
AnotherCommander
0ae90a9847 Fixed planet government and economy icons not appearing in contracts screens if concealment was not defined. 2016-09-27 21:30:24 +02:00
AnotherCommander
9e11210d7d Merge pull request #207 from OoliteProject/shady-atmos-alternative
Shady atmos alternative
2016-09-23 17:03:48 +02:00
AnotherCommander
a72bf83a2a Made atmosphere fade in/out distance and rate dependent on planet radius (thanks Commander_X) 2016-09-20 20:49:29 +02:00
AnotherCommander
04a9465028 Mix in a bit of light blue in the atmosphere color. 2016-09-17 12:04:40 +02:00
AnotherCommander
3aebc6ac96 Minor nit in atmo vertex shader. 2016-09-17 12:00:19 +02:00
Kevin Anthoney
91ad49fd1c hide system icons from cargo description for appropriate concealment level 2016-08-10 19:04:11 +01:00
AnotherCommander
ed18c87578 Bump master version to 1.85. 2016-07-31 18:36:21 +02:00
AnotherCommander
c792812f10 Opened branch for new atmosphere shader code, as described in issue #197. Thanks to Commander_X for the contribution. 2016-07-10 17:25:22 +02:00
AnotherCommander
97993cb5d0 Version bump to 1.84. Code Freeze. 2016-06-20 21:03:00 +02:00
AnotherCommander
872420b70f Bring Binary Resources to latest revision. 2016-06-18 16:00:21 +02:00
Kevin Anthoney
60618e87b7 Remove </> key combination for information system traversing in F7 screen 2016-04-16 20:43:51 +01:00
Kevin Anthoney
55f70c7431 Make keyconfig.plist consistent with PlayerEntityControls.m 2016-04-16 14:37:13 +01:00
Kevin Anthoney
412d687b2a Revert "Use ctrl + arrow keys instead of </> for moving between information systems"
This reverts commit 89274f982bea094d9fc843624e37dafc3f375b94.
2016-04-16 14:33:37 +01:00
Kevin Anthoney
89274f982b Use ctrl + arrow keys instead of </> for moving between information systems 2016-04-16 14:11:28 +01:00
Kevin Anthoney
f9965400f3 Merge master into ANA_info branch 2016-04-16 11:08:26 +01:00
AnotherCommander
2828b0c017 Fix previous fix. 2016-03-21 17:09:41 +01:00
AnotherCommander
0b1524317f Fixed incorrect parcels indexing when more than 10 parcel contracts were present. 2016-03-21 16:22:01 +01:00
AnotherCommander
f9588d236a Removed duplicate witch-no-fuel entry from customsounds.plist (thanks Svengali). 2016-03-09 13:47:22 +01:00
AnotherCommander
8a670aa204 Added marketinfo screen background key to screenbackgrounds.plist and removed unused contracts key from same plist (commented out section). Resolves issue #164. 2016-02-25 18:50:25 +01:00