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

3007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marc
b29631c6f0 - change: if no weapon_energy is entered inside a turret's shipdata entry, the standard turret energy of 25 is used instead. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3670 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-14 23:34:28 +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
Jens Ayton
8328dd8101 Cleaned up some copyright notices by special request. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3668 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-14 17:01:24 +00:00
Jens Ayton
9b395f61f2 Checked in comment missed in previous commit. Also, previous commit fixed a crash in JS callObjC() when methods return nil. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3667 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-14 16:29:12 +00:00
Jens Ayton
5b08d67a9e Fixed a couple of exceptions due to OOShipGroup mutation while being enumerated (backported). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3666 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-14 16:23:48 +00:00
Nikos Barkas
18727ce3bd Added caracal to contributors' list. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3665 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-11 17:20:03 +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
2cf12c159e - Linked resale value to amount of broken subentities. 
- Tweaked maintenance costs surcharge for repairing subentities.
- Minor code cleanup. 

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3663 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-10 13:03:27 +00:00
Nikos Barkas
6693eefd83 Made missile_load_time visible to JavaScript and ensured that it cannot be set to a negative value. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3662 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-09 12:22:03 +00:00
Marc
79976ad1ed A bunch of frangible ships changes, might be revised soon: 
- save games now remember whether the player ship's subentities are destroyed or not, and show them on the integrated load screen.
- maintenance overhaul now repairs subentities too. An extra fee is added to the price, proportional to the number of destroyed subentities.
- new js function: ship.restoreSubEntities() - repairs all subentities, returns false if no subentities were restored.
- new js property: ship.subEntityCapacity - the number of undamaged subentities the ship comes with.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3661 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-08 07:23:01 +00:00
Marc
46dbbb0396 - Trunk only: new key added to savegame: 'target_system_name'. Needed to identify which overlapping system is being targeted when saving the game. This should fix the last of the overlapping systems oddities. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3660 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-06 00:55:54 +00:00
Marc
0f26babb2d - fix: loading a game saved from an overlapping system should not get confused any more. 
- regression fix: loading a save game remembers the previously targeted system. (might still get confused by overlapping systems)
- minor code cleanup

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3659 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-05 23:22:18 +00:00
Marc
d55f4b758f - rev3642/3649 fix: after game over Oolite won't restart automatically. (trunk and maintenance) 
- fix: compile error when DOCKING_CLEARANCE_ENABLED isn't (trunk)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3658 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-05 02:55:49 +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
Marc
af2468e0f9 - change: added a shipAttackedOther(other) event to mirror the existing shipBeingAttacked(other) event. Called immediately after shipBeingAttacked. (trunk & maintenance) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3652 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-03 15:02:25 +00:00
Eric Walch
abdc5a90c1 Added a OOJSPauseTimeLimiter on ship.spawn() 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3651 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-03 12:00:13 +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
d7f841940f - change: enabled mass dependant fuel prices, doesn't seem to break anything... 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3648 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-01 23:00:07 +00:00
cmdrjames
38c2921227 Changes to prevent abuse of long range chart to change target system during hyperspace countdown. Reported by Switeck on IRC. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3647 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-01 22:31:24 +00:00
Eric Walch
7c8a30d5e3 Added "countEntitiesWithScanClass" to the JS system object for just counting the entities 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3646 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-01 19:04:16 +00:00
Marc
1aae117030 - fix for Bug #17246: 'Exhaust does not reset when jumping/teleporting'. The exhaust plumes are now reset after each jump / js teleport (the latter achieved with ship.positon = Vector3D) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3645 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-30 22:56:11 +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
Marc
72c2feadee - fix: weapon repeat rate is now handled independently for each weapon: switching between views/different types of weapons doesn't cause any fire rate inconsistencies any more! (Bug #17240: Shot_time should be per weapon). 
- minor code cleanup.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3642 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-29 21:50:04 +00:00
Nikos Barkas
33cec98628 Enabled use of keys Insert, End, PageUp and PageDown. Mac testing needed to confirm that I have not destroyed anything. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3641 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-29 19:09:55 +00:00
Michael Werle
e80f7a1dcf Removed the bespoke apply-patches script for Debian; no longer required with new quilt-based package format. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3640 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-29 15:37:49 +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
dcbfd7f1c5 Fix up some callObjC() stuff in debug console. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3638 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-28 06:58:03 +00:00
Jens Ayton
52133a8420 Enforce mission variable underscore restriction. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3637 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-27 23:59:12 +00:00
Jens Ayton
3c88ad59f5 Cleaned up some invalid JS attributes. Fixed JS namespace pollution with call() and inspect(), and renamed call() to callObjC(). Mission variable names may no longer begin with underscores. Script names may no longer begin or end with underscores or whitespace. The missionVariables object may now be enumerated with for-in. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3636 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-27 23:52:37 +00:00
Jens Ayton
b775065f76 Profiling everywhere. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3634 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-27 19:35:22 +00:00
Jens Ayton
0df498ae48 Streamlined mission.runScreen(), and made it stricter about parameter validation for consistency with stuff in general. Also added profiling stuff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3632 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-27 18:33:18 +00:00
Jens Ayton
712f95f4c4 More JS profiling support. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3631 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-27 17:57:34 +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
c358781bfc Fixed nasty audio latency -- 850 ms! -- when first playing a sound under OS X. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3628 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-27 16:04:05 +00:00
Jens Ayton
4d3849a609 Fixed a fix for Mac OS X. Where does that leave Linux? 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3627 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-27 15:33:12 +00:00
Jens Ayton
ae3f86c1fb More profiling. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3626 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-27 15:24:23 +00:00
Nikos Barkas
2918deeccc Fixed compile error under Windows. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3625 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-27 14:14:03 +00:00
Jens Ayton
a764ae56da ExceptionAndProfilicated up the Console object, and extended timeout for console commands. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3624 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-27 14:00:40 +00:00
Jens Ayton
18bebd07c7 Started deploying profiling and thread-safety macros - even if they don't work in Windows, they're useful elsewhere. Profiling is now used on all Vector3D and Quaternion methods, all System methods, and the hot path for System.addShips(). Disabled aggressive JS GC testing in Mac TestRelease builds, so that profiling results are vaguely useful. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3623 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-27 13:25:08 +00:00
Michael Werle
428c5a5f02 Converted debian package structure to v3, as per Darren Salt's suggestion in order to make it easier for downstream packagers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3620 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-27 08:26:13 +00:00
Jens Ayton
1f37adb25c Basic writeups of remaining missions for checklist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3619 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-26 21:58:50 +00:00
Jens Ayton
e94304c925 Fixed a material synthesis bug where illumination_modulate_color was ignored when using emission_and_illumination_map in shader mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3616 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-26 17:28:38 +00:00
Jens Ayton
b22d527ca7 Support F12 as alternative full-screen toggle for Mac OS X. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3615 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-26 15:54:21 +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
beed767459 Disabled dead zone for mouse control. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3612 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-26 14:29:22 +00:00