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

3012 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
0eae9af0e7 Optimized OOLogAbbreviatedFileName() for faster OOGL() and logging. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3558 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-17 22:55:57 +00:00
Eric Walch
8120ac3653 Make "Game Options" the default choice on the load/save game page, when docking as a non-main station instead of the first line what is "Begin New Game" on such stations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3557 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-17 20:53:05 +00:00
Marc
10b04327cf Further changes to main weapon purchase. 
- GUI: show the weapon being purchased before listing the facings, as in 1.74.
 - if the shipyard data has "weapon_facings" = 0; (i.e. no weaopon facing is available) no main weapon will be offered for sale.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3555 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-17 18:29:21 +00:00
Marc
cb4fa48f9f - fix: restored case insensitvity for 'classic' manifest identifiers. In other words, player.ship.manifest['Gem-Stones'] works again. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3553 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-17 14:34:42 +00:00
Michael Werle
8f63bcdfa9 Fix wrong logging of market generation errors (bug #17251). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3552 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-16 20:16:42 +00:00
Nikos Barkas
a88e0b5838 Fixed Windows build, at the same time removing some duplicate headers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3551 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-16 09:26:54 +00:00
Jens Ayton
2d7a435327 Include full path in stack trace for files named script.js/. Extended time limit for script loading and startUp(). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3550 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-15 22:36:48 +00:00
cmdrjames
4249c7ef7b Deferred changes that I have been waiting for end to code freeze. 
Slight change to laser purchasing which should end the problems with some configurations not being possible.
Add scripting for overriding fuel scoops so that people can have scooping effects for their own equipment or can do clever stuff with extra suns or whatever.
Some rationalisation of magic numbers, so we check constants or methods rather than inline magic numbers.
Little bit more logging.
Change time spend in wormhole to be 3/4 of full jump, maths to prove it is optimal for gameplay available from PhantorGorth.  Time of flight discussed in thread http://aegidian.org/bb/viewtopic.php?t=7917

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3549 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-15 20:38:40 +00:00
Jens Ayton
00ffca2f26 Implemented rudimentary stack backtrace for JavaScript. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3548 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-15 20:28:22 +00:00
Jens Ayton
4a05529d68 Fixed crash when calling system.filteredEntities() with non-object as predicate. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3547 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-15 20:21:19 +00:00
Jens Ayton
794d5833b5 Removed obsolete bug notes from checklist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3546 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-15 17:59:17 +00:00
Nikos Barkas
084c2aaac7 - Fixed Nova mission not awarding gem stones upon successful completion. 
- Fixed 'Witchspace engine malfunction' message when arriving at a system where the sun has gone Nova.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3544 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-15 17:22:23 +00:00
Jens Ayton
844b875396 Added basic profiling facility for JavaScript. Examples of use: 
console.profile(function(){  console.shaderMode = "SHADERS_OFF";  });
or
    :profile console.shaderMode = "SHADERS_OFF"
either of which print a string like:
    0.94239 seconds (2.00559e-05 seconds JavaScript, 0.94237 seconds extension
    time)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3543 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-15 16:28:42 +00:00
Jens Ayton
2d9346496c Fixed JS time limiter behaviour for system.filteredEntities(). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3542 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-15 14:14:20 +00:00
Jens Ayton
f2f31e79fe Started on a testing checklist. Noted several nova mission bugs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3541 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-15 13:28:11 +00:00
Nikos Barkas
eeb47a63bd Fixed profiling stopwatch problems in Windows. The profiling stopwatch on this platform has milliseconds resolution. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3539 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-15 09:00:12 +00:00
Jens Ayton
0a3fe65a1a Updated Mac nightly build script to include dock tile plug-in for Snow Leopard. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3538 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-14 19:21:41 +00:00
Jens Ayton
217273cc7a Pause time limiter when logging. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3535 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 21:39:29 +00:00
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