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

2072 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Walch
5e8ee68a8f Added a "messageMother: ESCORT_ATTACKED" to the escort AI for escorts busy escorting. Added a response to this message for mothers in ATTACK mode to selectively release escorts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2595 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-25 14:50:28 +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
3a35a277ed Scavengers no longer try to switch to non-existent ATTACK_SHIP state when attacked during docking. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2582 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-23 16:58:10 +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
7ece702371 Added list of places where there are version numbers. Add any I've missed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2580 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-22 21:28:32 +00:00
Jens Ayton
10c3243d29 Finalizing 1.73.4 changelog. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2578 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-22 16:21:20 +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
Jens Ayton
e390b42dbe Made buoys shinier, because I can. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2572 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-21 22:46:36 +00:00
Nikos Barkas
b278fc15f3 Fixed missing planet name in Constrictor mission. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2571 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-21 22:34:51 +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
Jens Ayton
b091d0c40e Hyperspeed is now turned off when dying. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2563 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-21 19:55:53 +00:00
Jens Ayton
8dbaf15071 Changelog updated for 1.73.4. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2558 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-21 19:13:25 +00:00
Jens Ayton
096945b387 Fixed some not very interesting build problems. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2555 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-21 18:08:28 +00:00
Nikos Barkas
d233f066de Fixed ECM. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2554 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-21 16:53:11 +00:00
Nikos Barkas
4d9210bc48 Fixed a build warning. Added the missing display_name shipdata key to the list of keys known to the OXP verifier. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2552 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-21 08:42:37 +00:00
Marc
ea15dfb1fd * Trunk: 
- fix: long range map now deals correctly with short name planets too, eg: 'Ra' in galaxy 1 (instead of showing all planets starting with 'Ra'). 


* Fixes ported to Maintenance:
- equipment bugfixes: removeEquipment() should now work in all cases whether the equipment is damaged or not. Awarding EQ_REMOVE_MISSILES now removes all missiles, as expected.
- hud bugfix: ships that haven't got a hud specified, now use the standard one, instead of using the previous ship's until restart.
- fixed 'subentities disagreeing with parent' bug (when selling ships with subentities)
- shipLaunchedFromStation fix: the launch station is always sent to the event now.
- equipment display fixes: switching back & forth between the 2nd & 3rd equipment purchase pages doesn't change the position of equipment for sale anymore. Loading a savegame should always show the first page of on board equipment now.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2551 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-21 08:08:37 +00:00
Marc
9cd4bd7e13 * Feature: shift-arrow keys will cycle through all the planets highlighted by 'find' in the long range map. 
* Feature: long range galaxy map now remembers the system selected with 'find', until a new search is made.
* OXPVerifier now displays the verifier log in wordpad when in windows, and a feedback message in linux.
* gameview cleanup: delete key now handled in a consistent way across all platforms, removed unused directives
- more code cleanup!


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2550 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-21 00:39:08 +00:00
Nikos Barkas
e4138c6906 Fixed Windows build (timeGetTime definition was missing). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2549 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-20 17:08:14 +00:00
Nikos Barkas
8607f64d69 Fixed bug where excessive cargo quantities could be scooped sometimes, resulting in more cargo in the hold than there was meant to be. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2547 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-20 16:49:11 +00:00
Jens Ayton
426815f740 Freed ECM blasts from their ParticleEntity bonds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2546 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-20 16:06:33 +00:00
Jens Ayton
6fcbeed9b3 Moved OOAsyncWorkManager out of Materials folder, for making-senseosity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2545 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-20 15:10:59 +00:00
Jens Ayton
ed6f588046 Reimplemented distance culling for sparks and flashers, and added distance attenuation (i.e., they fade out instead of popping). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2544 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-20 15:04:49 +00:00
Jens Ayton
7fa48675ab Rolled back Windows dependencies for pthreads (no longer used). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2543 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-20 14:22:11 +00:00
Jens Ayton
c9819aee98 Eliminated possibly non-functional pthread_once dependency on Windows (still use it on civilized platforms). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2542 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-20 14:10:52 +00:00
Jens Ayton
ec4aa91753 Spent several hours worrying about the need to deep copy data before async cache flush and the performance implications of doing so, then realised there was no reason that would be necessary. Currently back to async flushing without deep copy, and profiling code. The profiling timer implementation for Windows is untested and may be broken. Also, fixed a nasty bug in OODeepCopy() where empty dictionaries ere turned into sets. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2541 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-20 14:02:55 +00:00
Eric Walch
2ba2b6f213 Now also NPC ships broadcast CARGO_DUMPED. Gave the JS method abandonShip() a true/false returnvalue. And abandoned ships now release their escorts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2540 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-20 12:58:07 +00:00
Nikos Barkas
5bf7e028fe Bringing Oolite Windows up to date: Added required pthread library dll, headers and import lib to project. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2539 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 23:37:38 +00:00
Jens Ayton
4c54a93cfb Cache is now flushed synchronously when quitting. If an async flush is in progress at the time, it is simply allowed to complete. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2538 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 22:21:35 +00:00
Jens Ayton
c988131375 Data cache writes are now asynchronous, for great snappy. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2537 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 22:03:36 +00:00
Jens Ayton
ab8aebe696 Turned OOTextureLoadDispatcher into more general OOAsyncWorkManager. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2536 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 21:47:05 +00:00
Jens Ayton
61055c0583 Added written_by_version key to saved games, for those here's-my-saved-game-but-I'm-not-giving-you-any-actually-useful-information situations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2535 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 21:23:59 +00:00
Jens Ayton
d570d8756f Fixed various warnings, errors and compiler crashes in SDL builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2534 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 21:14:59 +00:00
Jens Ayton
b797df89dc De-uglified OXP verifier's OpenLogFile() for Windows. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2533 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 20:47:05 +00:00