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

1689 Commits

Author SHA1 Message Date
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
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
Jens Ayton
feaefd0b67 Rearranged ShipEntity setup so could-not-load-AI errors tell you what ship's causing the problem. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2598 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-25 16:02:38 +00:00
Jens Ayton
a88b0d8107 New, smoother texture for flashers/sparks for better blending and anti-aliasing. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2597 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-25 15:38:52 +00:00
Jens Ayton
c2acf1729a Fixed r2590 string handling change for 64-bit systems. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2596 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-25 15:31:37 +00:00
Jens Ayton
bf3ab98bd4 Fixed a sporadic crash in OOLogOutputHandler. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2594 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-25 14:33:39 +00:00
Jens Ayton
0466443ce1 Distance clipping and attenuation for flashers and sparks now scales reasonably. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2593 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-25 14:05:13 +00:00
Jens Ayton
0889ca77a4 Minor tidying up. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2592 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-25 13:25:19 +00:00
Jens Ayton
88a3a39750 Removed unused feature checks for Altivec - we can always put them in again if I get around to optimizing image scaling. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2591 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-25 12:44:21 +00:00
Marc
a0a1b592c2 Trunk: 
* any found system in galaxy map is now restored properly from save games.
* various found system bugfixes.
* corrected new nova mission string typo.

Maintenance & Trunk:
* friendlier handling for missing ']' in expandDescription: will return the unexpanded string instead of nil, plus warning integrated better with logcontrol.plist

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2590 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-25 12:38:47 +00:00
Nikos Barkas
7a0d0f9d2c Fixed crash when a string to be expanded was passed to expandDescription without its closing square bracket. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2588 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-24 23:46:37 +00:00
Eric Walch
e618207326 No longer add missiles to ship-groups. In the AI the statemachine name is now stored before starting the ENTER state. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2587 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-24 15:55:54 +00:00
Michael Werle
54c278532d Linux OXP Verifier dumping output to Log-file and then to stdout. 
Also left in a commented-out alternative to only dump to stdout.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2586 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-24 06:02:15 +00:00
Marc
e7b55ae248 * 2583 redux: 'tinyfied' the previous bug fix, and ported it to maintenance. This should be the end of bug #15579! 
- remembered one more place for version bump.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2585 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-23 21:39:37 +00:00
Jens Ayton
d56da8516d Fixed bug where an exception during drawing would stop any drawing from happening in future frames. Fixed exception when trying to draw an empty equipment list. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2584 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-23 21:17:06 +00:00
Eric Walch
d1316acfb6 Fixed bug of hitting wrong front/aft shield of player when hit by laser-beam from a NPC ship-subentity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2583 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-23 19:37:24 +00:00
Jens Ayton
ccc42d2e7c Hopefully fixed spurious "ERROR: OOLoggingInit() has not been called" messages in logs in SDL builds. (Couldn't reproduce under Linux, but fixed a probable cause.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2581 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-23 14:33:28 +00:00
Jens Ayton
14006e4076 Like r2575, but less silly-looking. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2576 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-22 13:01:07 +00:00
Jens Ayton
d3da30329f Rolled back GuiDisplayGen.m fix from r2573 (redundant, equivalent fix in r2555). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2575 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-22 12:58:52 +00:00
Marc
4ec39441b2 * trunk & maintenance mac fix: oolite will now start in fullscreen if it was in fullscreen mode when last played. Behaviour now consistent across all platforms. (Bug #16222) 
- Faster oxp verify startup ported to maintenance.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2574 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-22 10:50:16 +00:00
Michael Werle
e2d71bc6d3 Fix compiler warning under XCode, reported by goran on IRC. 
Removed duplicate line introduced in r2567 in docking logic.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2573 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-22 05:59:19 +00:00
Nikos Barkas
c13e2451d8 Avoid going to second equipment page in player status screen also when coming from the save overwrite confirmation screen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2569 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-21 22:15:40 +00:00
Jens Ayton
c0c1bcda40 Geometry code cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2567 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-21 21:18:57 +00:00
Jens Ayton
2adf8be9cc Renamed disable-operation-queue-texture-loader pref to disable-operation-queue-work-manager. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2566 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-21 21:14:14 +00:00
Eric Walch
207d178efb Changed station approach so only ships within scanner range are put on approach list. Docking procedure itself is unchanged and ships are given APPROACH instructions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2565 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-21 20:41:35 +00:00
Eric Walch
3c1f0471e9 Removed an unused assignment to max_available_speed in applyThrust. Changed station approach so only ships within scanner range are put on approach list. Docking procedure itself is unchanged and ships are given APPROACH instructions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2564 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-21 20:39:43 +00:00