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

3039 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
32e1884e05 Groovy yet horrible macros to automate conversion of ObjC macros to JavaScript macros, and also profile individual native callbacks. More info in the Top Secret Mailing List Treehouse. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3586 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-21 18:07:47 +00:00
Jens Ayton
bcb23f31ee Removed redundant warning for unknown method types in shader bindings/JS call(). More sorting of JS properties for ease of maintaining documentation. Minor cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3585 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-21 14:55:34 +00:00
Nikos Barkas
c3061d4029 Fixed some breakage in equipment.plist. Upgraded Windows GNUstep base library to version 1.18.0. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3584 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-21 07:46:03 +00:00
Marc
e84a0d339c - fix: short range map highlight should have dealt with system info icons, as well as system names. (trunk & maintenance) 
- more equipment tweaks, hopefully sensible ones. (trunk)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3583 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-21 01:18:02 +00:00
Michael Werle
1f66a0fa7a Fix crash-bug when moving cursor around local screen. It's possible for a target-system to be selected which isn't in the local systems cache. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3582 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-20 16:14:39 +00:00
getafix
37e90934cf Added instructions on how to install an autopackage package. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3581 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-20 09:41:45 +00:00
Jens Ayton
0f0fc52754 Renamed EquipmentInfo.canAwardMultiple to canCarryMultiple. Equipment visibility now applies to shipyard blurbs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3580 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 20:40:09 +00:00
Marc
fb228765e3 Corrected mission text typo. (trunk & maintenance) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3579 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 19:56:05 +00:00
Jens Ayton
6ded4261b2 Cleaned up canAwardEquipment - now admits the existence of canAwardMultiple equipment, and has less redundancy. Added available_to_player and available_to_NPCs properties for equipment. Exposed five new equipment properties to JS. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3578 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 19:18:41 +00:00
Jens Ayton
16b8d30f54 Trumbles are no longer listed as equipment on status screen - hard-coded in maintenance, equipment attribute in trunk. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3577 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 18:36:10 +00:00
Jens Ayton
2eebd7cacf JS and legact scripts can now award multiple trumbles. equipmentStatus() now works for trumbles. setEquipmentStatus() cannot be used to damage impervious equipment types, including but not limited to trumbles. Cleaned up awardEquipment methods and damage handling. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3576 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 18:04:01 +00:00
Marc
40f2cf60de - major espeak languages cull. Temporarily removed Russian voice due to incompatibility with Russian oxp. 
- minor ship.sendAIMessage() cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3575 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 17:52:52 +00:00
Jens Ayton
fc408bd911 Disabled shaders for that horrible lying VirtualBox thing. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3574 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 15:50:25 +00:00
Jens Ayton
66a01337e9 Added JS Ship.sendMessage(). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3573 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 13:37:54 +00:00
Eric Walch
749ea7de08 Make sure the mission version of the constrictor always has a bounty, even when a constrictor version from a third party is chosen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3571 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 13:37:34 +00:00
Jens Ayton
b084484661 Implemented stack trace for AI recursion error. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3570 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 13:10:55 +00:00
Jens Ayton
86436966f2 Re-enabled maximum_shader_level settings (trunk). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3569 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 11:50:35 +00:00
Jens Ayton
be0ba9331c Disabled shady dust on GMA 9XX systems (where vertex shaders are handled on the CPU). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3568 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 11:45:00 +00:00
Jens Ayton
2512412213 Expanded JS debug call() to methods that return numbers, vectors or quaternions. Now shares code with shader uniform bindings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3567 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 11:14:35 +00:00
Jens Ayton
b5c5b5547d Tidied up prefix script a bit. Use longer timeout when loading scripts (accidentally omitted from r3550. Sorted JS Ship methods. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3566 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 09:42:04 +00:00
Jens Ayton
c7f103fe1f Sorted JS Ship property declarations. Fixed bug where attempting to get a weapon type for a weapon with no slot would halt the script (backported). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3565 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-18 13:10:52 +00:00
Jens Ayton
0a19def066 Sorted OOJSPlayerShip property/method declarations. Fixed bug when trying to engage autopilot while docked. Cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3564 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-18 12:37:06 +00:00
Jens Ayton
b3125322a9 JS player.ship.engageAutopilotToStation() no longer silently halts the script when failing. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3563 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-18 12:00:57 +00:00
Jens Ayton
94e8dfc093 JS player.ship.awardEquipmentToCurrentPylon() no longer silently halts the script when failing. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3562 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-18 11:48:40 +00:00
Marc
46c4badaa7 - Change: Thargons will now use the standard 'EQ_THARGON' identifier internally. Should still accept the non-standard 'thargon' identifier as a an alias - there might well be related breakages! (trunk) 
- Change: reworded debug console error messages. (trunk & maintenance)
- Comment cleanup. (trunk)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3561 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-18 08:41:35 +00:00
Jens Ayton
b2120abb35 Sorted some JS property and method declarations alphabetically to make checking their corresponding wiki pages easier. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3560 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-17 22:57:31 +00:00
Jens Ayton
e0c2c5123b Minor optimizations and cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3559 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-17 22:56:28 +00:00
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