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

2431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Darren Salt
22546a3bdd Fuel price & scooping changes. 
Cost & rate depend on the calculated mass of the ship.
(Some ships need density adjustments for sensible results.)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2980 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-19 16:30:34 +00:00
Marc
2f9798968e - fix: sunlight is now restored properly after loading savegames. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2979 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-19 14:01:54 +00:00
cmdrjames
c61cce22d2 minor changes to reduce xcode analyzer warnings. Hopefully I didnt break anything. Did plenty of testing, and it all seems ok. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2978 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-17 22:49:24 +00:00
Jens Ayton
edaa8aed30 Why, of *course* I test every change thoroughly before checking in. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2977 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-17 14:57:14 +00:00
Jens Ayton
0391332d16 Energy bombs are now converted into Q-mines when awarded by scripts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2976 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-17 14:51:01 +00:00
Eric Walch
48a6c47d38 - place the larger miniatures on the F7 screen a bit further away from the player to let them fit better on screen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2975 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-16 15:00:04 +00:00
Jens Ayton
b0f62bcc4b Debug code for planet colour issue (caused by unexpected lighting changes); trigger with console.debugFlags = 0x10000000 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2974 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-16 12:19:36 +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
Marc
4963ccebcb restored missing texture triangle. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2971 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-15 09:22:36 +00:00
Darren Salt
1ec2b725be Fix build without NSOperation. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2970 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-14 19:03:18 +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
Jens Ayton
af087d42a8 Entity personalities are now copied from shipyard display models and restored/synthesised from saved games, so in the shiny future we can shop for specific colour schemes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2968 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-13 20:44:25 +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
Eric Walch
c40cf6ede8 - Boulders generated by large asteroids are no longer only added at the centre. 
- Added the JS "isBoulder" property to ships.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2966 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-12 17:26:10 +00:00
Nikos Barkas
8d5ac14ce9 Synchronized sun_position in SDL's MyOpenGLView.m with that of the Cocoa's one. Fixed a probable copy/paste error in the OOSunEntity's -getSpecularComponents: method. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2965 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-12 07:08:46 +00:00
Marc
5ae49cee71 - committed a modified version of Niko's GMA950 fix. Should work like the original fix. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2964 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-12 05:42:14 +00:00
Marc
146e5f4221 - fixed mac compile warning 
- fixed an is_carrier /isCarrier bug, and put in a tentative fix for the NEW_PLANET crashes.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2963 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-12 05:03:33 +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
2c789701c4 When loading a non-strict game with an energy bomb, a Q-mine or cash bonus is now awarded as compensation. Also, disabled experimental planet stuff accidentally included in r2960. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2961 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-10 22:30:56 +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
Eric Walch
67c7f428c5 - demolight position is now already defined on startup. 
- fixed crash with boulders and splinters that had a maxFlightspeed of zero.
- fixed rounding problem on the Carrier Market screen for Pays < 100

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2959 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-10 21:13:14 +00:00
Jens Ayton
7fa2001692 Slight variations in colour and specularity on oceans. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2958 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-10 16:06:45 +00:00
Jens Ayton
172c51ce14 Minor build fixes for distance map tool. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2957 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-10 15:38:53 +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
f270d1d8be OOPlanetTextureGenerator.m no longer uses statics, and noise generation is more cleanly separated out. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2955 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-10 14:56:27 +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
Nikos Barkas
7763a11733 Fixed menu wrapping (More/Back) in status screen, when more than two equipment pages were available. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2953 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-10 11:52:47 +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
5d4a200fbd Ships now have a slight specular effect in shader mode, just as they do in non-shader mode. If specular_map is specified, specular coour and shininess defaults change to nominal maximum values so it's clear something is happening. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2951 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-09 21:35:43 +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
Nikos Barkas
9adb2a029b Oops. Too much punctuation. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2948 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-09 19:54:49 +00:00
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