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

176 Commits

Author SHA1 Message Date
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
Jens Ayton
dcec57192f Texture mipmap dump now uses game view dump functions; RGBA dump only dumps alpha channel if it's non-trivial. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2896 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-20 13:46:40 +00:00
Jens Ayton
1c0251db3a Normal mapping for generated planets (full shader mode only). Normal/baked shadow intensity is now consistent when changing planet texture size. Switched to 1024x1024 except for reduced detail mode. NB: texture debug dump requires new methods which aren't implemented for SDL, but is switched off. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2881 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-13 12:35:42 +00:00
Jens Ayton
1e2e56b4b1 NEW_PLANETS now applies to scripted planets. If NEW_PLANETS, the old PlanetEntity and TextureStore are now completely excluded. Most of the kludges for dealing with both types of planet are gone. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2857 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-07 18:43:48 +00:00
Marc
1324ee0765 - code cleanup: referenced external libraries headers using <foo.h> instead of "foo.h" (part of BerliOS Feature Request #1305 - SDL code tidyup. 
- all texture genning temp logs start with ;planetTex.temp' now, and added log entry when saving generated textures.
- SDL builds now save generated texture files next to the snapshots (SDL default: ./oolite-saves/snapshots)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2849 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-06 14:42:23 +00:00
Jens Ayton
363e33d209 Synthesized planet textures now exactly match old style (sans colourful atmospheres). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2822 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-01 22:01:20 +00:00
Jens Ayton
9c076a03ab Basic-debug.oxp can now be built with a makefile in DebugOXP/, instead of being build in tools/simpleDebugConsole by the Xcode project. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2794 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-28 14:41:50 +00:00
Jens Ayton
8435a65b87 Partial implementation of AI graphing tool - pref key: generate-ai-graphviz. Todo: handle setAI: and switchAI:, check for more terminal cases. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2732 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-11 01:22:48 +00:00
Gary Wong
7784ba69fe Fixed silly arithmetic error (causing incorrect x_offset on wide 
aspect ratios) in rev 2719.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2722 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-05 03:35:09 +00:00
Gary Wong
b5315d49e8 Added "x_origin" and "y_origin" keys to HUD dictionaries, to allow 
HUDs to specify dial and legend positions with respect to arbitrary
parts of the screen.

Modified the default HUD to use "y_origin" so that the appropriate
parts of the display are aligned with the screen bottom, for any
aspect ratio.

(Co-ordinate #defines in HeadUpDisplay.h have NOT yet been updated, for
compatibility with any custom HUDs which might rely on them.)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2719 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-03 17:36:18 +00:00
Jens Ayton
287da97963 Weekend of SVN Death fixes: partial fix for planet texture mapping suckiness (disabled by default, see FIXED_TEX_COORDS in PlanetEntity.m). Fixed crash when constructing JS timer with invalid parameters. Some cleanup and stuff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2636 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-05 13:13:06 +00:00
Jens Ayton
0889ca77a4 Minor tidying up. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2592 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-25 13:25:19 +00:00
Marc
9cd4bd7e13 * Feature: shift-arrow keys will cycle through all the planets highlighted by 'find' in the long range map. 
* Feature: long range galaxy map now remembers the system selected with 'find', until a new search is made.
* OXPVerifier now displays the verifier log in wordpad when in windows, and a feedback message in linux.
* gameview cleanup: delete key now handled in a consistent way across all platforms, removed unused directives
- more code cleanup!


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2550 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-21 00:39:08 +00:00
Jens Ayton
30beac1d47 Updated prefs screen to reflect Groolite disabled status. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2531 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 20:23:08 +00:00
Jens Ayton
1fbd48f913 Added preference to disable Groolite. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2525 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 17:48:35 +00:00
Jens Ayton
43248e1252 Fixed Mac sound clipping reporting. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2524 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 17:48:07 +00:00
Marc
fabfc9b391 - F7 screen now shows the nova sun for systems destroyed by novae, planets everywhere else. 
- moving from screen to screen now always resets the background image.
- fixed xcode compile warning.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2494 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-13 14:51:21 +00:00
Jens Ayton
db25437cc5 Mac-specific: reduced overall audio volume to compensate for out-of-range floating point values in some of our audio files - the worst observed being -1.341681. Scaling the master volume by 1/1.341682 (-1.275 dB) to compensate for now, need to remaster bigbang.ogg to work around this (but need custom software since we don't have an original and sound editors tend to clip to normal range when loading). This workaround almost certainly wouldn't work for other platforms since I'm pretty sure SDL uses the integer decoder, which will provide clipped "raw" data. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2481 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-12 11:24:29 +00:00
Jens Ayton
877d6cd9bb Mac-specific audio stuff: possible fix for sporadic, extremely bad audio artefact (short burst of extremely loud noise followed by system forcibly dropping volume until sound system is reset). Added code to catch any other such situations, silence the affected buffer and report the problem. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2471 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-11 15:04:08 +00:00
Jens Ayton
33c3787b58 Yet more static analyzer fun: removed an unused ivar from Cocoa MyOpenGLView. Fixed bug where AI method dropMessages: didn't work if more than one message was specified. Fixed missing break; in a switch in energy unit trade-in handling. Removed some bits of dead code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2440 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 20:07:57 +00:00
Jens Ayton
6244814f2f Fixed Mac Deployment configuration (it isn't supposed to be exporting anything). Log header now lists [GLSL Shaders] and [OXP Debug Features] as appropriate. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2429 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 13:54:06 +00:00
Marc
e93b8aa9ee Mac build: 
- really removed all traces of 10.3 from the build settings now(probably)
- changes to codebase to enable Deployment builds to link properly, might affect other platforms builds.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2428 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 13:37:28 +00:00
cmdrjames
9c01b00084 Fix, so that options are correctly set (in xcode 3.1 not sure about 3.2) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2405 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-05 20:44:42 +00:00
Jens Ayton
3b36f20058 Fixed build issue for debug OXP in Debug/x86_64 configuration. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2374 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-03 22:38:42 +00:00
Jens Ayton
c59c9743e1 Got the project building with Clang, which revealed a number of syntax errors. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2371 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-03 21:08:03 +00:00
Jens Ayton
00077466ab Various tweaks and a handfull of hacks to get Oolite building for x86_64 OS X. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2370 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-03 20:01:35 +00:00
Jens Ayton
98b5e2400c Fixed every single Clang static analyzer warning for Oolite itself... although it fails to parse some files. In the process, cleaned up some messy code and fixed a bug where a certain error would not be displayed by the plist validator. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2356 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-02 17:18:11 +00:00
Jens Ayton
97aedf381b Fixed build under Xcode 3.2 (Snow Leopard). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2355 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-02 15:24:18 +00:00
Jens Ayton
fd60071a53 Fix for somehow broken checkin of r2352. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2353 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-02 12:23:38 +00:00
Jens Ayton
2923413335 Changes to input handling to ignore command-key combos in Mac OS X, with special exception for command-F and command-Q which are handled directly in full-screen mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2352 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-01 21:58:01 +00:00
Nikos Barkas
6681e6591b Some more version bump updating. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2345 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-01 06:19:13 +00:00
Jens Ayton
3c10a9b2be Bumped version number. Changed Mac system requirement to 10.4, and cleaned up target configuration in preparation for 64-bit support. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2335 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-30 14:49:03 +00:00
Jens Ayton
6aaf7a1e75 Committed unspeakable necromancy on the graveyard of the repository. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2331 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-29 23:09:22 +00:00
Jens Ayton
999fe7e969 Trying to convince svn that this deleted directory is really deleted. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2330 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-29 22:50:59 +00:00
Jens Ayton
28a62c0c9b Enabled TARGET_INCOMING_MISSILES for OS X. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2310 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-24 19:17:26 +00:00
Jens Ayton
0dc704c26d Removed (optional) installation of Smart Crash Reports in Mac test release builds - it's just too evil. SCR will still be used if it's installed (usage is passive). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2306 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-23 16:51:42 +00:00
Jens Ayton
99e5466907 Disabled textured planets for Mac OS X due to crashosity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2305 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-23 16:27:57 +00:00
Jens Ayton
8f31c44b21 Changeged various option macros to use 0/1 convention instead of undefined/defined convention. Moved definition of these macros into an xcconfig file when building for OS X, so that their definition is shared with the debug OXP and is the same across configurations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2298 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-21 19:46:53 +00:00
Jens Ayton
5618f74ef0 Fixed some newly introduced uninitialized pointer variables. Moved internal GuiDisplayGen method declarations into a private category. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2265 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-26 00:23:04 +00:00
Marc
8ecc3df6a9 oops! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2258 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-24 18:46:16 +00:00
Marc
6fab208475 * sun_radius loop bug: should now cope with all sun_radius values. Plus clamped sun_radius to a min and max value and added 'bad sun settings' warning. 
* updated paging code ('more ->') to be more consistent across screens.
* minor mac code cleanup

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2257 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-24 18:42:53 +00:00
Jens Ayton
6fdca737a7 Renabled speech synth under OS X (accidentally broken when ESpeak support was added), minor speech cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2228 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-07 10:26:45 +00:00
Jens Ayton
d4b7f42c08 Changed oolite.bug.reports@gmail.com to bugs@oolite.org as appropriate. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2206 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-06-14 19:22:31 +00:00
Nikos Barkas
8d77a7b467 Made missiles always return true in ShipEntity's hasHostileTarget: Implemented targetting of nearest incoming missile. This is activated using Shift+t or an assigned joystick button. Testing is still required. The entire implementation is guarded with the TARGET_INCOMING_MISSILES macro, disabled by default until it is agreed that this change does not influence gameplay in undesireable ways. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2151 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-29 20:29:15 +00:00
Darren Salt
7c0d723be0 Stop the sensitivity toggle from affecting the deadzone size; fix comparisons. 
The division & sensitivity toggling should, I think, really be happening in
the joystick code in PlayerEntityControls.m. However, this gets things
working better for now.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2150 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-29 20:14:09 +00:00
Darren Salt
73718b3733 Bring the MacOS-specific code into line with the SDL code wrt joystick #defines. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2148 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-28 15:53:45 +00:00
Jens Ayton
c9cdfcf71f Planets are now tracked explicitly instead of being searched for several times a frame. Squashed a few static analysis diagnostics. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2080 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-28 14:15:26 +00:00
Marc
2a6c00b278 All SDL & windows fixes: reworked windows port to resize game view without texture loss. Splash screen for both linux & windows. When switching fullscreen resolutions using F11 oolite now saves the new fullscreen resolution. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2073 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-22 23:15:41 +00:00
Marc
644557d6b1 some refactoring of intro/demo screens, removing some duplicate code. fixed a wrong DESC string, and possibly completed the great DESC string migration. cleaned up a small part of the SDL gameView code. Splash screen can now be enabled by #defining SDL_SPLASH 1. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2061 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-13 11:22:27 +00:00
Marc
a4c87db67c fixed copy & paste error (!) inside SDL/MyOpenGLView.m 
removed redundant demo screen code from inside gameView
intro music now plays again when 'begin new game' is selected.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2058 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-12 18:07:25 +00:00