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

4288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikos Barkas
14758a308d Fixed a couple of build warnings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4950 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-20 20:53:56 +00:00
Chris Morris
7ec9ba3211 Add side weapon points to NPCs. 
- automatically used sometimes in combat if weapons fitted
 - performBroadside AI command to force use if fitted
 - JS properties added for NPC ships
 - shipdata.plist properties added (no core ship uses them, of course)
 - works better if you fit the same weapon to each side, but it can cope...


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4949 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-20 15:59:44 +00:00
Eric Walch
1a2c5ee3e6 - Using the <return> key in the save dialog on a BACK or MORE entry now goes back/forward instead of trying to save a file. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4948 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-20 15:39:22 +00:00
Eric Walch
79a6d262bb - Exposed 'isVisible' as property of Entity. isVisible is true when the entity is in drawing distance. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4943 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-19 16:26:47 +00:00
Chris Morris
d2aebc3674 Add scripting support for point defense targets 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4942 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-19 12:59:26 +00:00
Eric Walch
27bb46cacd - Added two new AI commands: 'storeTarget' and 'recallStoredTarget' 
- Used both commands in pirate and missile AI for a better reaction on cloaked targets.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4941 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-16 12:46:14 +00:00
Chris Morris
9147f844bc Calculate totalBoundingBox on ship initialisation as well as on update 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4939 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-15 17:18:02 +00:00
Chris Morris
9b0ac9af4c Add damage_probability property to equipment.plist (and damageProbability to JS view) 
Always effectively zero for pylon equipment.
Otherwise equipment to be damaged will be picked on algorithm like ship roles.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4938 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-14 19:52:45 +00:00
Chris Morris
ea0ed50fb2 Return a Vector for boundingBox rather than three separate parameters 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4937 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-14 17:11:32 +00:00
Chris Morris
cbc582ad35 Improve fix for depth buffer initialisation on Linux 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4933 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-13 16:54:58 +00:00
Chris Morris
2bf44d9a17 Tentative fix for Linux crash with -nosplash 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4932 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-13 16:34:46 +00:00
Nikos Barkas
ac27a706e3 Fixed breakage in SDL deployment build. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4931 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-13 10:25:13 +00:00
Chris Morris
de2bb10f36 Fix minor bug in bounding_box_get_dimensions() 
Expose bounding box dimensions to script


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4928 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-12 16:42:32 +00:00
Chris Morris
1b11e0e346 Tentative fix for missile removal crash bug 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4924 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-12 10:25:22 +00:00
Chris Morris
3303c7a248 New ship.setBounty(amount,reason) function to give custom reasons to shipBountyChanged for better inter-OXP communication. 
Also fix some bugs with the shipBountyChanged event


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4923 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-10 20:55:46 +00:00
Nikos Barkas
c5bf077d42 Fixed space/tab identation snafu from r4902. Nothing interesting, really. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4922 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-10 16:39:10 +00:00
Eric Walch
fc5bd583bc - Station related ships (like miners, patrols etc.) now inherit the stations heat insulation if that was higher. 
- Frame Callbacks now transfer the correct time difference when timeAccelerationFactor is active.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4919 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-10 15:28:16 +00:00
Chris Morris
abcafd71d2 Frustum culling: flasher subentities need to be included in radius 
Experimental: double NO_DRAW_DISTANCE - better results on larger displays, but impact on performance needs testing


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4917 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-09 21:28:53 +00:00
Chris Morris
5692cefef2 Readable player.ship.weaponFacings (same values as shipyard weapon_facings) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4916 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-08 18:11:43 +00:00
Eric Walch
6486df01b7 - Fixed compiler error on macs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4915 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-08 07:54:13 +00:00
Eric Walch
2bf2d09243 - the eventhandler shipLaunchedEscapePod now has a second parameter that transfers an array of the passenger pods. (limited to 64) 
- When a pilot ejects, the remaining thrust of the hulk is now capped to 5. This is the thrust of an escape-capsule, so the capsule can stay away from the decelerating hulk.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4914 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-08 07:36:02 +00:00
Chris Morris
ed1ee2302c shipBountyChanged(delta,reason) world and ship events 
Also remove debug line left in point defense changes


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4913 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-07 19:33:20 +00:00
Chris Morris
27e2c0dcf4 Make player.ship.serviceLevel read/write 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4912 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-06 17:05:39 +00:00
Chris Morris
04a46aab7c Optimise contract generation by throwing out some contracts which would be discarded anyway in the GUI stage. Shouldn't call the route algorithm more than about 20 times now, which even on slow PCs should feel "instant" most of the time. 
Doesn't appear to change the types of contracts actually offered.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4911 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-06 13:55:15 +00:00
Chris Morris
5519d4a167 Expose pitch, yaw and roll read-only on JS ship 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4910 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-05 20:49:13 +00:00
Eric Walch
326de17a63 - requires_cargo_space now also works correct when implicit removing or adding repaired equipment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4909 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-05 17:51:41 +00:00
Eric Walch
9e4f5f4cb3 - The used cargo space is now shown in the long description on the equipment screen. 
- The thargoid plans mission now updates the time when awarding equipment.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4908 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-05 15:18:45 +00:00
Jens Ayton
451525e3dd Removed some obsolete Core Audio debug code, added a state dump where I'm seeing intermittent errors. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4907 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-05 10:30:38 +00:00
Jens Ayton
60f04a0867 Tweaked some Xcode file attributes and added terminal line breaks to make Unix tools happy. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4906 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-05 10:18:58 +00:00
Eric Walch
a8e966ea57 - the equipment key: requires_cargo_space now actually uses cargo space for that equipment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4905 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-05 10:14:19 +00:00
Chris Morris
652f414ff7 Revert aft_weapon damage change for Thargoid lasers; thanks Commander McLane. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4904 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-05 07:49:42 +00:00
Eric Walch
86bc4b2c36 - Added RESTARTED messages to some of the AIs that use the new fleeQMineAI to prevent leaving the ships idle. 
- also added the q-mine warning inside becomeEnergyBlast so that custom q-mines also give a warning, albeit later.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4903 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-03 20:34:19 +00:00
Nikos Barkas
7183c5f2ef Fixed lack of fuel scoop sound bug, at the same time attempting to fix the 'laserover-laserover' sound repetition issue. Thanks to Svengali for providing the code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4902 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-03 12:14:53 +00:00
Eric Walch
4500f5fa79 - Fixed a typo for the Mac compiler and added the 2 new AIs to the mac builds 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4901 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-02 21:28:08 +00:00
Chris Morris
3adc3ec460 Make JS returned types for passengers and contracts arrays match the docs. 
Thanks to Capt. Murphy for spotting this one.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4900 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-02 20:44:12 +00:00
Chris Morris
052f596e61 Improvements to (mostly Thargoid) AIs 
Bug fixes:
1) Giving a ship an aft Thargoid laser and a forward Thargoid laser
   now has a different effect to giving it just a forward Thargoid
   laser. (It gives it double attack power with its laser; use sparingly!)
2) Thargoid laser rate of fire no longer depends on the frame rate.

AI upgrades:
1) Pilots with fear will attempt to flee from Q-Mines at top speed
2) Pilots without fear will attempt to blow up Q-Mines, then avoid the
   cloud if unsuccessful.
3) Ships with a Thargoid laser fitted will use the fact that they have
   an omnidirectional laser to their advantage in combat.
4) Ships with multidirectional weapons (thargoid lasers, plasma
   turrets) can now track multiple targets with those weapons, which
   need not be the primary target, and use these weapons as point
   defense. New AI commands have been added for optimal use of point
   defense, but even old AIs will do reasonably well.

New AI commands:
1) "addPrimaryAggressorAsDefenseTarget"
2) "addFoundTargetAsDefenseTarget"
3) "findNewDefenseTarget"
4) "clearDefenseTargets"

New AI alerts:
1) DEFENSE_TARGET_LOST
2) DEFENSE_TARGET_DESTROYED
3) CASCADE_WEAPON_DETECTED


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4899 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-02 20:08:54 +00:00
Chris Morris
c4ac34bd44 Update reference sheet: 
- diamond icon for nav buoy
- note energy bomb is strict mode only
- correct ship dimensions
- fix a few typos


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4898 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-02 20:05:19 +00:00
Nikos Barkas
f35eea123d Added timer to the contributors' list - credit for implementation of Berlios request 5496. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4896 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-02 12:32:22 +00:00
Nikos Barkas
e390aa112c Fixed typo from previous commit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4894 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-01 21:49:45 +00:00
Nikos Barkas
a74e228d90 Fixed Nav Array not showing distance and time information when target system was selected by using the Find Planet method. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4893 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-01 21:46:15 +00:00
Chris Morris
1e3f4e3665 Fix bug with resetting of passenger contracts on ship change 
(trunk and maintenance)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4892 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-01 19:02:22 +00:00
Nikos Barkas
3e8e768065 Added JS PlayerShip read-only property laserHeatLevel. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4891 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-28 18:04:27 +00:00
Nikos Barkas
b0375084db Feature request 5496 is now in for developers' tests, has to be manually enabled (make FEATURE_REQUEST_5496=yes). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4890 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-28 17:44:39 +00:00
Chris Morris
b506a87264 player.ship.price and player.ship.serviceLevel read-only 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4889 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-28 13:57:56 +00:00
Chris Morris
7a5543f487 ship.dataKey read-only attribute to make player.replaceShip more practical 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4888 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-28 13:16:33 +00:00
Chris Morris
ddeb52eb8a Cap energy damage explosion range (legacy and script) to SCANNER_MAX_RANGE 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4887 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-27 21:19:30 +00:00
Chris Morris
a11f1ca551 Clean up system populator function (mainly making comments match functionality and removing obsolete code) 
Make rock hermit clusters more likely to be large clusters


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4886 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-27 21:10:39 +00:00
Chris Morris
06f1f340be Replacing ships with script also triggers playerBoughtNewShip 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4885 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-26 21:52:17 +00:00
Chris Morris
919fa44134 Adjust experimental missile damage calculations. Collision velocity calculation 
is improved, and velocity component of damage is capped. Thanks to Switeck for test results on previous version.
Also clarify equipment.plist comments


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4884 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-26 21:37:49 +00:00
Chris Morris
be5d0e26a8 - Laser setting API now takes any valid equipmentInfoExpression 
- Laser setting API now works fore and aft for NPCs


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4883 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-25 19:03:08 +00:00