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

3180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Walch
97733ee069 - added report messages for pilots that have both a bounty and an insurance. 
- ships that become a hulk are now removed from any group they belonged to.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3766 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-10-05 19:11:24 +00:00
Nikos Barkas
dcf1e04e22 Enabled logging of time of events' occurence in the format hh:mm:ss.mil. This is controlled by setting the key 'logging-show-time' to YES/NO in the preferences file. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3765 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-10-04 21:11:52 +00:00
Eric Walch
9838e68a1c - allow a player ship that is to big for a dock to launch. 
- small changes to the jink values and test locations for proximity
- allow proximity warnings for stations in certain situations.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3764 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-10-02 15:27:06 +00:00
Nikos Barkas
d3b9effe07 Removed duplicate up/down arrow key polling code in mission screens, at the same time making their menus warp-around like all other game menus. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3761 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-09-25 19:26:21 +00:00
Eric Walch
7b0c256e99 - launchPolice and launchDefenseShip now add the ships in front of the launchQueue. 
- escorts can no longer, wrongly, escorting ships that already entered witchspace.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3760 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-09-24 11:12:36 +00:00
Eric Walch
5042c648eb - Added a size check for launching and docking ship. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3759 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-09-19 09:30:46 +00:00
getafix
fcb618c07f Fixed mouse yaw by correctly initializing keyboardRollOverride. 
Mouse x-axis was performing a roll until player pressed keyboard roll.
Bug came up in r3751 by separating keyboard roll & pitch override.
(trunk & maintenance)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3758 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-09-17 11:45:33 +00:00
cmdrjames
6ffcae673f dont add weapons that have no allowed mounting 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3757 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-09-16 21:56:42 +00:00
Nikos Barkas
dbb3c67845 Slightly more generic and cleaner fix for previous commit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3755 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-09-16 20:55:06 +00:00
Nikos Barkas
04ccc90a6a Fixed bug where atmosphere was always set to true, even for moons, when texture was changed via JS. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3753 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-09-16 20:38:05 +00:00
Eric Walch
3c099b9a59 - Added AI command: thargonCheckMother for a more efficient thargon handling. 
- Improved the thargletAI slightly.
- Changed policeInterceptAI so that launching ships without target immediately clear the launch area.
- Moved the constrictor script from shipData to the worldScript. (to prevent problems with bad oxp copies of the constrictor)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3752 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-09-16 20:13:01 +00:00
getafix
638a4f11f3 Fixed joystick BUG #17482 (trunk & maintenance) 
Fixed joystick BUG #17490 (trunk & maintenance)
setFunctionForAxis minor code cleanup (trunk & maintenance)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3751 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-09-13 00:46:36 +00:00
Eric Walch
48618a789e Corrected wrong sign of roll in trackPrimaryTarget, added stronger jink in flee mode 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3750 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-09-12 15:14:23 +00:00
Nikos Barkas
fd1f1cb7fd Fixed bug where the escape pod sequence would be shown only if activated within ten seconds after firing main weapon for the last time. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3748 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-09-09 17:16:35 +00:00
Eric Walch
1eddd475cf restoring one line in trackDestination that gave problems with the player using docking computer 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3747 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-09-07 18:25:08 +00:00
Nikos Barkas
929fb9f2c0 Added the playerWillSaveGame script event handler, taking as parameter the type of savegame, which can be standardSave, autoSave or quickSave, as per request in http://www.aegidian.org/bb/viewtopic.php?p=117800#117800. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3746 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-09-06 18:20:39 +00:00
Marc
7a5b73ad92 - removed excessive [ship release]s left over from before rev3701's refactoring. 
The same problem affected system.legacy_spawnShip() and system.legacy_addShipsAtPrecisely(), both js and legacy(!) scripts.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3745 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-09-03 08:22:08 +00:00
getafix
4a77d46590 Fixed reticle target sensitive accuracy. If reticle is target sensitive, draw target box in red 
when target is within laser hit-range and passes through laser hit-point. The accuracy is decreasing 
in relation to the target distance. 


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3743 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-08-22 15:28:59 +00:00
Marc
8f4f1e5ed4 - added missing playerJumpFailed('malfunction') event to the jump malfunction code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3742 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-08-21 17:18:27 +00:00
Marc
9dedfda5b0 - the player can now have misjumps when using someone else's wormhole - required some refactoring! 
- when misjumping there's now a small chance of a decrease in reputation (should have kept the ship spaceworthy, etc...)
- added ship.hasHyperspaceMotor as a read-only js property.
- more cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3741 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-08-21 17:04:16 +00:00
Marc
9b25043399 - change: contracts/passengers screen won't be shown if the player hasn't got hyperspace capability. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3740 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-08-21 14:26:08 +00:00
Marc
9adaf521b7 - more accurate aft laser resell price. 
- some code cleanup.
- OXP change: added new shipdata.plist key 'hyperspace_motor' if set to NO, no NPCs or player ships can enter witchspace on their own. Defaults to YES if not specified. Fuel injection and galaxy jumps are not affected by this change. New translation strings added and GUI screens updated to accommodate this change.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3739 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-08-21 13:43:09 +00:00
Nikos Barkas
ed015792fb Fixed bug #17450 (Value of player's ship incorrectly computed). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3737 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-08-21 09:04:56 +00:00
Marc
ea621ca6e0 Fix: contracts screen could be accessed - incorrectly - from secondary stations, if docked, looking at the long range map, and pressing the key '?'. Not any more. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3736 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-08-12 17:03:18 +00:00
Nikos Barkas
7aa55be82c The guiScreenWillChange event is now sent also before switching to the system data screen (F7). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3734 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-08-09 15:24:21 +00:00
getafix
e9935b6955 Countdown messages display fix 
as per http://www.aegidian.org/bb/viewtopic.php?t=8314 
(trunk & maintenance)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3733 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-08-04 09:37:48 +00:00
Jens Ayton
d16dc20f0b All scripts now use underscore prefix for custom properties. Also general cleanup and linting. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3732 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-30 21:54:50 +00:00
Jens Ayton
5abbe23f56 Guarantee that missionScreenOpportunity() is never sent when the player is not docked, even if undocking happened during a missionScreenOpportunity() handler. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3731 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-30 20:58:21 +00:00
Jens Ayton
723846018e Exposed global object as property of itself, instead of fiddling around with silly functions where it's needed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3730 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-30 20:00:46 +00:00
Marc
1c169ad624 - fix: the JS function player.ship.addPassenger() now checks for duplicated names, and fails if an identical name is already on the passenger list. 
- new JS function: player.ship.removePassenger(name:string). Returns false if passenger name not found, true when passenger is removed.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3729 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-28 15:10:16 +00:00
Jens Ayton
cbf12be920 Asteroids spawned as post-nova debris are now effectively heat-proof. This is achieved with a new standard role: cinder. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3728 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-28 15:00:14 +00:00
Jens Ayton
5e0e3b4714 Moved some private Universe method declarations into private category. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3727 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-28 14:44:39 +00:00
Jens Ayton
0ffdb23b86 Fixed a JS crash. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3726 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-28 14:32:05 +00:00
Marc
cabe9792c7 Undocking in interstellar space is now possible: 
- to enable the new functionality, added the interstellar_undocking key to station/carriers. If "interstellar_undocking" = YES; , the station will remain where it is instead of moving to the nearest system, as it's always been the case up to now.
- quick fix to the nova mission to take this new possibility into account.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3725 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-28 12:01:39 +00:00
Jens Ayton
fc0d9a962d removeCargo now recalculates available cargo space. Specifying an empty string for a ship's script now acts as though no script was specified. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3723 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-27 20:06:55 +00:00
Jens Ayton
07b8dfa646 Trumble random reset fix as per http://aegidian.org/bb/viewtopic.php?p=115179#115179 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3722 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-27 18:34:08 +00:00
Jens Ayton
e94eddecea Accumulated minor cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3720 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-26 19:37:31 +00:00
Jens Ayton
b048099dc8 Fixed problem with planet textures when switching between lat/long and cube map textures. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3719 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-26 19:30:49 +00:00
Marc
78f2a3ac05 Trunk only for now: 
- fix: if looking at the commodity market while in hyperspace, just show 'Commodity Market' with null values as opposed to '(Nearest System) Commodity Market' - new translation string.
- fix: Stop fuel scoop activity indicators when standing still inside the corona and no scooping is actually taking place. 

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3717 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-26 11:50:58 +00:00
Marc
3ac05efb1c - experimental change: improved accuracy for most non-thargoid enemies when player stands still! (uber-complexified from Eric Walch's much simpler code - might prove to be a bit of a damp squib, at least the way I've implemented it...) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3715 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-25 17:53:32 +00:00
Marc
15bf2443ef - galaxy maps fix: after galaxy jumps the current system cursor is now reset properly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3713 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-25 15:13:47 +00:00
Marc
aa0e3e913a - fixed typo in checklist 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3711 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-25 13:55:12 +00:00
Jens Ayton
66ad3928a7 Fixed galactic hyperspace, completely disabled in r3467/r3469. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3708 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-25 12:33:06 +00:00
Marc
461adb7268 - oops! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3707 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-25 12:09:18 +00:00
Marc
6ddd61a87f - more assert fun, but with quaterinions! :) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3706 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-25 12:00:52 +00:00
Jens Ayton
aa8cbd1978 Softened one more assert in OOJSVector. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3705 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-25 11:49:16 +00:00
Jens Ayton
b204309937 Corrected nonnull attributes for JS vector functions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3704 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-25 11:44:34 +00:00
Jens Ayton
649669ac9c Clarification on what can and can't be NULL in JSObjectGetVector. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3703 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-25 11:41:55 +00:00
Marc
76abce69b6 - Trunk fix: reverted an over-zealous assert from rev3594 that was causing a CTD, instead of just rejecting invalid values. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3702 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-25 11:29:41 +00:00
Marc
8bdfe5043c - fix: all sunskimmers should now have adequate heat insulation. (trunk & maintenance) 
- fix: removed ghost exhaust plumes visible when launching after quick docking. (trunk & maintenance)
- removed duplicate and conflicting MAX_UNIVERSAL_ID definition. Might have occasionally created duplicate universalIDs (trunk & maintenance)
- refactoring & cleanup of various addShip methods. Hopefully didn't break anything, and possibly fixed #17215 - 'Lollipops' flash in wrong spot when creating new ships. (trunk)
- some code cleanup (trunk)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3701 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-24 15:28:42 +00:00