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

683 Commits

Author SHA1 Message Date
Eric Walch
6ee5ad11c4 Fixed bug with "exitting" pirates that wee blocked 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3677 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-17 16:35:16 +00:00
Jens Ayton
6d4a55504a [Mac] screen shots directory can now be moved around (on the same volume). If it is renamed, Oolite deliberately ignores it and creates a new one on the desktop. The dock tile plug-in has not yet been updated. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3672 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-15 13:15:12 +00:00
Jens Ayton
61bbc84257 Reinstated prematurely removed logcontrol entry. Minor cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3671 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-15 09:23:58 +00:00
Jens Ayton
0e9b8e2aad Use NSMutableDictionary instead of OOCache in OOCacheManager, since OOCacheManager caches are never pruned, thus obviating the only feature of OOCache. (Note: OOCache is still used by OOTexture and OOEncodingConverter, which do use pruning.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3669 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-14 17:55:06 +00:00
Marc
570a81ab35 Docking cleanup: 
- fix: all autopilot options (and docking clearance) now follow the same, consistent rules: no docking help at main stations if fugitive, no docking help at other stations if hostile.
- fix: no more 'docking clearance revoked' messages after 'no docking clearance needed' if player / station becomes hostile.
- change: hostile stations don't send friendly 'come on in' messages anymore.
- change: shift-c and c can now be used interchangeably to exit autopilot mode.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3664 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-11 01:28:12 +00:00
Marc
27fbf520d1 - ported individual stations' station_roll setting to maintenance. 
- fix: searching for one overlapping system by name in the long range map now should always identify the right system. (trunk & maintenance)
- docking clearance: all stations/carriers should now refuse docking clearance to hostile ships (trunk)
- more copyright cleanup

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3657 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-05 01:24:52 +00:00
Marc
a94d4b5bac - station_roll can now be used inside individual stations' shipdata.plist. If not found, use the systemwide override inside planetinfo.plist if defined, or standard station roll, as before. (trunk) 
- more copyright fun: replaced instances of em dash with '-' to help syncronise updates better, added copyright info to the profiling stopwatch.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3656 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-04 22:32:30 +00:00
Marc
65dff53391 - added one missing copyright info, and updated copyright notices in maintenance. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3655 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-04 18:39:27 +00:00
Marc
2448a4f38f - OK, now all copyright notices inside the code should be up to date! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3654 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-03 18:45:37 +00:00
Eric Walch
aacb61e8fb behaviour_fly_from_destination now does let a ship fly in the correct direction. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3650 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-03 10:11:00 +00:00
Marc
fe9d9da2f9 * fixed inconsistent disabling of 'custom view' key while in flight: it's now disabled only in the long range map (to allow input of system names), enabled everywhere else. 
* reduced - but not yet eliminated - the blue flash caused by wrongly drawn exhausts after hyperspace jumps.

- minor comments & log output cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3644 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-30 18:18:31 +00:00
Jens Ayton
8e9e906b76 Backported generalization of SystemInfo.systemsInRange() (oops - intended to do that for 1.74.1). Don't use multi-texture materials on hardware which doesn't support it. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3639 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-28 18:15:31 +00:00
Jens Ayton
637b7042ef Updated trunk changelog. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3630 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-27 17:38:31 +00:00
Jens Ayton
cf36d4f7fa Added JS system.scrambledPseudoRandomNumber(). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3614 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-26 15:46:26 +00:00
Jens Ayton
c54fe64bbf Updated Mac OpenGL context handling to be slightly more similar to recommended best practice. Doesn't actually _follow_ best practice because best practice only works in Snow Leopard. Also, avoid unnecessary graphics reset during startup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3611 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-26 13:18:31 +00:00
Jens Ayton
8749abb049 Switched gpu-settings.plist to a dictionary, for useful merging behaviour. Added explicit precedence setting. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3589 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-22 20:39:41 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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