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

2398 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikos Barkas
828597618d A bit of clean up in the up/down menu wrapping code and a fix for incorrect selectable row range in the load commander screen when the list of commanders contained less items than the available gui rows. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2947 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-09 19:51:53 +00:00
Nikos Barkas
669d039e6d Fixed menu navigation sound not playing on menu wraparound. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2946 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-09 17:58:19 +00:00
Nikos Barkas
ccdc7116e7 Added up and down arrow keys wrapping in menus. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2945 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-09 17:33:11 +00:00
Jens Ayton
2f36bdd77b Removed unused variable camera. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2944 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-09 17:33: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
Marc
e81b28dc7f Small stuff: 
- Debug console's :spawn now uses a proper js method, instead of legacy_addShips.
- the new looser definition of 'thargon' now applies to all equipment methods.
- faster switch between in-flight sunlight & GUI lighting.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2942 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-09 11:34:53 +00:00
Marc
c1cdf6f2df - fix: NPC missiles setup - thargoid missiles to be specific - are now handled better. In particular, if a thargoid missile is not defined fully (both shipdata & equipment plists), 'thargon' will be used instead. Thargoids can now use normal missiles/bombs as well. At the moment, thargon replacement 'equipment' needs TL set for NPC only, and needs to have 'thargon' either at the beginning or at the end of its role name. 
- fix: if an NPC uses subentities as their primary weapons, ship.forwardWeapon used to return no weapon at all. It now returns the first forward weapon it finds amongst the ship's subentities. Still not ideal, but better than before.
- player entity: dump bugfix, & minor code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2941 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-09 10:01:59 +00:00
Jens Ayton
109898a9f6 Added abs coordinates to FPS stuff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2940 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-08 19:46:06 +00:00
Marc
1e89df6f05 - new: subtly highlight targeted planet on the short range chart. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2939 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-08 17:48:46 +00:00
Eric Walch
eebf2d7743 - now use light-1 position in VIEW_GUI_DISPLAY to set the lighting correct. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2938 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-08 09:15:27 +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
Eric Walch
cce1002a13 Light source now also moves when a script moves the sun to new position. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2936 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-07 17:55:34 +00:00
Marc
4bb82218a5 - rev2933 part II: slightly better handling of preloadPlanetTexturesForSystem exceptions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2935 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-07 11:41:10 +00:00
Nikos Barkas
9ef21615c0 Mouse control: Pressing Shift+Ctrl+M will now switch to mouse control, with x-axis controlling yaw instead of roll. In this case, roll can be adjusted from keyboard. When in normal mouse control, yaw is adjustable from keyboard and mouse x-axis is assigned to roll as normal. Testing with joystick for ensuring no keyboard overrides are broken may be required. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2934 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-06 16:47:48 +00:00
Marc
6f1d347368 - fix: bypassed a weird preloadPlanetTexturesForSystem / F6 clash: in some cases it would cause setGuiToShortRangeScreen & setGuiToLongRangeScreen to return prematurely. It'll probably need some proper analysis, but in the meantime this fix seems to work! 
- minor cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2933 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-06 14:42:05 +00:00
Marc
da29a09953 - fix: hopefully no more messages from beyond the grave: 'target lost', 'aft view', and 'xxx damaged' - which occasionally would appear on-screen during game over - should now be a thing of the past. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2932 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-04 19:01:20 +00:00
Jens Ayton
bdddd2eccd Minor cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2931 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-04 10:31:00 +00:00
Marc
cc8fcefa44 - fix for rev2927 part II: zombie culling code fully stopped from interfering with the player, hopefully. Game Over seems to work ok again, including game restarts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2930 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-04 07:10:26 +00:00
Marc
95b2d2f6ba - Partly reined in the zombie killer code from rev2927, so dying doesn't crash Oolite to the desktop. However, the game doesn't seem to want to restart once the player's dead. More reining in will be needed, will have a look in 10 hours or so, if it hasn't been sorted by then. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2929 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-04 06:55:09 +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
Jens Ayton
6ba078a08e Added code to avoid probable cause of STATUS_DEAD ghost ships, and moar code to catch them if they appear anyway. (Bug #16624) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2927 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-03 12:46:16 +00:00
Eric Walch
86d0553639 - gave the miniature planet an orientation with the pole at the top right on the F7 display. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2926 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-01 20:30:15 +00:00
Jens Ayton
be99b4b933 Better diagnostics for script failures during load, and some maths fiddling from my holiday. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2925 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-01 16:34:52 +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
6bfe4ef87e - Made the universe a bit more random: simply looking up the witchpoint coordinates doesn't reset the main random number generator any more. Retained predetermined pseudo-randomness inside the system populator. 
- Removed some now unnecessary 'extra randomness' code.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2922 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-31 08:18:20 +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
6a6e209684 - addShip() and addGroup() without position parameter are now explicitly spawned at the witchpoint, in case the coordinates origin is moved in the future (made heliocentric perhaps?) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2920 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-30 13:38:00 +00:00
Marc
c4f1b10be1 - corrected mac compile warnings 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2919 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-30 12:18:28 +00:00
Marc
bb93c112da - yet more go-faster tweaks to the texture generator. 
- integrated the previously separate atmosphere generator inside OOPlanetTextureGenerator, to avoid noise generator overheads.
- added NEW_ATMOSPHERE compile-time switch to OOPlanetEntity.

- tidying up of contract market generators: while they're still slow, some dead code was removed.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2918 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-30 09:17:01 +00:00
Eric Walch
c0b6f16429 - Made the position variable optional in: system.addShips(role : String, count : Number[, position: Vector][, radius: Number]). When only the two first parameters are used, it now does the same as system.legacy_addShips(). This will avoid programming confusion. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2917 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-29 16:22:42 +00:00
Marc
6670980465 - faster planet rendering. 
- minor tweak to pole caps appearance.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2916 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-28 21:29:44 +00:00
Marc
56d3c67389 - 'fix' for pitch black continents & shadows in windows. Planets & miniature planets now look the same on all platforms. 
- Polar caps part I: now generated planets have caps, to hide the texture distortion at the poles. Will need some more work.
- Some speed tweaks to the rendering code.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2915 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-28 10:43:42 +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
3c8cee9a0e - Restored STATUS_LAUNCHING for launching ships and its associated "LAUNCHED OKAY" message. 
- Floating debris and small objects in front of the dock no longer blocks station launches.
- Launching of escorted ships is no longer interrupted by docking ships. (This prevents having a mother jumping out the system while still having docked escorts)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2913 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-27 14:59:39 +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
a6ee988be4 - Custom Screens Part III: all messages are displayed above the background picture now, and miniature planets/demo ships don't influence the background colour/dimness any more. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2911 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-25 09:34:56 +00:00
Marc
562d33d19d Custom Screens Part IIb: updated the mac project file to include the new stuff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2910 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-24 22:55:25 +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
32727684c6 - Custom Screens Part I: initial implementation of custom GUI screens, to be set inside the new screenbackgrounds.plist. Hopefully I haven't broken anything! 
- Some minor code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2908 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-24 10:47:08 +00:00
Eric Walch
b14dae24b3 - Defining a null value for EquipmentInfo.effectiveTechLevel will now delete the corresponding missionVariable 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2907 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-24 09:28:37 +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
Marc
f158db818f - Apart from the main stations, which are still spawned with STATUS_ACTIVE, all other stations are now spawned with STATUS_IN_FLIGHT. Should fix some breakages. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2905 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-23 03:40:49 +00:00
Marc
994d1d55be - fix for shipSpawned not firing for carriers. 
- some code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2904 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-22 18:50:45 +00:00
Eric Walch
85d744bb52 The eventhandler: "stationLaunchedShip" now also fires for a player launch and not only for NPC launches. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2903 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-21 16:50:43 +00:00
Marc
280b4841ef - re-fixed a major texture cache bug. Please do not un-fix. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2902 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-21 09:51:38 +00:00
Marc
0d7b80a16e - fix to the number of patrol ships, and to witchspace exit behaviour, some code cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2901 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-21 09:24:10 +00:00
Marc
6120ef9a47 - js timer cleanup: timers are now stopped and removed if the first ('this') parameter in the constructor goes out of scope: 
new Timer(this, this.testTimer, 10, 10);


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2900 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-21 08:36:01 +00:00
Marc
12f80f1a09 - fix for 'this' related bug inside system.filteredEntities() this bug is (erroneously!) referred to on BerliOS as bug #16439: FilteredSystems() and this. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2899 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-21 07:42:00 +00:00
Jens Ayton
6242315548 Planet textures are now cached properly. Planet generators are now run speculatively when a planet is selected on the chart and twice during hyperjumps (at the beginning and end of the countdown), with rate limiting. The redundancy is OK because the cache will catch it. Also, new planets seem to be stable now so I'm leaving them turned on. Merry Christmas, nightly users. ;-) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2898 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-20 20:08:43 +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