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

2655 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
74b32b2940 JS expandDescription()/expandMissionText() now take an optional dictionary of substitutions, as in expandDescription("police-attack-warning", { "describe-Pirate" : "naughty person" });. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3182 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-21 19:56:21 +00:00
Jens Ayton
91ed7e8c5a Use renamed colour attributes in built-in shipdata. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3181 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-21 19:18:09 +00:00
Jens Ayton
45380f2f9e Changed coordinate scheme for non-shader/default-shader cube maps to be based on vertex positions rather than normals. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3180 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-21 19:12:26 +00:00
Jens Ayton
926260dd38 Renaming. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3179 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-21 18:59:35 +00:00
Jens Ayton
ab623a5c94 * Big unified emission and illumination map thingy for non-shader mode. Known 
limitations:
  - causes synchronous wait for component textures to load.
  - Component textures are cached unnecessarily.
* cleanup of material dictionary handling.
* Added foo_color variants of material colour key names.
* Added illumination_color material property.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3178 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-21 18:21:29 +00:00
Marc
ae26074add - Yep, didn't clean up some unused variables 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3177 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-19 07:24:38 +00:00
Marc
8fa73df308 - setMaterials(materials[,shaders]) & setShaders(shaders) part II - they now work in a very similar way to the materials & shaders settings inside shipdata.plist. To 
Simple usage:
 - change the basic material
PS.setMaterials({'cobra3_redux.png':{diffuse_map:'thargoid_redux.png'}})

 - remove shaders from a ship; restore original png texture
ship.setShaders({}); ship.setMaterials({});

Complex usage (needs Thargoid's Second Wave OXP):
PS.setShaders({"cobra3_redux.png":{textures:[{name:"secondWave_redThargon.png","mag_filter" : "linear"},{name :"secondWave_thargon-glow.png","mag_filter": "linear"}],"fragment_shader" : "secondWave.fragment","vertex_shader" : "secondWave.vertex",uniforms : {uTime :"timeElapsedSinceSpawn",	uReciprocalFrequency :{value : 1.5}}}})

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3176 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-19 07:05:40 +00:00
Nikos Barkas
b25a50c050 Unused Variables Police: Warnings removed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3175 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-17 21:33:10 +00:00
Marc
2812233490 - Procedural planets: smoother transition between land and sea, backported from the new planets code. 
- Initial, tentative, implementation of ship.setMaterials(materials[,shaders]) & ship.setShaders(shaders).

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3174 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-17 19:24:24 +00:00
Nikos Barkas
065f29b4ae Remove unused variables warnings from SDL builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3173 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-17 12:28:38 +00:00
Jens Ayton
f1e5e1d19a Moved platform-independent OpenGL setup code into GameController instead of duplicating it. Enabled GL_SEPARATE_SPECULAR_COLOR, making specular highlights reasonably consistent between default shader and non-shader mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3172 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-17 11:06:34 +00:00
Jens Ayton
731fae187f Fixed some Mac build breakage, removed some debug code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3171 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-16 08:46:54 +00:00
Eric Walch
22387e560c - Ships in behaviour "behaviour_attack_fly_from_target" should no longer fly out of scanner range here. (Better solution than one of my previous commits) 
- Scripted cargopods released during "becomeExplosion" are working correct again.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3170 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-16 08:14:39 +00:00
Marc
e07cf99430 - Oopsie! Actually added the new tunnel shape. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3169 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-16 07:59:17 +00:00
Jens Ayton
1b8bcde3c8 Redundancy in makefile. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3168 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-16 07:34:34 +00:00
Marc
ed3f7e28ce - added new default 'tunnel' shape - docking/undocking. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3167 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-16 06:53:57 +00:00
Nikos Barkas
133388d957 Fixed build on Win/Linux. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3166 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-16 06:22:46 +00:00
Jens Ayton
ca06516f4c Cleaned up texture pixel-twiddling code a bit. Added extract_texture texture option (for, e.g., using one channel of a shader effect map as a glow map in non-texture mode). Mac: renamed custom static libpng to libpng_for_oolite, to avoid linking to wrong library when normal libpng installed in /usr/local/lib. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3165 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-15 23:51:41 +00:00
Jens Ayton
adfb699306 Unbroke loading of indexed-colour textures. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3164 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-14 16:38:45 +00:00
Jens Ayton
9b579c1d95 Fixed copy & paste error that broke horizontal texture scaling. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3163 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-13 19:11:55 +00:00
Marc
fbeaed4ef8 - fixed windows builds when OO_SHADERS is not defined. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3162 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-13 08:17:15 +00:00
Nikos Barkas
2dd40c216c Updated GNUmakefile with most recently added files. This fixes crash at startup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3161 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-13 07:30:06 +00:00
Jens Ayton
7793315aba Fix for Windows nightly failure. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3160 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-13 07:05:27 +00:00
Jens Ayton
065d44deef Implemented non-power-of-two scalers for two-channel textures. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3159 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-12 22:36:46 +00:00
Jens Ayton
1bb53cbeb2 Fixed Mac 64-bit build. Tweaked Spotlight importer to not show ship keys in Get Info for saved games. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3158 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-12 20:49:46 +00:00
Jens Ayton
503ced9108 Fixed normal_map and normal_and_parallax_map in simple shader mode (test cases 8 and 9). Removing extra test cases directory (part 1 of 2). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3156 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-12 18:49:48 +00:00
Jens Ayton
dcdbbdfbea Implemented multi-texture material for emission_map in non-shader mode (uses GL_ARB_texture_env_combine; included test case, which depends on shader test suite). Also a bunch of material code cleanup (and messup, to support multiple sets of texture coordinates). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3155 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-12 18:05:46 +00:00
Nikos Barkas
fd36da737c Fixed Windows build breakage. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3152 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-11 19:41:56 +00:00
Jens Ayton
bcedec148d YA Windows DEP fix. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3151 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-11 19:35:59 +00:00
Jens Ayton
c9cdbc7631 Added extra shader validation, controlled by DEBUG_SHADER_VALIDATION flag. Removed DEBUG_ENTITIES and merged DEBUG_OCTREE and DEBUG_OCTREE_TEXT into DEBUG_OCTREE_LOGGING. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3148 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-11 16:03:43 +00:00
Jens Ayton
e5d8d5c4ad Added logging to shader fallback. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3147 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-11 14:15:41 +00:00
Jens Ayton
d267cf71bf Implemented fallback to simple shader mode when full shader doesn't build, and added test case. Added debug flag to disable callback behaviour, used in shader test suite. Also moved debug flags to their own header. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3144 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-11 13:57:02 +00:00
Jens Ayton
a84f5cc45f Added symbolic constants (or the closest you can get in JavaScript) for debug flags to console object. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3143 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-11 13:04:26 +00:00
Jens Ayton
d3dca497f2 Added debugConsole.platformDescription for shader test suite. Also more radium green, because I can. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3141 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-10 17:35:16 +00:00
Jens Ayton
d966b450d0 Exposed OOLogInsertMarker() to debug console. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3139 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-10 11:01:13 +00:00
Jens Ayton
4c93d3118b Exposed FPS display toggle and some GL renderer info to debug console. Allow empty titles in mission screens. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3138 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-10 10:37:19 +00:00
Jens Ayton
3684e96da8 Added optional explicit this parameter to Mission.runScreen. Avoid potential GC-related crash in mission screen completion callback. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3137 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-10 10:06:15 +00:00
Jens Ayton
c979020159 Cleanup stuff, changed texture FNF message which sometimes lied. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3136 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-09 23:28:04 +00:00
Nikos Barkas
2dc0546f2a Fixed broken compile on SDL builds. Added the -dumpGrayAlphaToFileNamed: method for the SDL builds. NOTE: I have no test case to verify that the mask used in SDL_CreateRGBSurfaceFrom is correct. Further testing will be necessary for this. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3135 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-09 20:29:21 +00:00
Jens Ayton
0c19da2b47 Support for grey+alpha textures. (Part of this was accidentally included in previous commit.) Also fixed confusion of GL format and internalFormat in texture code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3134 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-09 19:35:39 +00:00
Jens Ayton
5d13d48c9d Removed implicit tex0, tex1 etc. uniforms, thus breaking a handful of early shader examples that probably don't work any more anyway. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3133 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-09 19:15:44 +00:00
Jens Ayton
d8d5393d4e Workaround for Svengali's GLSL preprocessor bug. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3132 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-07 22:35:24 +00:00
Marc
99ba9e3aac - Fixed bug from rev3033: crash at startup due to clash between Windows DEP & weakRef objects - all windows DEP crashes so far have been caused by accessing 'naked' weakly referenced objects instead of their weakRefUnderlyingObject property. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3131 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-07 01:10:26 +00:00
Eric Walch
c874f427c7 Maximised the speed for behaviour = behaviour_attack_fly_from_target on a second place + correction on previous commit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3130 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-06 21:39:34 +00:00
Eric Walch
e95a9987c0 Maximise the speed for behaviour = BEHAVIOUR_ATTACK_FLY_FROM_TARGET to prevent some ships like the constrictor to fly out of range during combat. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3129 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-06 18:56:26 +00:00
Marc
1abbce6fc4 - Added yet another strict/unrestricted difference (idea mentioned a few months ago IIRC): after game over, restricted mode always restarts with a Jameson. Unrestricted mode still uses the last save game in the current session. 
- HUD: temperature bars are now drawn marginally faster, minor code cleanup. (& inadvertently cleaned up all tabs/spaces...)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3128 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-06 14:25:49 +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
Jens Ayton
3c95b30a0a Fixed warnings from nightly build; #ifed out OOPlanetTextureGenerator for old planets. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3126 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-06 06:38:00 +00:00
Nikos Barkas
05b7c3b90e Each HUD component can now have independent alpha, set by the 'alpha' key in the components. Fixed punctuation in shipdataEntrySchema.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3125 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-05 16:50:22 +00:00
Jens Ayton
e8ac4c5b14 Disabled use of GL_APPLE_client_storage extension, implicated in sporadic Mac OS X crashes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3124 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-05 16:08:25 +00:00