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

2879 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
a7d96ce760 Bumpez les versions! (Except the ReadMe, because I don't have Word, and the Debian stuff, because it confused me.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3518 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 15:40:59 +00:00
Jens Ayton
e9a7e9dc0f Missing changelog entry for 1.74. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3513 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 13:00:20 +00:00
Marc
4725aa0e6d - hopefully completed 3498: one more texture source tracked. 
- code cleanup: removed useless extra calculations from F7 screen.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3510 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-12 23:11:26 +00:00
Jens Ayton
1edaad2aba Fixed temporary object rooting problems when converting dictionaries and arrays to JS representations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3509 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-12 19:36:22 +00:00
Jens Ayton
a436e27ad2 Noted bug #17247 as known bug in change log. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3507 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-12 09:06:52 +00:00
Marc
6cfe9bcaaa - fix: sometimes, on the short range map, the player would be able to target planets just outside the map, while the cursor would be reset to the centre of the screen. Cursor & targeted system should now be in sync at all times. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3506 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-12 02:01:00 +00:00
Jens Ayton
78a8cf5dd5 Added library credit for libogg/libvorbis (only used directly in OS X). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3505 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-11 22:53:03 +00:00
Jens Ayton
740d5718b7 1.74 changelog. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3504 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-11 22:33:50 +00:00
Jens Ayton
ff39408225 Fix for bug #17216 Broken untextured planets. This introduces (or exposes) a new bug with axial tilt under fiddly circumstances (distinct from bug #17243), but everything to do with rotation axes needs to be reviewed after 1.74.0 anyway. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3503 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-11 22:21:59 +00:00
Jens Ayton
94fe97a1e3 Replaced maximum_shader_level with default_shader_level for 1.74.0 for testing purposes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3502 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-11 22:18:38 +00:00
Jens Ayton
cf24d2f7c0 Like r3494, but useful. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3501 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-11 22:12:37 +00:00
Jens Ayton
69c8203c9e Fix for access to SystemInfo prototype object properties. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3500 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-11 20:16:59 +00:00
Michael Werle
9315ef7b30 Markets for stations without an explicit 'market' entry were broken in r3091 - including the core Rock Hermit. This fixes it. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3499 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-11 17:09:10 +00:00
Jens Ayton
2516df1080 Reinstated planet texture source tracking. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3498 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-11 12:17:57 +00:00
Jens Ayton
5e82f1d8e5 Clearing the lollipop colours of a ship in JS now reverts to definition in shipdata instead of scanclass default. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3497 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-11 11:48:59 +00:00
Jens Ayton
b2220bf4f8 Fixed crash with repeated transient uses of JS EquipmentTypes - triggered by Cataclysm and almost certainly lots of others. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3496 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-11 10:36:08 +00:00
Jens Ayton
6bf4d5dc7c Minor cleanup. Also, disregard second claimed fix in previous commit, but feel free to continue regarding the rant. ;-) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3495 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-11 09:02:32 +00:00
Jens Ayton
afc6ec8459 Fixed bug where smoothed and unsmoothed versions of the same mesh weren't differentiated in cache. Fixed buggy result in potential error case in JS ship.setShaders() due to unspeakably horrible antipattern of using strings in outResult as a flag. Seriously, don't do that. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3494 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-11 08:59:53 +00:00
Jens Ayton
f1c93ba97c Put watermarking before glFlush(). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3493 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-11 08:52:22 +00:00
Nikos Barkas
4414ba6f43 Fixed inconsistencies with the Extra Passenger Berth(s) description in the shipyard. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3492 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-10 17:47:35 +00:00
Michael Werle
dd0e03e2ce Removed 'abortAllDockings' in 'collideWithShip' as it interferes with Docking Clearance. This was especially evident in combination with the new AsteroidStorm OXP. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3491 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-10 12:24:47 +00:00
Jens Ayton
529d762362 Linux build warning fixes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3490 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-09 18:57:46 +00:00
Eric Walch
6acabb790f Moved "oolite-rocktunnel.dat" to the correct "Models" folder. Probably only wrong at the mac 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3489 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-09 18:34:21 +00:00
Jens Ayton
d94a870841 Fixed exception during console.writeMemoryStats() and thereby subsequent JS assertion. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3488 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-09 13:48:32 +00:00
Jens Ayton
da3168e9f6 Shaders should now load regardless of (ASCII superset) encoding - as JS scripts already do. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3487 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-08 20:33:25 +00:00
Eric Walch
1fdcee9e4e On a collision, only one of both objects was notified about it. Now both ships get the message. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3486 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-07 21:36:20 +00:00
Marc
273ced5e39 3473 & 3477 redux: simpler logic & tidier, more robust code! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3484 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-07 10:16:36 +00:00
Jens Ayton
74c2fc5fa0 Fixed previous JS root fix so that it's actually fixed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3481 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-07 00:18:37 +00:00
Nikos Barkas
8c7345b0b3 Added code to display the names of ships next to the scanner lollipops, disabled by default and available only in debug builds. 
Warning: This is strictly for debugging purposes.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3479 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-06 22:55:03 +00:00
Michael Werle
01322db4ee + Add JS_OPT=yes/no command-line parameter to (GNU)Makefile. Determines whether to compile/link with Optimised or Debug version of Spidermonkey. (Default optimised) 
+ Disable NSOperation for GNUstep builds for now.  Current GNUstep (up to trunk) only has an incomplete implementation of it.



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3478 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-06 22:05:16 +00:00
Marc
cde179ca8e fix: calling system.info when in interstellar space would return an error, and write 'Cannot read systemInfo values for other galaxies.' to the log. 
- system.info.name now returns 'Interstellar space' .government returns -1, etc...

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3477 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-06 19:12:33 +00:00
Jens Ayton
7ad4d2ca60 Stripped out OLD_PLANET_TEXTURE (and FIXED_TEX_COORDS) stuff from PlanetEntity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3476 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-06 17:47:04 +00:00
Marc
16da4f9c3c - fix: when restarting a game (F2 > Begin New Game) Oolite would not reset the hyperspace system shown on the status screen to Lave. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3475 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-06 17:21:36 +00:00
Jens Ayton
8971373510 Whitelisted addFuel:. Fixed a comment on the panoply of texture caches. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3474 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-06 16:33:29 +00:00
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