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

2734 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
517468e912 planettool: fixed crash in 32-bit builds when rendering to Mercator or Gall-Peters. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3356 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-15 19:33:36 +00:00
Jens Ayton
9e6dd6923b Deleted debug code. Stupid Xcode, not saving when I think it should. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3355 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-15 19:32:39 +00:00
Jens Ayton
32562a2bde Cleaned up texture-related options checking, and worked around an incompatibility with OpenGL 1.1. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3354 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-15 19:10:52 +00:00
Jens Ayton
636d470f6b Fixed bug where non-cube-map textures were treated as cube maps in situations where cube maps were permitted - in practice, planet textures. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3353 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-15 18:25:34 +00:00
Jens Ayton
3ad68067ee Moar OpenGL error checking. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3352 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-15 13:41:16 +00:00
Jens Ayton
06f8014443 Fixed silly GNUstep complaints about class methods using locals with the same name as instance variables. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3351 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-15 11:36:35 +00:00
Jens Ayton
31de92f8ed Fixed premature/double frees of texture data. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3350 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-15 10:38:25 +00:00
Jens Ayton
6ae1daa4a9 JavaScript PlayerShip now has properties again. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3349 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-15 10:28:30 +00:00
Jens Ayton
ea630ce73f Mucking about with texture system in preparation for fixing incompatibility between OOMultiTextureMaterial and OOTEXTURE_RELOADABLE. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3348 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-14 23:17:11 +00:00
Jens Ayton
ccc8c14de3 Fixed a retain imbalance in OOMultiTextureMaterial. Temporarily disabled OOTEXTURE_RELOADABLE because it breaks OOMultiTextureMaterial in complex ways (and attempt at a simple fix failed horribly). Updated material test suite to handle simple-shader-only case. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3347 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-14 17:22:58 +00:00
Jens Ayton
2474ea35a4 Documentation of maximumShaderMode in console script. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3346 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-14 17:12:42 +00:00
Jens Ayton
acf9dda258 JS expandMissionText() now handles unknown keys gracefully. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3345 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-14 17:11:17 +00:00
Jens Ayton
c6dad938fe Disabled DEBUG_SHADER_VALIDATION as glValidateProgramARB is apparently broken on my laptop. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3344 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-14 17:07:38 +00:00
Jens Ayton
ecfe76cce2 Fixed OORegExpMatcher build issue for GNUstep, and fixed a memory leak. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3343 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-14 15:27:09 +00:00
Jens Ayton
4fcccd8679 Yet another attempt att GNUstep 1.20 compatibility. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3342 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-14 13:34:07 +00:00
Jens Ayton
b0a0db0756 Added maximumShaderMode property to JS console. Changed preference key for shader mode so that everyone will be given the default now that it's FULL for most people. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3341 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-14 13:01:55 +00:00
Jens Ayton
8e28c80ec0 Removed entity size dump code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3340 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-14 12:51:54 +00:00
Jens Ayton
a7cf62d05f Support for GPU-specific settings. Dust now works/isn't slow (depending on platform) on GMA9xx. Default shader mode is now FULL except on 9xx/GeForce 5200. Full shader mode is disabled on GMA9xx. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3339 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-14 12:45:10 +00:00
Jens Ayton
3de5adccc1 Centralized setting of GL_POINT_SMOOTH and GL_LINE_SMOOTH, since they're never deliberately disabled. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3338 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-14 09:53:02 +00:00
Jens Ayton
199fb72a39 Added note that oo_isBoolean is unreliable under GNUstep 1.20, since there is no distinction between integer and boolean NSNumbers. Currently oo_isBoolean is unused, so it's not an immediate problem. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3337 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-14 09:31:05 +00:00
Jens Ayton
5defcdf2b5 GNUstep 1.20 compatibility fix. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3336 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-14 08:43:16 +00:00
Jens Ayton
0114ccb243 More fine-grained checking for exceptions during player update. Also fixed a bug where it was technically possible to come to a complete stop in strict mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3335 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-13 23:51:42 +00:00
Jens Ayton
558e3439fe Equipment scriptInfo is never null/undefined. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3334 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-13 23:15:32 +00:00
Jens Ayton
5010e7c777 Added script_info property to equipment types. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3333 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-13 23:07:35 +00:00
Jens Ayton
4713b70d14 Removed obsolete reference to Basic-debug.oxp. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3332 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-13 22:50:45 +00:00
Jens Ayton
4dd07e63d6 Harmonious polyphonic buy/sell sounds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3331 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-13 22:37:25 +00:00
Jens Ayton
f0f02f7045 More fine-grained exception reporting for -[PlayerEntity update:]. Should probably do same for some of the bigger sub-methods. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3330 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-13 22:19:42 +00:00
Jens Ayton
ec1d15ddce Suppressed incoming ECM alarm while docked. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3329 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-13 22:03:32 +00:00
Jens Ayton
1aeb964d12 Attempted compatibility fixes for GNUstep 1.20. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3328 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-13 21:57:29 +00:00
Jens Ayton
12abaa6a42 Fixed planet lighting inconsistencies (bug #17147). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3327 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-13 15:07:03 +00:00
Nikos Barkas
f0d0a2d07b Fixed Berlios bug #17148 (Cloaking device stays on if JS removed whilst in use). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3326 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-13 14:28:11 +00:00
Jens Ayton
51e49ae7fb Fixed potentially invalid (unchecked) cast of non-object jsval to object in JS timer construction (bug 17149). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3325 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-13 12:59:53 +00:00
Marc
0ad38f3e60 - rev3323 redux: hopefully caught all normalised/non-normalised ship values + like_ahip conflicts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3324 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-13 09:42:09 +00:00
Nikos Barkas
80858c8601 Resolved a situation where a ship dictionary containing the 'scanClass' key would be like_ship'ed to a dictionary containing the 'scan_class' key. The child dictionary now overrides the parent one correctly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3323 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-12 22:17:04 +00:00
getafix
c5bf3385f2 Fixed "oolite" script not passing command line arguments to "oolite-wrapper" script 
for autopackage installations (inserted in r3235). 



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3322 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-12 21:36:50 +00:00
Jens Ayton
7b5c8adef8 Disallow player.ship.explode() while docked. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3321 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-11 21:55:48 +00:00
Marc
77047570b3 * Change to startup 'load previous commander Y/N?': 
- in unrestricted mode, the question is asked only if at least one save file can be found. 
  - in restricted mode, the question is asked at all times, like in Elite.
* Change to restart look & feel:
  - a spinning cobra is now shown after all restarts, like in Elite.
  - 'restricted/strict mode enabled' is now shown only when switching between strict/unrestricted mode.
* Logging of searchPaths.dumpAll now happens at startup, and if search paths change due to switching between strict/unrestricted mode. 

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3320 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-11 21:07:45 +00:00
Jens Ayton
766259e7bf Planet textures can again be changed via JavaScript. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3319 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-11 20:41:14 +00:00
Jens Ayton
c62a2c358f Fixed bug where planets with atmospheres got metal.png texture with procedural generation off. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3318 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-11 20:17:17 +00:00
getafix
8ea9526f24 Fixed Linux build error following to PNG snapshot save update. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3317 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-11 15:36:43 +00:00
Nikos Barkas
d67bc4dbd5 Added capability to save snapshots in PNG format to the SDL builds. The code is based on http://encelo.netsons.org/programming/sdl. Snapshots format can be set at compile time to either BMP or PNG, default is now PNG. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3316 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-10 22:19:49 +00:00
Jens Ayton
efd5097efa Extra consistency checks to attempt to avoid "ERROR: status is STATUS_DEAD, not STATUS_DOCKED, but dockedStation is not nil" - player can't dock normally while dead, and player can't be destroyed while docked. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3315 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-10 18:41:22 +00:00
Jens Ayton
084248f98f Tiny tweaks: renamed AI methods scanFor{Nearest|Random}Merchantmen to ...Merchantman (with compatibility aliases). Removed all Light 0 stuff from shaders. Belatedly bumped cache format version for changed dust shader. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3314 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-09 23:13:12 +00:00
Jens Ayton
1d7b85b918 Slight dust shader optimization. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3313 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-09 19:37:09 +00:00
Jens Ayton
5599e4f375 More dust fun: dust box repeating is now handled in shader, so dust is now static geometry in shader mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3312 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-09 19:23:06 +00:00
Jens Ayton
7c674d3d4a Dust draws with vertex arrays, warping is applied in shader (which allows for more customization as a side effect). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3311 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-09 18:22:53 +00:00
Jens Ayton
946fbf2849 Fade out target direction indicator when near centre to avoid annoying jittering. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3310 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-09 16:35:52 +00:00
Jens Ayton
ef276aa408 Deleted old HUD icon code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3309 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-09 15:39:43 +00:00
Jens Ayton
46c40ec186 More graceful handling of disappearing docking target. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3308 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-09 15:21:06 +00:00
Jens Ayton
3c87985c05 Fixed crash trying to auto-dock with a station with no docking port. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3307 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-09 14:08:18 +00:00