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

2775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jens Ayton
fa25226d5f Cube mapping (for diffuse map) supported in default shader. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3123 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-05 14:32:33 +00:00
Jens Ayton
5cbe0a48f7 Cube map support (using normals as coords) in non-shadered mode - but not with default shader. Fixed bug where default shader material setup ignored texture specifier dictionaries, only accepting strings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3122 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-04 22:38:53 +00:00
Jens Ayton
68651c8800 Cube map support. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3121 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-04 22:13:07 +00:00
Eric Walch
06fada7a41 - Now also can suppress the scoop message for piloted cargo. (it is only confusing when handling this different than other cargo) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3120 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-04 20:40:22 +00:00
Jens Ayton
5bf61b8684 Simplified bits of OOMesh for triangle-onliness, and made non-triangles a warning rather than an error. Fixed non-debug build breakage in r3107. OOTexture now looks like it supports cube maps, but it doesn’t really. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3119 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-04 17:48:09 +00:00
Jens Ayton
5f6b0ad60e Removed debugging junk. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3118 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-04 16:55:37 +00:00
Jens Ayton
e274da789f Mesh rescaling (as used for debris models) now works. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3117 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-04 16:53:11 +00:00
Jens Ayton
ca22a0c7e8 Fixed crash on loading meshes with explicit normals. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3116 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-04 15:14:21 +00:00
cmdrjames
59512459b1 Add a new line at end of OOJSShip.m because Frame gets a compiler warning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3114 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-04 09:44:11 +00:00
Jens Ayton
f1fb04a35b +[NSColor brightColorWithDescription:] now returns a colour with the right hue for dim colours. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3113 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-03 23:53:31 +00:00
Jens Ayton
b62a423bdb Belated cache rebuild forcamication. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3111 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-03 23:00:21 +00:00
Jens Ayton
4e8693b5bf Unlied in a comment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3108 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-03 18:43:11 +00:00
Jens Ayton
462ec72a19 Fixed other source of DEADBEEF in cache: uninitialized per-vertex normal and tangent buffers being written for per-face-normal meshes. Also fixed some nits found when test compiling with clang. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3107 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-03 18:41:15 +00:00
Jens Ayton
5b01696b5d Replaced magic isBoulder flag with silly role set tricks, and made ships' role sets effectively mutable. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3106 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-03 18:03:23 +00:00
Jens Ayton
966ee404e4 Annotated clang static analyzer false positives, and fixed one genuine leak. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3105 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-03 17:17:32 +00:00
Jens Ayton
48e2ffb5ea Removed superfluous build settings that caused a build error in Xcode 3.2.2. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3104 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-03 15:52:56 +00:00
Jens Ayton
33e21d7138 Lowered kOOMeshMaxVertsPerFace from 16 to 3, saving 260 bytes per face in all meshes. Non-triangular faces haven't rendered properly for a long time anyway. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3102 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-03 14:11:13 +00:00
Jens Ayton
78a93c52ee Fixed bug where a maliciously crafted DAT mesh may lead to an unexpected termination or arbitrary code execution, as Apple would put it. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3101 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-03 14:01:31 +00:00
Eric Walch
5bc2b334a2 defined a not initialised variable added in rev 3091 that gives a compiler error on Linux builds. (Thanks Nicos for pointing me to it) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3098 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-03 11:13:45 +00:00
Jens Ayton
59bf82e34e Timeout on iTunes-controlling AppleScript. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3097 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-03 11:08:00 +00:00
Marc
a58863656d Updated verifier schema with rev3091's changes, and added two stray keys to both verifier files. :) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3094 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-02 21:19:40 +00:00
Eric Walch
79e39c5f6e - added a shipKey: market, to define a local market for stations with primaryRole as the default market. 
- added a shipKey: hasScoopMessage, to be able to suppress the standard scoop massage for cargo.
- added the JS method: setCargo to set cargo type and quantity for barrels.
- Scripted cargo that is awarded a content (either by setCargo or the skipKey cargo_carried) is not removed from the universe on scooping but stays in the hold of the scooper.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3091 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-02 19:29:12 +00:00
Nikos Barkas
f65c78fb8b Added basic documentation outlining the modifications done to the source code of some of Oolite's external dependencies, required for a successful build. A review of the content referring to Mac may be needed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3084 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-02 09:01:02 +00:00
Nikos Barkas
b937604e9a Fixed bug in awarding kg or g unit items while in-flight, resulting from the cargopods previous handling change (thanks Eric). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3083 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-28 14:58:29 +00:00
cmdrjames
4a05faff16 Oops, revert some laser breakage. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3082 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-27 20:14:17 +00:00
Nikos Barkas
9218793a52 Possible fix for bug reported at http://www.aegidian.org/bb/viewtopic.php?t=7742. Kilogram quantities greater than 1000 and gram quantities greater than 1000000 are now placed in 1t cargopods. So 2470kg gold will use two cargopods and leave 470kg in the 'safe'. Added the StationEntity property suppress_arrival_reports, does what says in the tin. The property is visible from JS via suppressArrivalReports. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3081 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-27 19:02:11 +00:00
Jens Ayton
a79eae0acc Better error logging when loading a saved game fails. Fixed up some script comments. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3080 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-26 23:07:23 +00:00
Eric Walch
d8f7728c72 - Added a "guiScreenWillChange(to, from)" handler. 
- Some code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3079 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-26 16:16:32 +00:00
cmdrjames
8ad9a4ad7b Changes from PhantorGort: Currently I am developing an OXP (Visas) that allows for complex criteria for the "Visa" equipment. I was intending to update the appropriate mission variables used by the equipment as the player enters the equipment screen. Example scenario: a visa has as one of it's requirements of the player having to have a minimum amount of credits in their account. If you buy or sell goods, etc, I need to update the mission variables. This idea could also apply to requirements based on contracts accepted or other equipment bought or ship bought, etc. As these things can change whilst the player is still in the station being able to update the mission variable before the equipment calculation is crucial. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3078 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-23 20:09:40 +00:00
Jens Ayton
978adf3b55 Even more properly addressed Linux build issue. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3077 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-23 19:30:41 +00:00