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

4139 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Eric Walch
ad4e2394f1 Only allow TAF changes when FPS values are on display. This to minimise the chance of accidentally changing TAF. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4882 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-25 15:54:32 +00:00
Chris Morris
956c294404 EXPERIMENTAL: ship and weapon replacing from script. 
Currently API is
 - player.replaceShip("adder-player");
 - player.ship.aftWeapon = "EQ_WEAPON_MINING_LASER";
This may change in future, but should be enough to test underlying functionality.
NPC ship weapons cannot yet be altered this way.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4881 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-24 20:12:31 +00:00
Chris Morris
4d72c0d45c Make gamma correction check less cautious. Works for me, but perhaps it should disable gamma settings anyway? 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4880 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-24 20:10:00 +00:00
Nikos Barkas
71d1c96c6d Moar range for gamma setting. Now from 0.2 to 4.0. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4879 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-23 17:15:22 +00:00
Nikos Barkas
6f88ef38f3 A bit of cleanup on previous commit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4878 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-23 15:17:44 +00:00
Nikos Barkas
bfd7f90ffb Implemented gamma control for SDL builds. Started including code for Berlios request 5496. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4877 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-23 14:54:38 +00:00
Marc
7d28ce89c5 - fix/change: when loading a game with more cargo than cargo space, the extra cargo is removed. 
- replaced 'magic numbers' cargo rounding up values (500 & 500000) using the CARGO_KG_ROUNDUP constant.
 - yet more code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4875 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-22 11:55:14 +00:00
Chris Morris
64d9f1a645 equipmentRepaired also fires if awardEquipment is used to repair. Thanks to Wildeblood for pointing out this extra path. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4874 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-22 11:36:25 +00:00
Chris Morris
a48c4dfee0 Add equipmentRepaired worldscript event 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4873 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-21 21:53:02 +00:00
Eric Walch
4038d0a9ec - experimentel, harder hardMisileAI. Does not explode when target cloaks, but instead travels to the spot were target cloaked. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4872 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-21 19:52:36 +00:00
Marc
d9dd8ad3f9 - fix: savefiles with wrong passengers and/or passengers berths data are now handled a bit better. (maintenance & trunk) 
- after proper evaluation, reversed rev4866. passenger berths cargo space displacement fixed at 5 tons.
 - assorted code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4871 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-21 18:09:37 +00:00
Chris Morris
768d3c8007 Fix bug where equipment depending on currently damaged equipment would be silently removed from the player's ship on game load 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4870 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-21 17:38:30 +00:00
Jens Ayton
3b186ddbad Fixed a sign error, and cleaned up cargo capacity logic. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4869 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-21 17:14:59 +00:00
Chris Morris
11f70da5f7 Adjust missile damage to account for relative velocity. 
Exact values in oolite-missile.js are provisional and may need to be adjusted after wider testing.
Should get the best of both low and high frame-rate behaviours when it's finished.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4868 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-21 12:12:05 +00:00
Eric Walch
b58d393c25 - size check for launching ships no longer happens on launch, but when adding on the launch queue so that launching scripts return null for them. 
- police, interceptor and thargoid scan_class is now always forced into the default scan_class for them unless auto_ai is false and they have a scan_class defined.
- added a pilot to populator added thargoids. Script added thargoids always had them already. Only reason for this is that piloted ships use collision avoidance behaviour.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4867 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-21 08:09:23 +00:00
Marc
672e33b2e8 - change: required space quantity set inside equipment.plist is now used when adding/removing passenger berths to the player's ship. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4866 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-20 22:34:22 +00:00
Jens Ayton
1c961e520a Static analyzer placating, adjacent cleanup, and fix of a leak of virtual planets for material preloading. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4865 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-20 17:30:39 +00:00
Jens Ayton
4102e8dcee Typo. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4864 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-20 17:14:43 +00:00
Eric Walch
01a3b5c29b added cim's new missile script also to mac builds 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4863 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-20 07:32:19 +00:00
Chris Morris
287689914d Add Svengali's shipScoopedFuel event (feature request #5497) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4862 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-19 20:54:23 +00:00
Chris Morris
590b2b407f Better way of setting and calculating missile damage 
- revert r4853 changes to dealEnergyDamageAtDesiredRange
- instead, introduce ship.dealEnergyDamage(damage,range)
- apply new function to stock missiles, change default ship script for missiles


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4861 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-19 20:05:30 +00:00
Marc
d5d43d0f0a Undoing previous commit. shipTakingDamage was already working as intended as per forum thread: http://www.aegidian.org/bb/viewtopic.php?f=4&t=11853 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4860 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-19 10:33:23 +00:00
Marc
f229dcd87c - fix: shipTakingDamage event only fires when sustaining damage, as intended. (trunk & maintenance) 
- code cleanup!

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4859 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-19 10:22:59 +00:00
Marc
d199b2162f - got shipReleasedEquipment to work properly 
- experimental tweak: cloaking behaviour should now be identical between player & NPCs
- comment cleanup

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4858 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-18 23:03:50 +00:00
Chris Morris
0a2590e5f0 - Revert changes to station beacons 
- Change beacon ASC symbol to diamond for easier centring


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4857 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-18 16:33:04 +00:00
Chris Morris
30d06dcbe5 Bugfix: target system memory expansion shouldn't try to restore locks on cloaked ships. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4856 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-15 21:24:20 +00:00
Chris Morris
5e0136ab7b - Take out ship.setBeacon in favour of making ship.beaconCode writable. 
- Prevent writing of mainStation beacon.
- Change way that station beacon is handled with ASC - rather than having the compass point at the buoy, just make the main station beacon visible anywhere in the system.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4855 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-15 19:19:23 +00:00
Eric Walch
3dd9207100 Limit the range of destinations that 'setCourseToPlanet' generates when in the planet aegis. This reduces the change of falling shuttles setting a waypoint to avoid the planet and so preventing a landing. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4854 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-15 18:25:03 +00:00
Chris Morris
b7b57d6bbb Cap energy blast damage at 1/18 of weapon_energy, so that missiles at low frame rates do the same damage as missiles at high frame rates. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4853 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-15 15:05:48 +00:00
Eric Walch
14ec5bedc9 No longer shuttle launches from additional planets without nearby stations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4852 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-14 20:58:44 +00:00
Chris Morris
3c91e03e9e playerBoughtCargo and playerSoldCargo world events 
Also add commodity-name translations for the modern names for multi-word goods


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4851 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-14 18:46:30 +00:00
Marc
b630213cab - Planetary Twilight Part I: initial - hacky - implementation... 
- yep, more minor code cleanup!

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4850 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-14 09:23:03 +00:00
Chris Morris
09d75b4ddc Fix entity memory calculation in debug display 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4849 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-13 15:09:50 +00:00
Marc
ce057c7e45 - night sky! :) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4848 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-13 15:04:14 +00:00
Marc
fef0c673c8 - bugfix: standard subentities defined after any turret subentity would exhibit turret behaviour (real reason behind bug #18555). Fixed in trunk & maintenance. 
- removed a vestigial ship method from trunk.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4847 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-13 13:09:06 +00:00
Marc
998ed42dd8 A_C's better no-compile-warnings fix! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4845 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-13 09:00:13 +00:00
Eric Walch
79b17ebcef Added 
- new behaviour BEHAVIOUR_LAND_ON_PLANET that takes care of the whole landing and removal.
- AI command: performLandOnPlanet. Works only very close (500 meters) to the planet surface were APPROACHING_SURFACE has be send. Otherwise returns: NO_PLANET_NEARBY
- ship event: shipLandedOnPlanet(planet)
- changed the old AI message LANDED_ON_PLANET from normal to reactToMessage.  The normal one never triggered because of ship removal in the same update.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4844 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-13 07:43:38 +00:00
Chris Morris
e926f2ee5e Basic frustum culling for general entities and the planet. 
Performance improvements are situational but effective.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4843 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-11 17:33:12 +00:00
Marc
3cfaa0515d - removed auto-import warning from windows compile, removed a type mismatch warning from mac compiles. 
- made new_atmosphere sky colour less dependant on clouds colour.
- removed unused variable.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4842 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-11 14:38:46 +00:00
Jens Ayton
01187e352b Added large-address-aware switch for Windows build for nightlies. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4841 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-11 10:33:39 +00:00
Chris Morris
4093a4cd91 - fix bug in ASC where destruction of first or last beacon broke compass 
- add ship.setBeacon(code) to scripting


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4840 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-11 10:20:29 +00:00
Chris Morris
07d419950b Label elements of system_description to make lookups easier for human OXP writers 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4839 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-10 19:46:44 +00:00
Marc
9885dd2d11 New Planets: 
* new atmosphere colours now similar to 'old planets'
 * sky colour when diving inside new atmosphere now different from planet to planet. Affected by each atmosphere dominant colour.
 * fixed missing textures when shaders set to none.
 * temporarily set new planets as default!
 - some minor code & comments cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4837 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-09 19:00:13 +00:00
Chris Morris
6fa8723009 Fixes for graphics bug with older libraries and timer crashes 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4836 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-09 17:22:50 +00:00
Marc
7d324c3390 * new_planets: sky colour now changes when inside planets' atmosphere. 
* better handling of scoop and 'laser overheat' sounds. 

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4833 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-06 19:35:25 +00:00
Eric Walch
d9d6d52ce9 - Corrected the size of the new-atmosphere 
- fixed a crash on macs when logging with '_override = yes;'

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4832 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-06 17:03:49 +00:00
Marc
60c1b63935 Tentative fix for CTD involving timers - see http://aegidian.org/bb/viewtopic.php?p=167967 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4831 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-05 11:51:23 +00:00
Marc
f324b7ff4d * fix from cim: corrected jstimer snafu from rev3892(!). Hopefully all js resets should work properly now. 
- unrelated cleanup in trunk.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4830 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-05 08:19:28 +00:00
Nikos Barkas
7bdd084990 Fixed spelling in weapons' ranges log messages. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4829 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-02 20:45:42 +00:00