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

2994 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
2265f75214 Disabled automatic build/install of dock tile plug-in for people building on Leopard. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3534 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 20:59:49 +00:00
Jens Ayton
0a9d8df271 Ported r3531 to maintenance, and bumped copyright years. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3533 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 20:32:10 +00:00
Jens Ayton
30bece8f30 Moved Oolite-importer into Mac-specific. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3532 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 20:25:19 +00:00
Eric Walch
12f2237af5 Replaced some "hasEquipment" calls by "equipmentStatus ===" 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3531 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 20:20:48 +00:00
Jens Ayton
3472aabce9 [Mac] Added dock tile menu to show log, screen shots etc. In Snow Leopard, it sticks around when the app quits if it's still in the dock. Also, option->show log shows the log folder. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3530 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 20:08:57 +00:00
Jens Ayton
0e9ee84562 Added some documentation for JS script limiter in OOJavaScriptEngine.h. Pause limiter while spawning ships or planets, and while searching entities. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3529 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 19:13:09 +00:00
Jens Ayton
528abd2ac6 Implemented time limiter for JavaScript scripts. Set to be extremely aggressive for testing. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3528 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 18:51:07 +00:00
Jens Ayton
213ce5a28f Added default script for player ship, so it isn't a special case. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3527 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 17:53:25 +00:00
Jens Ayton
abc947defa More version bumpage. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3526 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 17:44:06 +00:00
Jens Ayton
30073a9350 Removed some redundant OpenGL state changes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3525 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 17:41:24 +00:00
Nikos Barkas
bcd8266754 Bumped version number on the Word and PDF versions of the readme. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3524 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 17:41:00 +00:00
Jens Ayton
df34ec4c7a Added equipment.plist entry for trumbles. Looking forward to finding out what sort of intriguing, subtle side effects this will have. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3522 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 17:06:12 +00:00
Michael Werle
d80a4c6e7e Fix for bug #17247 - system defined markets now only affect the main station. 
Also, market-override now falls back on station role before using the default market if the market isn't defined; missing markets are logged.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3521 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 17:04:10 +00:00
Jens Ayton
1055615ac3 Deleted all deprecated JS features. Re-enabled GC debugging in Mac TestRelease configuration for nightlies. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3520 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 16:47:07 +00:00
Jens Ayton
6bb2705216 Re-added ability to use SystemInfo.systemsInRange() as an instance method. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3519 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 16:00:30 +00:00
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