862 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
b353faef84 A mixed bag:
* change: specifically setting empty comms_log_gui & message_gui sections inside hud plists now resets those guis to Oolite's default. Updated standard huds accordingly.
 * bugfix: fixed crash with malformed gui declarations inside hud plists - trunk & maintenance.
 * change: internal name of commodity identifiers normalised: 'liquor/wines', 'alien items', 'gem-stones' are now expressed internally as 'liguor_wines', 'alien_items' and 'gem_stones' - in most cases the old identifiers are still recognised, for backward compatibility.
 - linux build and windows build directories separated, both can now share the same source directory without build conflicts.
 - updated copyright notice in shaders files, minor planet drawable cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4826 127b21dd-08f5-0310-b4b7-95ae10353056
2012-04-01 13:27:36 +00:00
Eric Walch
2c2e3b416a - the restored planet shader files from r4818 now also work on mac builds
- escorts launching from stations, now correctly have their mothers scanClass

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4825 127b21dd-08f5-0310-b4b7-95ae10353056
2012-04-01 09:59:08 +00:00
Marc
ed00bda834 Steady lasers partI!
- Shot lasers don't lag behind any more when the player's ship is moving at speed.
- Readjusted position for cobra3 side lasers, to avoid the now noticeable 'laser crosses'.

minor comment rewording.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4821 127b21dd-08f5-0310-b4b7-95ae10353056
2012-03-30 16:43:53 +00:00
Marc
baf5830463 - restored NEW_PLANETS shader files.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4818 127b21dd-08f5-0310-b4b7-95ae10353056
2012-03-28 22:11:06 +00:00
Eric Walch
cb9e2a2cee - On scooping the cloak, the cloak now becomes repairable in tech level 15 systems.
- Improved the docking approach when arriving from the backside of a station.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4800 127b21dd-08f5-0310-b4b7-95ae10353056
2012-03-10 15:19:44 +00:00
Eric Walch
bb50cc8433 - takeSnapShot() is excluded from the timelimiter.
- scooping constrictor pilot without killing the ship no longer gives a success message.
- activating a "becomeEnergyBlast" or "becomeExplosion" within a shipDied event, no longer triggers a new shipDied event.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4794 127b21dd-08f5-0310-b4b7-95ae10353056
2012-03-04 16:04:45 +00:00
Jens Ayton
a106f4055f Shader synthesizer: light maps can now be controlled by bindings.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4793 127b21dd-08f5-0310-b4b7-95ae10353056
2012-02-26 17:08:49 +00:00
Jens Ayton
df1412c57b Shaving the yak fantastic.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4773 127b21dd-08f5-0310-b4b7-95ae10353056
2012-02-11 15:53:58 +00:00
Eric Walch
6fd5701273 - added two AI commands: setTargetToRandomStation and setTargetToLastStation.
- setTargetToRandomStation will select a random station from all stations within 'desiredRange'. Carriers and stations without npc_traffic are excluded. It returns "NO_STATION_IN_RANGE" or "STATION_FOUND"
- setTargetToLastStation sets the primary target to the last selected station. It returns "NO_STATION_FOUND" when the last station lo longer exists.
- Updated the route1traderAI.plist so that ships with bounty no longer go to the main station as default but start looking for a random station.

- Bugfix: Activating the fuel injector while deceleration from torus speed, no longer drops the speed immediately to max-injector speed.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4770 127b21dd-08f5-0310-b4b7-95ae10353056
2012-02-08 19:45:39 +00:00
Jens Ayton
dce3f842ce Fixed normal and parallax mapping with shader synthesizer. Player Cobra 3 is temporarily pink while using synthesizer.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4765 127b21dd-08f5-0310-b4b7-95ae10353056
2012-02-08 00:34:07 +00:00
Jens Ayton
5377668ea8 Restored energy bomb compensation and made energy bomb strict mode only again.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4755 127b21dd-08f5-0310-b4b7-95ae10353056
2012-01-31 19:17:45 +00:00
Eric Walch
fd073849fe - Ships that have a specific commodity defined as cargo, no longer get their bounty reduced to 10% when the pilot ejects.
- The scoop icon now correctly shows a full cargo hold when special cargo is transported.
- Added code that points the ships towards the station during stationkeeping. Main reason is that the player has something to watch when waiting.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4744 127b21dd-08f5-0310-b4b7-95ae10353056
2012-01-18 21:41:37 +00:00
Jens Ayton
deb8b846be Cleanup.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4741 127b21dd-08f5-0310-b4b7-95ae10353056
2012-01-18 15:23:11 +00:00
Jens Ayton
121f6ef237 Slightly simplified default fragment shader now that we don't need to worry about Mac OS X 10.4 compatibility.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4739 127b21dd-08f5-0310-b4b7-95ae10353056
2012-01-16 18:53:56 +00:00
Eric Walch
e5a6411d1a - using the js method 'launchPlayer()' during one of the two docking handlers has no longer any undesirable side effect.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4737 127b21dd-08f5-0310-b4b7-95ae10353056
2012-01-11 19:43:16 +00:00
Michael Werle
7312ad733c Bump copyright to 2012. Happy New Year!
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4692 127b21dd-08f5-0310-b4b7-95ae10353056
2012-01-03 16:08:14 +00:00
Michael Werle
cb2d00a924 Bump version number to 1.77; start new Changelog.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4691 127b21dd-08f5-0310-b4b7-95ae10353056
2012-01-03 15:14:11 +00:00
Michael Werle
d4066989e8 Reverse Compass - allows stepping backwards through beacons.
Shift-\ (|) is now bound to stepping through the Advanced Space Compass's
targets in reverse order.  Beacon-list has been converted to double-linked
list to facilitate this.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4689 127b21dd-08f5-0310-b4b7-95ae10353056
2012-01-02 20:37:06 +00:00
Jens Ayton
527b3214c7 Remapped ASS to Assignment in JS error identifiers. Also added some missing ones. Hmm, this should be automated.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4686 127b21dd-08f5-0310-b4b7-95ae10353056
2011-12-25 11:30:17 +00:00
Jens Ayton
e7076105a3 Comment typos.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4685 127b21dd-08f5-0310-b4b7-95ae10353056
2011-12-24 09:09:24 +00:00
Nikos Barkas
c665a084d8 MNSR step 1: Rolling version number to 1.76.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4674 127b21dd-08f5-0310-b4b7-95ae10353056
2011-12-03 17:51:19 +00:00
Eric Walch
450c395138 - AI fix for homeAI. When multiple escape pods are launched, there is no longer a part suddenly disappearing.
- AI fix for looting to prevent a ship circling around a cargo pod as I witnessed the other day.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4673 127b21dd-08f5-0310-b4b7-95ae10353056
2011-12-02 17:18:30 +00:00
Marc
d2922e78d4 More js reset fixes:
- made js engine less likely to stall on reset after player's death.
 - better feedback in case of load game failure due to js issues.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4665 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-28 01:17:03 +00:00
Eric Walch
cf7ed44372 - Launching traders with a 'sunskimmer' role now start with sufficient heat insulation for sunskimming.
- Added an AI command 'checkHeatInsulation' (returns either: INSULATION_OK or INSULATION_POOR)
- ship_temperature no longer becomes negative (and stays negative) after a witchspace jump from a hot area. (delta_t can be several seconds on the first update after a jump)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4647 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-15 19:41:46 +00:00
Nikos Barkas
2bc085b4d0 Fixed key_map_home assignment so that it corresponds to the correct Home key code.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4625 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-19 13:17:01 +00:00
Eric Walch
3db424c845 The dumping of the entity list when the universe is full can now be controlled through the logcontrol.plist. Default is no dumping.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4622 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-17 14:25:20 +00:00
Marc
b2e41a0306 * 2 deployment fixes:
- '*' creates a snapshot, as per 1.65 - fixed SDL inconsistency, so numpad '*' also works.
 - 'o' switches the HUD on & off - its js equivalent also works. Inexplicably that key was left hardcoded while all other keys were moved to keyconfig.plist - fixed that too.
* hopefully finished fixing windows' UK keymapping.
* fixed intro inconsistency between game startup, and restart (now the cobra 3 caption shows for exactly the same amount of time in both cases).
* Fixed minor autosave glitch - no more unnecessary autosaves immediately after saving a game manually.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4617 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-14 13:49:27 +00:00
Eric Walch
8ba93d4115 - The AI commands 'becomeExplosion' and 'becomeEnergyBlast' now also trigger the shipDied event handler.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4604 127b21dd-08f5-0310-b4b7-95ae10353056
2011-08-26 19:34:19 +00:00
Nikos Barkas
063427c16e Fixed weapon name displayed always as '<position> <type> laser' on the status screen, even after editing it in equipment.plist. As a result, the weapon_name array in descriptions.plist is no longer necessary.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4600 127b21dd-08f5-0310-b4b7-95ae10353056
2011-08-19 22:53:46 +00:00
Eric Walch
5013d3c330 - Fixed bug #17997. When very close to the dock, the player now gets a few extra seconds to finish docking or to back off.
- Fixed a bug where the player got docking clearance while there were still ships in the launch queue.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4593 127b21dd-08f5-0310-b4b7-95ae10353056
2011-08-11 16:52:16 +00:00
Jens Ayton
49c928fead Bumpy bumpy version.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4579 127b21dd-08f5-0310-b4b7-95ae10353056
2011-07-12 07:32:26 +00:00
Jens Ayton
47d4b2c6f1 Added sunskim-trader to pirate victim roles.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4565 127b21dd-08f5-0310-b4b7-95ae10353056
2011-06-21 22:14:48 +00:00
Eric Walch
8316cc2a1d - Docking/launching ships now look at totalBoundingBox instead of boundingBox to see if they fit in the dock. Same boundingBox to totalBoundingBox change for calculating needed orientating to the dock while docking.
- enteringTraderAI now checks for interstellar space (in case of a misjump).

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4553 127b21dd-08f5-0310-b4b7-95ae10353056
2011-05-18 20:16:57 +00:00
Jens Ayton
774c4b922b Versions that go bump in the night.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4550 127b21dd-08f5-0310-b4b7-95ae10353056
2011-05-09 20:50:15 +00:00
Jens Ayton
21feac565f Remastered application icons.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4543 127b21dd-08f5-0310-b4b7-95ae10353056
2011-05-07 13:21:54 +00:00
Jens Ayton
35ecbe0fab Removed logging, which isn't getting us anything. Also reenabled JavaScript usless-expression warning.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4536 127b21dd-08f5-0310-b4b7-95ae10353056
2011-05-04 07:05:17 +00:00
Jens Ayton
396a29a9c1 Removed patent nonsense from default vertex shader.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4534 127b21dd-08f5-0310-b4b7-95ae10353056
2011-05-01 16:10:30 +00:00
Marc
5b83750a31 More on fuel prices:
- implemented dynamic version of fuelChargeRate.
 - removed protected fuel_charge_rate variable from shipEntity object.
 - initial implementation of post-MNSR - more accurate - fuel ratio calculations, bracketed by '#if 0's

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4532 127b21dd-08f5-0310-b4b7-95ae10353056
2011-04-29 21:27:55 +00:00
Jens Ayton
aee593fa13 Fixed some comments.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4530 127b21dd-08f5-0310-b4b7-95ae10353056
2011-04-28 18:47:04 +00:00
Jens Ayton
a1b28ecb52 Rolled back r4524.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4525 127b21dd-08f5-0310-b4b7-95ae10353056
2011-04-24 23:21:50 +00:00
Marc
69fa821072 Heat shields now compatible with strict mode... fixed one standard mission in strict mode, and made fuel collecting in strict viable again.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4524 127b21dd-08f5-0310-b4b7-95ae10353056
2011-04-24 16:16:03 +00:00
Eric Walch
34b4427b41 - Ships disgorging from wormholes now also use witchspaceLeavingEffects
- Pirate Escorts now correctly follow their leaded trough a wormhole
- Added the AI message ACCEPTED_ESCORT to be able to send attack instructions to the escort when self in fight.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4523 127b21dd-08f5-0310-b4b7-95ae10353056
2011-04-24 10:07:33 +00:00