5529 Commits

Author SHA1 Message Date
AnotherCommander
22da020473 Fix two bugs, one regarding equipment with requires_cargo_space set when fully loaded with cargo and one about misreporting available cargo space when fully loaded and with equipment requiring cargo space present. 2014-01-14 19:11:50 +01:00
Jens Ayton
7f5e17be82 Staticize a local constant 2014-01-12 12:47:51 +01:00
cim
8d3ef6e4ab PlanetTextureGenerator also needs to use initWithPath 2014-01-11 18:11:26 +00:00
cim
7e0b3819b8 Merge pull request #75 from OoliteProject/planet-improvements
Planet improvements
2014-01-11 06:42:43 -08:00
cim
77e8ceb8b7 Try to work around bugs in pthread library on Windows 2014-01-10 21:31:09 +00:00
cim
9587469435 Fix probably theoretical bug 2014-01-09 20:35:11 +00:00
Jens Ayton
b5dc768102 Remove various unused things 2014-01-09 18:11:26 +01:00
Jens Ayton
d083add6d8 Unbreak Mac build 2014-01-09 18:07:48 +01:00
cim
add4528195 Add a missing _pendingOpsLock pair to the Async manager
Also, since we're hitting the bug anyway, re-enable planet preloading - it might make it easier to see what's going on
2014-01-08 22:19:29 +00:00
Jens Ayton
0bc1ab81d4 Fix hypothetical leaks in audio failure cases 2014-01-07 01:13:42 +01:00
Jens Ayton
d23a023da8 Remove an unused instance variable 2014-01-07 01:13:42 +01:00
AnotherCommander
3890930ba3 Espeak builds fix: Spoken messages now follow master volume settings. 2014-01-06 10:35:33 +01:00
Jens Ayton
9d3e8b4740 Forward declare a method for gcc 2014-01-05 22:22:28 +01:00
cim
eb97e5b83e Regenerate planet texture if detail level changed 2014-01-05 13:32:30 +00:00
Jens Ayton
3fcd4f996e Bump binary resources and tests/ 2014-01-05 13:09:56 +01:00
AnotherCommander
8550ee9b59 Remove alloy from demoships parade. 2014-01-05 00:12:05 +01:00
Jens Ayton
c13bf0b531 Remove makefile references to old SDL sound code 2014-01-04 23:47:30 +01:00
Jens Ayton
ba8db00242 Remove Core Audio sound implementation 2014-01-04 23:46:56 +01:00
Jens Ayton
481b9a120b Reorganize multitexture code to avoid redundant work
Before, emission and illumination maps would be loaded synchronously
in order to determine the cache key of the combined texture.
2014-01-04 23:39:45 +01:00
Jens Ayton
ac602fe187 Enable multitexture light maps in minimum detail mode
Uses "extra shrink" mode to keep light maps small.
2014-01-04 23:39:45 +01:00
cim
a2fbdae3a7 OpenAL seems to be working without problems, so remove the old SDL sound files
Similar cleanup needed on Mac.
2014-01-04 22:01:43 +00:00
Jens Ayton
8c94d3db89 Implement "extra shrink" texture flag
In reduced detail mode only, this limits texture sizes to 256 px per edge,
and shrinks textures that started at 256 px to 128 px.
2014-01-04 22:04:54 +01:00
Jens Ayton
af9077e984 Fix super initialization in OOPixMapTextureLoader
This may affect planet rendering, but I couldn't see any differences.
2014-01-04 22:01:08 +01:00
cim
7468b27120 Make NEW_ATMOSPHERE clouds a bit more visible 2014-01-04 18:15:04 +00:00
cim
80880962e2 Try new atmosphere 2014-01-04 17:44:35 +00:00
Jens Ayton
73b34f6371 Bump tests for material suite 2014-01-04 14:50:16 +01:00
Jens Ayton
8f941ee228 Add console.maximumDetailLevel 2014-01-04 14:46:33 +01:00
cim
8da876d739 Draw atmosphere, and generate it if texture was not generated. 2014-01-04 00:00:15 +00:00
cim
4e8d659cd2 Fix last two cherry-picked commits so that they compile again
The whole NEW_PLANETS bit requires a fairly decent graphics card, so it's basically turned off unless the detail level is at "extras".
2014-01-03 23:23:42 +00:00
cim
1035b65d6a Cube map support for new planets 2014-01-03 21:26:40 +00:00
cim
2e8644a338 Re-enable new planets
Allow loading of cube map data, cube maps now work correctly in non-shader mode.
2014-01-03 21:26:25 +00:00
Jens Ayton
44eff90875 [Mac] Create AddOns directory to open if needed 2014-01-03 20:31:26 +01:00
Jens Ayton
305752d319 Minor cleanup 2014-01-03 01:30:23 +01:00
Jens Ayton
f1c0d4584f Bump Mac-specific for graphics detail stuff 2014-01-03 01:30:01 +01:00
Jens Ayton
734151b3e9 Make console.detailLevel a symbolic string as declared 2014-01-03 01:24:57 +01:00
Jens Ayton
7e45da3aee Remove unused file exports-debug-32.exp 2014-01-03 01:23:23 +01:00
cim
daf9338c03 Don't send comms while player is exiting witchspace 2014-01-02 22:40:05 +00:00
AnotherCommander
7276ef6257 Espeak builds: Make female voice the default one (less loud, more pleasant to listen to). 2014-01-02 13:28:35 +01:00
cim
a15d6fcbf4 Actually use the direct detail level set on initialisation 2014-01-01 19:04:53 +00:00
cim
985abbce2d Cover possible problem in asking for docking instructions 2014-01-01 19:03:50 +00:00
cim
656b58beae Adjust detail settings on Game Options screen
0 = no shaders, reduced detail
1 = full shaders, high detail
2 = full shaders, various expensive post-1.78 graphics extras

The old "simple shaders" setting is gone
2014-01-01 17:15:14 +00:00
cim
271b8b85c0 selfDestructAbandonedShip AI parameter should have _flag prefix 2013-12-31 18:29:51 +00:00
cim
22fca4c705 Allow a function to be passed as a comms parameter, for more advanced work 2013-12-31 17:42:31 +00:00
cim
012af4837c Adjust non-linearity / precision mode interaction.
Probably works.
2013-12-25 14:14:13 +00:00
cim
47d3f92bb1 Add equipment mode key to stick mapper, re-add Tab and 0 equivalents
Untested, of course.
2013-12-24 16:24:04 +00:00
cim
65f3e2e197 Stop trying to scoop derelicts: closes #72 2013-12-23 23:13:10 +00:00
cim
f29e3a2ff1 Merge pull request #64 from kanthoney/nonlinear_joystick
Nonlinear joystick: merging to let the nightly users have a go at it
2013-12-23 07:35:11 -08:00
cim
8800e34620 For now, force deterministic population off in nova/interstellar 2013-12-23 12:33:35 +00:00
AnotherCommander
473ffa289f Windows installer: Remove duplicate git hash from installer window's title. 2013-12-23 10:58:13 +01:00
AnotherCommander
d09a82c520 Windows installer: Refuse to run if the user tries to install the 64-bit version of the game on a 32-bit system. 2013-12-23 09:37:27 +01:00