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

2030 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jens Ayton
a16cdce3d3 Changed splash_screen preference to splash-screen for consistency - at least, consistency with other preferences. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2532 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 20:35:36 +00:00
Jens Ayton
30beac1d47 Updated prefs screen to reflect Groolite disabled status. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2531 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 20:23:08 +00:00
Jens Ayton
dafcec17b1 Here's a thought: instead of asking libpng for data in the wrong order and then swapping it, how about asking for data in the right order? It's a crazy idea, but it might just work. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2530 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 18:17:38 +00:00
Jens Ayton
657d4556a8 Updating Xcode project to keep up with GNUmakefile for once. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2529 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 18:09:51 +00:00
Jens Ayton
4f3cca5e23 Fixed and/or commented som static analysis issues. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2528 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 17:55:40 +00:00
Jens Ayton
c090222c17 Abstracted away testing of different NSNumber types. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2527 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 17:52:38 +00:00
Jens Ayton
aadc6fb51e Debug code to help fix OOMesh caching issues. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2526 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 17:51:09 +00:00
Jens Ayton
1fbd48f913 Added preference to disable Groolite. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2525 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 17:48:35 +00:00
Jens Ayton
43248e1252 Fixed Mac sound clipping reporting. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2524 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 17:48:07 +00:00
Marc
ebaf4e4bed - more generic fix for removeEquipment. player.ship.removeEquipment('EQ_FUEL_SCOOPS') now works whether the scoops are damaged or not. 
- can't damage an already damaged item any more ( '_DAMAGED_DAMAGED' equipment ? )
- fix: awarding 'EQ_MISSILE_REMOVAL' now removes all missiles.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2523 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 14:18:24 +00:00
Nikos Barkas
55c6dcc6fb Enabled removal of damaged items in ShipEntity's -removeEquipmentItem method. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2521 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 13:14:13 +00:00
Eric Walch
8a03448848 Corrected C&P value for ENERGY_HIGH in "checkEnergy" 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2520 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 12:41:10 +00:00
Marc
239d132e3b - yet another equipment screen tweak - corrected 2 other minor interface glitches 
- fixed 'subentities disagreeing with parent' bug (when selling ships with subentities)

- windows change: -verify-oxp now gives proper feedback when finished.(thanks Eric)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2519 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 12:17:27 +00:00
Eric Walch
19ad69a4f3 Added AI commands: setCoordinatesFromPosition and checkEnergy. Used these commands in pirateAI.plist to send pirates back to their original position after a fight so they keep together as a group. 
Player now sends "CARGO_DUMPED" to all ships in range. Pirates with cargo room can now react on this.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2518 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 10:12:54 +00:00
Nikos Barkas
86dca800c9 Fixed broken build on Linux. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2517 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-18 17:24:22 +00:00
Marc
78077e65c2 - splash screen options part 2: added the -splash override for completeness, minor code cleanup. 
- corrected graphic glitch in load/save screen.

- ported splash screen options / fix to maintenance.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2513 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-18 11:47:47 +00:00
Nikos Barkas
99ec2baf41 Made display of splash screen an option for SDL builds. It can be set either in the preferences file with the key 'splash_screen=yes/no' or using the command line option -nosplash, if no display is desired. The command line option, when it exists, overrides the preferences file setting. This will enable the game to run well also in the rare cases where faulty drivers cause switch to software rendering with splash screen shown. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2512 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-18 10:22:17 +00:00
getafix
dea178f19b Added header import to fix htonl implicit declaration. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2510 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-17 10:33:04 +00:00
Marc
71a6fb6822 - More gui related fun with the equipment purchase screen. It should now be clear that trying to purchase the same weapon for a particular weapon mounting as the one already there will not do anything. Various code tweaks needed to allow for that interface change. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2509 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-16 04:07:11 +00:00
Marc
09f4cc02e7 * equipment purchase screen part 4: 
- Name of mounted weapons shown while purchasing new weapons.
  - 3 new translation strings added to the equipment purchase section.
* beaten some of the present GUI 'code' into submission to get the above to work.
* repositioned the background for novae system info screen.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2508 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-16 01:10:49 +00:00
Jens Ayton
3f3a843d2b Modified texture loading for a) OpenGL 1.1 compatibility on little-endian systems and b) one less memory copy under OS X. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2507 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-15 21:13:38 +00:00
Eric Walch
26669c1961 Escorts are now also added to moms group when mom was a group member. Affects carrier escorts and wolfpack escorts. (Temporary: Added ships on approach to the stations entity dump). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2506 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-15 15:23:07 +00:00
Marc
5e111e4f25 - buying equipment screen part 3 - even if the last equipment purchased is gone from the list, oolite will highlight the line it would have appeared on, in a similar way to 1.65. Selecting a weapon's mounting is now implemented in a cleaner looking way. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2505 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-15 11:21:35 +00:00
Marc
323c69feb2 - equipment purchase part II, keeps the last selected weapon highlighted, whether purchased or purchase aborted. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2504 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-14 06:42:37 +00:00
Marc
6517563d99 - added the new shipdata keys to the list of known keys in the verifier. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2503 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-13 21:56:08 +00:00
Marc
ee136c29f1 - Oops! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2502 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-13 21:35:11 +00:00
Marc
cd8b7791ee - fix: if hud is npt specified inside ship entry, use standard hud. 
- fix: switching restricted/unrestricted from savegame does not play the start game music anymore.
- fix: if an item is still for sale after purchasing it, it'll still be selected. (berlios bug #016267)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2501 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-13 21:06:26 +00:00
Jens Ayton
be1e35eae0 Code to avoid duplicate entries in target_memory now actually does. (Thanks to snow via IRC.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2500 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-13 19:51:43 +00:00
Nikos Barkas
d5e20ec2ab Fixed buggy mouse control on SDL builds (note: grabbing of windows not considered at this time). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2498 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-13 18:51:18 +00:00
Marc
baa5430180 - got xcode to compile with the renamed javascript-errors.plist 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2497 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-13 16:25:48 +00:00
Jens Ayton
4d0bde299b At Kaks's suggestion, reenabled adaptive octree depth to test whether it works after various collision fixes. Be on the lookout for collision testiong problems, especially being able to see inside large ships when ramming them. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2496 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-13 16:15:50 +00:00
Jens Ayton
6769ee509f Renamed oolite-javascript-errors.plist to javascript-errors.plist for internal consistency (config files aren't subject to namespace issues). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2495 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-13 15:42:34 +00:00
Marc
fabfc9b391 - F7 screen now shows the nova sun for systems destroyed by novae, planets everywhere else. 
- moving from screen to screen now always resets the background image.
- fixed xcode compile warning.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2494 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-13 14:51:21 +00:00
Eric Walch
ccfce445a3 Fixed missing a TARGET_LOST message in hardMissileAI leading to not reaction on cloaking. Instead added a deliberate short pause on missile and hardMissele explosions. It won't detonate anymore during that pause, but still can give scrap damage when colliding with missile. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2493 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-13 14:18:43 +00:00
Jens Ayton
437ee5e3c3 Further improved error reporting for legacy scripts - in particular, bad conditions are printed in full. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2492 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-13 12:45:06 +00:00
Marc
3cb2045315 - many nova bugfixes, should now be more difficult to break the nova mission. Sun flares up at random intervals inside the nova system. 
More testing required.
- systemInfo float values are now properly treated as numbers.
- minor code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2491 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-13 01:25:18 +00:00
Jens Ayton
d28c6f9828 AI dropMessages: now takes a comma-separated string. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2490 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-12 23:43:46 +00:00
Jens Ayton
7d17118510 Fix for %N using Ranrot() instead of gen_rnd_number() to modify length probabilities, thus making it produce inconsistent results even when system seed is the same. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2489 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-12 23:39:41 +00:00
Jens Ayton
4631edd2f0 Save entity_personality so player ship looks the same across sessions when shaders use it. Comms log is now restored on load (sans formatting) and at most 15 lines are saved (instead of up to 125). Removed ship.escortSetup.wtf log message - thought that couldn't happen, turns out it can. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2488 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-12 23:17:16 +00:00
Jens Ayton
e085c50004 More ai.load.failed.unknownAI fun: set AI's owner before its state machine to get clearer diagnostics. This was previously done when the ship was added to the universe - somewhat oddly - so there's a possibility this will break something. Also changed unassigned AI name to <none>. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2487 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-12 22:16:13 +00:00
Nikos Barkas
717de3c0e3 New JavaScript method in the PlayerShip class: queryCargo. Can take zero or one parameters (nore than one are ignored). Returns the array of cargo loaded (name, tonnage and units) if no parameter is given, or the quantity of the cargo item which name is passed as parameter. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2486 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-12 21:47:32 +00:00
Jens Ayton
adc87a348d Fix for logging of bad AI switches -- http://aegidian.org/bb/viewtopic.php?t=6677 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2485 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-12 21:35:22 +00:00