2125 Commits

Author SHA1 Message Date
Nikos Barkas
883837e701 Fixed rapid fire turrets.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2658 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-09 12:18:13 +00:00
Jens Ayton
0279aef8a1 A week's accretion of minor cleanup stuff.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2657 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-09 10:18:19 +00:00
Jens Ayton
2e02643e80 Fixed type mismatch error.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2656 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-08 23:45:38 +00:00
Eric Walch
fcf3262010 bounty now correctly returns bounty and not legal_status. (Probably a C&P error as player only knows legal_status)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2655 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-08 21:10:20 +00:00
Michael Werle
7d00c2cb77 Fix dh_lintian call for Ubuntu "hardy"
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2652 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-08 09:05:40 +00:00
Nikos Barkas
38a29f0c84 Sanitized conditions in hasShipyards before processing them, so that e.g. hasShipyard = ([quotes]score_number greaterthan 1[quotes]); works again.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2650 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-08 08:36:53 +00:00
Marc
95c2797e81 - fix: switching to galaxy map from contracts screen using '?' now highlights the contract destination correctly in all cases now - it was failing with short names like 'Ra' in galaxy one.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2649 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-07 23:43:08 +00:00
Nikos Barkas
70d2d2b260 Fixed exception when hasShipyard was being given a conditions array to process.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2648 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-07 21:09:19 +00:00
Michael Werle
7bb913afe0 - Tweaked new docking-clearance-request-updates messages as discussed.
- Renamed docking-clearance resource strings to be more consistent.
- Fixed slow-gpus plist; it was causing exceptions in MacOS


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2647 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-07 20:26:02 +00:00
Darren Salt
545437da88 Shut lintian up.
Alternatives: symlink the Resources dir, with the real dir being somewhere in /usr/share, but this causes upgrade problems (dpkg will not replace a directory with a symlink), or to symlink

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2646 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-07 19:26:44 +00:00
Darren Salt
2e7b25128d Debian package bits: bump standards version & fix up the copyright file.
This leaves many warnings in place - one about dh_desktop deprecation, and many
about files which should be in /usr/share.
Also, the current version is 3.8.3; 3.8.0 is chosen for lenny compatibility.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2645 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-07 16:43:30 +00:00
Marc
bcbe5fd939 - undone the generic fix for status screen paging as it was hampering the F5/F5 screen (it became F5/F5/F5) hopefully re-applied the older fixes in the right place.
- reworked some error messages. Added to entropy / killed a few fairies by allowing 3 separate aliases for each of the double-worded commodities (foo in Manifest['foo']). Some culling is probably advisable.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2644 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-07 00:33:14 +00:00
Marc
9e27ce2410 - restored commodities.plist as it was before my testing...
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2643 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-06 18:00:41 +00:00
Eric Walch
61414e8e02 Added update messages when player is waiting for docking clearance
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2642 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-06 16:16:02 +00:00
Marc
a7c2cd2578 - hopefully last tweak to the way available cargo is computed...
- tidied up some warnings, and added a test condition against changing cargo values when Special Cargo is in use.
- corrected a silly mistake in the manifest commodity setter.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2641 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-06 16:12:50 +00:00
Michael Werle
4009e2259a Replaced OOUniversalID id_locks[] with ShipEntity * id_locks[] (OOWeakReferences) in StationEntity - this should fix phantom ships from holding up NPC ships.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2640 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-06 15:29:53 +00:00
Marc
0721d9d93b - added the js manifest code to trunk...
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2639 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-06 09:49:10 +00:00
Marc
b1b835713e - deprecated player.ship.awardCargo() & player.ship.canAwardCargo()
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2638 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-06 09:20:34 +00:00
Marc
47f9f2c920 * corrected manifest miscount when ship in flight.
* last change to player.ship.manifest: manifest.food & similar are now read/write manifest quantities. Internally all commodities are now going to be referenced by the canonical identifiers, commodities.plist still overrides the displayName - the .manifest.list array is unchanged, and still read-only.
* renamed 2 ship properties for consistency: ship.availableCargoSpace & ship.cargoCapacity now become ship.cargoSpaceAvailable & ship.cargoSpaceCapacity.

- more code tidying.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2637 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-06 09:09:08 +00:00
Jens Ayton
287da97963 Weekend of SVN Death fixes: partial fix for planet texture mapping suckiness (disabled by default, see FIXED_TEX_COORDS in PlanetEntity.m). Fixed crash when constructing JS timer with invalid parameters. Some cleanup and stuff.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2636 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-05 13:13:06 +00:00
Marc
cd7aba1fe8 Oops! Removed mac compile warning.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2635 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-05 11:56:42 +00:00
Nikos Barkas
590a50b773 Eliminated GCC 3.4.2 warnings about cases in switch statements related to commodity enumerations not being handled.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2634 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-05 11:39:37 +00:00
Marc
1a2f093de8 * fix: Commodity units have been internalised. This renders overrides for commodity units null and void, and stops cargo from changing mass from station to station.
* new: ship.addPassenger(name, start, destination, eta, fee) and ship.awardContract(quantity, commodity, start, destination, eta, fee) functions. Currently only apply to player.ship, these add a passenger / a special delivery contract to the player.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2633 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-05 07:26:46 +00:00
Michael Werle
365ce90ed5 Final(?) fix for blocked docking queue - ships which die during docking approach leave a phantom in the queue which only got cleared when the station added a ship to it's launch queue.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2632 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-02 19:21:09 +00:00
Jens Ayton
d1d0537680 Some maths library stuff missed in r2630.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2631 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-02 16:36:48 +00:00
Jens Ayton
fa490ec929 Modifed maths library for easier reuse in utilities and stuff. If OOMATHS_STANDALONE is nonzero, OOVoxel.h, OOTriangle.h, OOBoundingBox.h and legacy_random.h are excluded, and GL types aren't used unless OOMATHS_OPENGL_INTEGRATION is nonzero. Also, OOVector.m, OOMatrix.m and OOQuaternion.m can now be compiled as plain C.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2630 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-02 15:04:07 +00:00
Jens Ayton
8306de9b14 Cleaned out some dead code. Desaturated all flashers slightly to reduce blending artefacts. (Odd, I thought I checked that in last week.)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2629 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-02 15:02:16 +00:00
Jens Ayton
48d8c93c19 Moved witchspace beacon to system origin. Let's see if anyone notices.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2628 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-02 14:57:20 +00:00
Eric Walch
55e21608d2 Scooping cargo no longer pushes 3 times an AI on stack. When previous scooped cargo is dumped or released after an explosion, it now continues in the AI were it was interrupted. This will mainly benefit escape-pods that continue flying home.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2627 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-02 12:49:09 +00:00
Marc
08e229c1b6 * fix: dumping multiple cargo pods of the same type is now confirmed on screen for each pod, as well as giving the usual acoustic feedback.
* fix: redefining new commodity list shows the new commodity name instead of (nil) - see http://aegidian.org/bb/viewtopic.php?p=88745#88745

- ShipEntity code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2622 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-01 11:04:45 +00:00
Nikos Barkas
3a6365f0c4 Fixed a case of the player being able to buy negative cargo, which was leading to crashes.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2620 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-30 17:29:51 +00:00
Marc
e134a7eaf7 - oops!
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2619 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-29 11:01:28 +00:00
Marc
d947723e0b * fix: finally the proper fix for autopaging status screen!
* fix: cancelling file overwrite sends the user back to the save commander screen instead of the status screen.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2618 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-29 10:51:48 +00:00
Marc
8cf9ea966b * fix: after quicksaving, the status screen now displays properly.
* new: ship.passengers array: {name, start, destination,eta, premium, fee, startName, destinationName, etaDescription}
* new: ship.contracts array: {commodity, quantity, description, start, destination,eta, premium, fee, startName, destinationName, etaDescription}
* change: player.ship.manifest is now an object instead of an array - new properties: manifest.food , manifest['alien items'] etc.. plus manifest.list (array, equivalent of the 'old' .manifest) the commodity objects themselves changed to be consistent with the new .contracts array (name -> commodity, displayName -> commodityName) example of new usage from console:  if (PS.manifest.food) PS.manifest.food.quantity
- yet more code cleanup


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2617 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-29 10:26:02 +00:00
Marc
5ee5e3479e * New: ship.maxMissiles read only property. NB: NPCs always return the current number of missiles on board, due to current underlying engine limitations.
* Change: load failure prefix string altered to avoid the silly sounding 'Saved game failed to load. Could not load file.' That now reads 'Failed to restore saved game. Could not load file.': half as mysterious! :)

* Game Over fixes:
- after game over, Oolite now restores the last saved game. 
- there should be no more 'xyz broken equipment' messages after dying now.

I'm fairly sure I haven't broken anything there, but will port to maintenance after some more testing.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2616 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-28 15:06:18 +00:00
Eric Walch
05a2809aa1 Changed name of JS coordinates property into savedCoordinates. Added a check for group ==escortGroup before removing the leader from the group.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2615 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-28 13:23:26 +00:00
Marc
3ef88b860d * Reworked equipmentList:
- renamed to ship.equipment, now works for NPCs too, and excludes missiles & primary weapons
- ship.missiles array: lists all the missiles (including external storage) equipped - NB: like hasOneEquipmentItem includeMissiles, it's somewhat inaccurate for NPCs
- Primary weapons types now accessed using the new ship.forwardWeapon, ship.aftWeapon, ship.portWeapon, ship.starboardWeapon properties - for NPCs too.

* All weapon type-to-string functions now work properly for twin plasma cannons too.

- more minor code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2614 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-28 09:13:05 +00:00
Jens Ayton
9e9a6295ec Correct fix for crash when player has a ship script.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2613 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-27 16:30:30 +00:00
Nikos Barkas
73d73c1470 Fixed crash that was happening whenever the player ship had a script defined in its shipdata.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2611 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-27 13:26:49 +00:00
Jens Ayton
003b4d40e3 Fixed a small bit of nonsense.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2610 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-27 13:04:22 +00:00
Marc
560e5501b1 * Autosave fixes ( trunk & maintenance ):
- no more autosave immediately after a restart.
- removed duplicate screen message during autosave.
- autosaved commander name is now 'CommanderName (autosave)' instead of 'autosave' as before.

* Trunk:
- changed the name of the autosave description key inside plist.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2609 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-27 03:10:39 +00:00
Marc
f1b6b9adac * change: player.ship.mainfest[] readonly; replaces player.ship.queryCargo() - each commodity listed has 4 properties: {name,quantity,unit,displayName}
* new: player.ship.equipmentList[] readonly - each item listed has 4 properties{type,facing,isOk} facing uses WEAPON_FACING_NONE to WEAPON_FACING_STARBOARD, stored as int. Still needs a js helper function.

* new: Oolite.gameSettings{} readonly - the properties that can be queried atm: autosave, wireframeGraphics, procedurallyTexturedPlanets, musicMode, speechOn, reducedDetailGraphics, shaderEffectsLevel.

* change: planet.texture (read/write property) replaces the now deprecated setTexture() method.

- minor comments cleanup

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2608 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-26 17:12:37 +00:00
Eric Walch
30fb92a7f1 Added "coordinates" as JS property of ship.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2607 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-26 10:06:05 +00:00
Eric Walch
8e6b529602 Removed the increase of max_cargo on buying the large bay from playerEntity as it also is increased in shipEntity.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2606 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-25 20:19:32 +00:00
Jens Ayton
251bdb1b07 Cleaned up some junk, and added missing files to makefile.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2605 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-25 19:57:46 +00:00
Jens Ayton
09843c8073 ...and removed now-unused flare256.png texture.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2603 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-25 19:36:08 +00:00
Jens Ayton
2f12c5c4e2 Moved laser and explosion flashes over to OOLightParticleEntity, and changed OOLightParticleEntity size from an NSSize to a single diameter.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2602 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-25 19:35:13 +00:00
Jens Ayton
6b2e74be02 Reinstated plasma impact bursts.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2601 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-25 18:27:47 +00:00
Jens Ayton
3132dc8fe4 Moved plasma shots over to the new hotness. Bloom effect on plasma impact is temporarly disabled pending yet another new OOLightEntity subclass. Also fixed a bug where turrets would hold fire until target was well inside of range, instead of just outside as per comment. Also also, removed entity isParticle ivar.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2600 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-25 17:36:59 +00:00
Marc
b132eb31fd * Fixed the NEU availability issues once again. Please don't un-fix.
* Fix for the last-ever-I-promise graphic glitch with find system on the long range map. 

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2599 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-25 17:06:51 +00:00