dajt
|
0dfec2997d
|
Put conditional compilation macros around GL shader code to exclude it from Win32 builds; other platforms should be unaffected.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@743 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-10-20 00:33:31 +00:00 |
|
dajt
|
8047484dc8
|
Fixed a bug caused by change to TextureStore class interface.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@742 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-10-20 00:24:58 +00:00 |
|
dajt
|
2f7bef048f
|
Missed one instance of textureDictionary stopping Windows compilation
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@740 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-23 10:13:11 +00:00 |
|
Giles Williams
|
91320d4db4
|
tweaks to planet textures - planet-shader removed
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@739 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-21 19:02:44 +00:00 |
|
Giles Williams
|
ff120643ca
|
Oops. Fix drawing sub-entities if shaders aren't supported. Sorry Dylan.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@738 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-20 23:46:35 +00:00 |
|
Giles Williams
|
fd5785b3c8
|
scale down over-large textures (slow but effective)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@737 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-20 12:18:56 +00:00 |
|
Dylan Smith
|
c32455a497
|
Fix build break in OOOpenGL.h
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@736 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-19 16:39:57 +00:00 |
|
Giles Williams
|
929b80ccbc
|
bugfix to last commit
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@735 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-18 23:56:37 +00:00 |
|
Giles Williams
|
9d7c7cf11f
|
more work on planet textures and shaders
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@734 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-18 23:42:55 +00:00 |
|
Giles Williams
|
9a002101e3
|
more work on planet textures and shaders
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@733 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-18 23:41:05 +00:00 |
|
Giles Williams
|
61d04c090e
|
report failure to write out cache
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@732 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-18 23:17:57 +00:00 |
|
Giles Williams
|
fea49faba7
|
fix clash between Nova and Trumbles
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@731 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-18 08:57:20 +00:00 |
|
Giles Williams
|
29f5eb3602
|
remove possible cause of ghost-ships
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@730 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-15 22:11:46 +00:00 |
|
Giles Williams
|
616f2de2c8
|
bugfix
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@729 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-14 16:22:53 +00:00 |
|
Giles Williams
|
69853743b3
|
prep to support vertex shaders (mmmm... normal mapping)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@728 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-14 10:43:41 +00:00 |
|
Giles Williams
|
c64b8e3b6f
|
fix engine_level when max_flight_speed is zero
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@727 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-14 09:27:15 +00:00 |
|
Giles Williams
|
3136b22b93
|
respect 's 0' as a non-smoothed group
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@726 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-13 19:43:18 +00:00 |
|
Giles Williams
|
c555de8a1e
|
fixed escape pod flashers
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@725 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-12 08:04:50 +00:00 |
|
Giles Williams
|
ad3f50ab5b
|
ensure player role is set to "player"
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@724 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-11 17:21:23 +00:00 |
|
Giles Williams
|
167dab4745
|
two non-exclusive ways to set planetary rotational speed - in planetinfo set rotation_speed to an absolute value or rotation_speed_factor to a multiplier for the current speed.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@723 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-11 07:18:08 +00:00 |
|
Giles Williams
|
90be524616
|
fix non-appearance of messages (gui's alpha was set to zero)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@722 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-10 22:24:31 +00:00 |
|
Giles Williams
|
0fc61dfd65
|
fix bugs in checkShipsInVicinityForWitchJumpExit
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@721 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-10 22:09:10 +00:00 |
|
Giles Williams
|
e7ddc12262
|
much improvements to scooping and fix stations scanForLoot
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@720 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-10 19:04:41 +00:00 |
|
Giles Williams
|
1232170608
|
baby steps - the changes necessary for GLSL in SDL
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@719 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-10 09:50:01 +00:00 |
|
Giles Williams
|
970b1ac957
|
more conversion from OpenGL 2.0 to OpenGL 1.5 - think I'm done now
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@718 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-10 09:49:36 +00:00 |
|
Giles Williams
|
81c997ac01
|
redid Shader code using _ARB extensions - some mods will have to be made to OOOpenGL.h I suspect for this to work with the SDL code.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@717 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-10 09:29:09 +00:00 |
|
Giles Williams
|
1afe8311ce
|
use OS agnostic routines to display legends (should remove some confusion about image placement between PC/Linux and Mac versions)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@716 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-09 10:34:20 +00:00 |
|
Giles Williams
|
c47d74733d
|
tidying up
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@715 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-09 10:33:06 +00:00 |
|
Giles Williams
|
b20cd787e8
|
removed [universe texturestore] in favour of a universal TextureStore
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@714 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-09 10:17:15 +00:00 |
|
Giles Williams
|
99f7bee84c
|
small changes to permit use of texturestore by OpenGLSprite
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@713 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-09 08:21:57 +00:00 |
|
Giles Williams
|
6f8d3bad7e
|
test for OpenGL 1.5 before trying to use shaders
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@712 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-09 08:14:14 +00:00 |
|
Giles Williams
|
1dd6f3abf0
|
dropped -prebind
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@711 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-09 08:13:00 +00:00 |
|
Giles Williams
|
2a9ed4b16e
|
more on shaders
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@710 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-08 17:02:21 +00:00 |
|
Giles Williams
|
bcbfa76231
|
commented out testing messages about shaders
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@709 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-08 14:06:02 +00:00 |
|
Giles Williams
|
aed1c4cf30
|
some success with WIP shaders
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@708 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-08 14:02:34 +00:00 |
|
Giles Williams
|
2cc786d498
|
halve planet rotational velocity as suggested
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@707 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-08 14:02:09 +00:00 |
|
Giles Williams
|
72f5435372
|
avoid multiple link warning by specifying -lSystem in the Other Linker Flags
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@706 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-08 09:00:05 +00:00 |
|
Giles Williams
|
15454173bc
|
more WIP on shaders
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@705 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-07 22:21:40 +00:00 |
|
Giles Williams
|
da9319a22b
|
use coordinate schemes (pwm etc) when selecting position for addPlanet: or addMoon:
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@704 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-07 08:18:56 +00:00 |
|
Jens Ayton
|
11f7ea6a69
|
Switched off debugging messages for audio, minor tweaks to SoundSource
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@700 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-05 15:53:17 +00:00 |
|
Giles Williams
|
7fe987b159
|
store whether planets are procedurally textured in the save game
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@699 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-04 13:20:31 +00:00 |
|
Giles Williams
|
854b983a3e
|
alternate take on textured planets continues (OCD much?) - press t while paused to switch on procedural texturing
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@698 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-04 11:06:08 +00:00 |
|
Jens Ayton
|
b8e651ffaa
|
Got OSX-SDL more or less working again.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@695 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-02 15:09:37 +00:00 |
|
Giles Williams
|
16bd367f8c
|
fix setting up the new system when using a behemoth to escape witchspace
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@692 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-01 22:35:43 +00:00 |
|
dajt
|
4f1a9425d4
|
Added optional planetinfo.plist entry sun_distance_modifier to allow OXPs and player to change default distance to suns
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@691 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-01 21:26:51 +00:00 |
|
Jens Ayton
|
035739be0b
|
Added OOSoundSource.m
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@690 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-01 18:09:55 +00:00 |
|
Jens Ayton
|
65b6f85c33
|
Fixed 'no implementation of -init' warning
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@689 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-01 18:05:24 +00:00 |
|
Jens Ayton
|
49c3be7823
|
Changed OOSoundSource to use a more stateful model.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@688 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-01 14:53:21 +00:00 |
|
Jens Ayton
|
9c5eee5923
|
Removed redundant playing of sound effect on launch.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@687 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-01 13:13:24 +00:00 |
|
Jens Ayton
|
df2fbcf6a7
|
Fixed incongruous warning.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@686 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-08-01 13:11:48 +00:00 |
|