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

2845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc
99c0437110 - fix: last custom backgrounds/overlays glitch. Hopefully. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3473 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-06 16:03:07 +00:00
Jens Ayton
dcd183bae9 Fixed bad GC roots in OOJSFunction. Avoid extra allocation in JS Timer constructor. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3472 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-06 12:31:51 +00:00
Jens Ayton
deee594006 Fixed copy & paste error breaking texture T repeat (as used by Shady Billboards). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3471 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-05 21:54:09 +00:00
Jens Ayton
eabefa1637 Fixed a major live leak: all async work tasks -- primarily texture loaders -- that were completed out of order were leaked. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3470 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-05 20:30:05 +00:00
Jens Ayton
6cb3d801fc Fixed build with OOTEXTURE_RELOADABLE disabled. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3469 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-05 18:43:52 +00:00
Jens Ayton
efd3727fab Added tracking of all active texture objects, even ones without cache keys, for proper texture reset. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3468 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-05 18:36:53 +00:00
Jens Ayton
50d7582bc8 Rolled back r3465-3466 until next release cycle. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3467 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-05 18:00:51 +00:00
Marc
69cb502117 - Oops: corrected one useless check in previous commit into a slightly more useful one. Mumble copy & paste mumble. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3466 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-05 15:24:56 +00:00
Marc
72e553706b - 'fixed' systemsInRange() according to the misinterpretation in bug report 17211. Might need to be rolled back. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3465 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-05 15:14:07 +00:00
Jens Ayton
92af813ea9 Fixed planet retain balance issue. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3464 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-04 20:10:37 +00:00
Marc
f80e40e779 - fix: if looking at the system info while pressing pause, the light source would move about when resuming from pause. Not anymore! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3463 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-04 16:56:39 +00:00
Jens Ayton
8a7068ffdd writeMemoryStats() now accounts for saved wormholes and ships stored in wormholes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3462 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-04 16:03:22 +00:00
Jens Ayton
cb53726698 Fixed build failure caused by evil conspiracy between svn merge and Xcode. Added synthesized planet textures to writeMemoryStats() (they show up with 0 refs, but don't believe that). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3461 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-04 15:39:10 +00:00
Jens Ayton
3cafc40ed8 Switched PlanetEntity over to OOTexture. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3460 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-04 15:25:08 +00:00
Jens Ayton
df8e47ddf4 Fixed disappearing planet textures. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3459 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-04 11:27:24 +00:00
Eric Walch
8cf0067702 Set the player think time for AI from 60 back to 2 seconds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3458 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-04 11:20:47 +00:00
Michael Werle
ac25a891bc Revert accidental commit of whitelist.plist from r3448 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3457 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-04 09:12:36 +00:00
Jens Ayton
d34d437c22 Speech guide for multiplication sign. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3456 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-03 22:27:10 +00:00
Marc
2bed95f4c7 - fix: Found a source of nil missiles delivered to some NPCs! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3455 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-03 21:10:42 +00:00
Jens Ayton
05996322fe Naughtily checking in some mere optimizations. We're looking at a major speed increase in debug/testrelease builds for vert simple changes, so I'm humouring myself. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3454 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-03 20:59:20 +00:00
Jens Ayton
5bad08f43d Fixed Ship.hasEquipment() compatibility method in cases where equipment is undefined. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3453 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-03 20:58:17 +00:00
Jens Ayton
20da5ba016 Fix for PlanetEntity leaking display lists. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3452 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-03 19:17:43 +00:00
Marc
4ba056d516 - fix: one more overlay related bug, don't know how I missed it... 
- better handling of - & feedback about - invalid data when selecting random 'missile' role missiles.
- Made the 'OXP messages' message less mysterious than before. One more translation string added.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3451 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-03 05:16:08 +00:00
Marc
40d40086af - Oops, realised I shouldn't make last minute 'clever' changes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3450 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-02 22:20:02 +00:00
Marc
a6d698e1fb - fix: more efficient ship setup. Should correct the problems described in berlios bug #17202. Hopefully without introducing new bugs. 
- made doubly sure all tharglet equipment is recognised properly.
- fix: when restarting or loading a saved game, the HUD is always displayed, even if previously hidden while in game.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3449 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-02 22:10:59 +00:00
Michael Werle
9ac5d02bed Revert the GNUmakefile to compile, by default, using system-dependecies. This makes it easier for developers rather than packagers. Associated changes to not break packaging build rules. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3448 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-02 19:14:29 +00:00
Jens Ayton
03e7095775 Fixed OXP verifier failures for like_ship (those required keys ain't). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3447 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-02 17:34:42 +00:00
Nikos Barkas
821a9ccbcf Fixed speech crash when attempting to use the Russian localization OXP or strings with extended characters in general. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3446 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-01 21:37:00 +00:00
Nikos Barkas
21fe8c04d9 Fixed crash when trying to dump memory stats for laser beam textures, which do not exist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3445 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-31 21:40:15 +00:00
Marc
8b31b6c3a4 - fix: only either a NEU or an EEU in a ship for sale, never both! 
- fix: graphic glitch in shipyard when sales blurb overwrites the trade-in value of the player's ship

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3444 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-31 12:25:47 +00:00
Marc
aec27258a2 - fix: mac resolution switching while in full screen implemented in a cleaner way, to avoid memory leaks & possible application crashes. 
- restored texture handling with reduced detail to the way it was before 3431, difference in game terms was minimal. 

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3443 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-31 02:33:41 +00:00
Jens Ayton
e2b45e4db1 More mesh cache logging fun. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3442 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-30 21:27:49 +00:00
Jens Ayton
eecf6f19d2 Fixed OOMesh caching, which has been broken for some time. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3441 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-30 21:11:49 +00:00
Jens Ayton
7b2045182f Added logging of mesh loading. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3440 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-30 21:00:15 +00:00
Jens Ayton
3184aa2442 Cleaned up some static analyzer issues. Removed redundant attempt to load texture from cache in OOConcreteTexture (that code is only ever reached if there is no cached texture). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3439 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-30 19:03:07 +00:00
Jens Ayton
2ff694a60b Squelch a possible source of zombies (having received a bunch of universe.zombie messages). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3438 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-30 17:31:58 +00:00
Marc
e0ca2835a8 - fix: resolved mac lighting issues when switching from windowed to fullscreen mode 
- minor code cleanup

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3437 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-30 16:32:09 +00:00
Jens Ayton
f739ad7819 Fewer entities unaccounted for. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3436 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-30 15:57:05 +00:00
Jens Ayton
bbfe736af7 Here, have some files. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3435 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-30 15:20:48 +00:00
Jens Ayton
8a9a1e7b83 Added new debug function: console.writeMemoryStats(). Estimates total memory use by entities and textures, and how much texture data is visible (i.e. relevant to GPU swapping). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3434 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-30 14:51:13 +00:00
Jens Ayton
e532171d9d Fixed a faulty diagnostic. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3433 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-30 11:54:22 +00:00
Marc
5b70a00b4b - one more fix for the day! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3432 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-30 01:54:19 +00:00
Marc
307e0643a7 - 3425 redux: fixed remaining bugs from that commit, hopefully found them all. 
- no more distorted textures when reduced detail is on.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3431 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-29 23:51:16 +00:00
Jens Ayton
e12b40f5e2 Changes to the shader mode through the debug console is no longer saved. The reduced detail setting is now exposed through the console (also not saved), and disabled by the material test suite. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3430 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-29 19:42:46 +00:00
Nikos Barkas
834e09c007 Got stick mapper to see the correct foreground/background methods. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3429 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-29 19:10:06 +00:00
Jens Ayton
01afc05c13 Fixed lack of specular mapping on default-shader objects in reduced detail mode, then limited default-shader materials to three texture maps in reduced detail mode. Who uses reduced detail mode and shaders anyway? Reduced detail mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3428 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-29 19:09:34 +00:00
Jens Ayton
4f9b0a21d5 Fixed several issues with textures in shaderless mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3427 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-29 18:41:42 +00:00
Jens Ayton
4a33bc8f5a Centralised texture loading for backgrounds and overlays, and set options so textures aren't shrunk in reduced detail mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3425 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-29 17:55:03 +00:00
Jens Ayton
51c754eb84 Cargo/alloys from dying ships, and escape pods, now inherit parent's temperature. Temperature inheritance behaviour changed so ejecta from very hot ships are also very hot, and ejecta from ambient-temperature ships are not extra cold. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3424 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-28 11:17:45 +00:00
Marc
60fe22388f - Oops, thanks A_C! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3423 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-28 11:06:07 +00:00