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

39 Commits

Author SHA1 Message Date
AnotherCommander
683b81ada0 Rename hud plist key from nonlinear_scanner to scanner_non_linear for consistency with the equivalent JS properties naming. 2014-02-18 15:28:59 +01:00
AnotherCommander
026bb9daf0 Some minor cleanup of non linear scanner code. Made non linear scanner and scanner ultra zoom JS player ship boolean read/write properties, namely 'scannerNonLinear' and 'scannerUltraZoom' respectively. Updated hud plists to default to both false. 2014-02-18 15:08:16 +01:00
Kevin Anthoney
e450507a41 Add ultra zoom option 2014-02-04 17:14:29 +00:00
Kevin Anthoney
66d4288014 add nonlinear_scanner to hud.plist 2014-02-04 17:14:29 +00:00
cim
c2abd5c386 Make stick precision indicator available on default HUDs 
(but hide it if no joystick connected)
 2013-12-22 18:08:36 +00:00
cim
9d8850d4d8 Adjust HUD dial positioning slightly 
Scanner zoom is now closer to the scanner than to the compass
 2013-12-06 18:20:32 +00:00
cim
7e83f253a6 Start introducing the HUD in the tutorial 
New features: player.ship.{show,hide}HUDSelector(selector) to selectively disable HUD entries.
with_dial entry for legends to tie legends to the visibility of particular HUD selectors.
 2013-12-04 22:57:39 +00:00
cim
04fcf560a8 Make weapons-offline notice much more noticeable 2013-11-03 12:29:23 +00:00
cim
74ffe7d8ae Increase console message size a bit for readability 2013-10-20 16:53:46 +01:00
cim
880c7294b2 Adjust MFD sizes for better font scaling, force MFD lines to be right length. 2013-10-09 18:11:29 +01:00
cim
d817df2576 Add MFD to small HUD, make MFDs work after loading game 2013-10-09 17:53:19 +01:00
cim
ff60370d3f Make a start on the MFDs 2013-10-07 22:30:29 +01:00
cim
a5d8d2b43a "reticle_scale" parameter for Scanner Targeting Enhancement 
HUDs intended for large high-resolution screens may wish to reduce this a little from the default. Closes #20
 2013-10-07 17:59:14 +01:00
cim
23b5edea58 Initial implementation of waypoints 
Try something like this to test.
S.setWaypoint("test", { position: [3E5,3E5,0], size: 5000, beaconCode: "T", beaconLabel: "Waypoint 1" });
 2013-10-01 21:48:02 +01:00
cim
cf5c5711d7 Adjust comm/console displays so there's room for later developments 
Also stops a busy communications channel from running over the crosshairs.
 2013-09-29 17:43:43 +01:00
cim
d391e0df4d Add beaconLabel properties to JS ship, visual effect 
Note that we are now over half-full on ship properties, and fix resulting bug.
 2013-09-29 16:44:19 +01:00
cim
1691584ea6 Add dial to small HUD, slightly adjust normal HUD for better fit 2013-09-29 00:03:34 +01:00
cim
e377cd8438 Add beacon dial (will be needed for waypoints) and beacon label property 
(beacon code isn't suitable as initial letter of label may differ from code: the N beacon being an obvious example)
 2013-09-28 23:31:50 +01:00
cim
83e0f31316 Primable equipment dial for HUD 
Hidden while docked (primable equipment unusuable) or if no primable equipment is installed
 2013-07-05 20:30:09 +01:00
Marc
b353faef84 A mixed bag: 
* change: specifically setting empty comms_log_gui & message_gui sections inside hud plists now resets those guis to Oolite's default. Updated standard huds accordingly.
 * bugfix: fixed crash with malformed gui declarations inside hud plists - trunk & maintenance.
 * change: internal name of commodity identifiers normalised: 'liquor/wines', 'alien items', 'gem-stones' are now expressed internally as 'liguor_wines', 'alien_items' and 'gem_stones' - in most cases the old identifiers are still recognised, for backward compatibility.
 - linux build and windows build directories separated, both can now share the same source directory without build conflicts.
 - updated copyright notice in shaders files, minor planet drawable cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4826 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-01 13:27:36 +00:00
Jens Ayton
67aa1fb371 Default HUD roll and pitch indicators no longer overlap. (Bug #17916) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4493 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-26 19:16:16 +00:00
Nikos Barkas
05694cebdc Implemented weapons lockdown toggle. Defaults to '_' and the weapons online/offline status is saved in the player's savefile. Affects lasers, missiles, mines and energy bomb. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3774 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-10-21 09:27:33 +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
Nikos Barkas
f5b4de349a Fixed new planets not rotating. Made cloak indicator on status light default to YES. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2819 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-30 21:03:16 +00:00
Gary Wong
b5315d49e8 Added "x_origin" and "y_origin" keys to HUD dictionaries, to allow 
HUDs to specify dial and legend positions with respect to arbitrary
parts of the screen.

Modified the default HUD to use "y_origin" so that the appropriate
parts of the display are aligned with the screen bottom, for any
aspect ratio.

(Co-ordinate #defines in HeadUpDisplay.h have NOT yet been updated, for
compatibility with any custom HUDs which might rely on them.)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2719 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-03 17:36:18 +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
Michael Werle
734938237f Fix the various 'targetting' spelling errors. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2360 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-03 14:09:05 +00:00
Nikos Barkas
d327b41c73 Fixed HUD speed bar not drawing correctly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2281 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-11 15:07:41 +00:00
Nikos Barkas
777f99046b Changed default cloak_indicator_on_status_light in to NO, as it was initially meant to be. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2279 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-09 16:22:40 +00:00
Nikos Barkas
71cc6e6e2b Switched hud.plist to OpenStep format and added example of drawing a yaw indicator bar (disabled by default - comment out relevant lines to enable). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2117 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-02 21:57:34 +00:00
Nikos Barkas
01eb2aaf3f Implemented the key cloak_indicator_on_status_light in hud.plist, default to NO. When set to YES, it will shift the colour of the status light towards blue whenever the player is cloaked. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2084 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-05 02:05:17 +00:00
Jens Ayton
c9f22eacfb Hot new data-driven crosshairs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1911 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-17 00:40:09 +00:00
Nikos Barkas
8a91fa3be7 Implemented the reticle_target_sensitive key in hud.plist. If set to true, selected targets that pass through the center of the reticle cause the targetting box to change color to red. Default is false. Also added a couple of missing break statements in OOJSTimer.m. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1731 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-14 18:36:42 +00:00
Dylan Smith
1264b83cf0 Move cocoa-merge (GUSTO) to trunk 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@289 127b21dd-08f5-0310-b4b7-95ae10353056
 2006-03-05 16:26:25 +00:00
Dylan Smith
653488e27e Nerge missed plist files to OS X revision 932 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@147 127b21dd-08f5-0310-b4b7-95ae10353056
 2005-10-02 14:36:08 +00:00
dajt
51e0e5d75e Replaced left and right HUD images with text 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@79 127b21dd-08f5-0310-b4b7-95ae10353056
 2005-06-16 10:03:37 +00:00
dajt
bd201d29ff Putting XML plists back in place. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@77 127b21dd-08f5-0310-b4b7-95ae10353056
 2005-06-08 10:22:59 +00:00
Giles Williams
3e3535b890 changes and fixes from OSX r782 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@74 127b21dd-08f5-0310-b4b7-95ae10353056
 2005-06-07 15:14:51 +00:00
Dylan Smith
3274cb3ea6 organize the source tree somewhat better 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@30 127b21dd-08f5-0310-b4b7-95ae10353056
 2005-04-28 21:47:22 +00:00