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

1516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
6ba0e85f1b requires_equipment now requires all equipment, new requires_any_equipment requires any equipment in list. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1714 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-29 12:27:04 +00:00
Jens Ayton
369f588d08 Raised joystick limits. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1712 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-29 09:41:18 +00:00
Jens Ayton
fcc47dace6 Tweaked logic for "avoid shrinking" texture flag, and fixed a crashing bug in texture scaling. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1711 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-28 22:56:25 +00:00
Jens Ayton
3315272c00 Split JS Player object into Player and PlayerShip. Made curved sides of arc-detail smooth. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1710 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-28 17:34:37 +00:00
Nikos Barkas
ca392b105c Log joystick handler initialization as per Oolite standard. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1709 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-28 11:39:40 +00:00
Jens Ayton
f2fae7fef0 Fixed 64-bit little-endian mip-map generation bug and updated associated test code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1708 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-27 17:34:36 +00:00
Jens Ayton
d1b8371864 Builds (without warnings) under 64-bit Ubuntu with GNUstep-base 1.12. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1707 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-27 15:16:33 +00:00
Jens Ayton
d21f48e20a Fix for NSInteger/NSUInteger under GNUstep. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1706 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-27 12:11:12 +00:00
Jens Ayton
175ff0c484 Upgraded OS X sound system to libVorbis 1.2.0. 64-bit build now functional, with texture glitch (almost certainly in mipmap generation). Looking forward to interesting subtle bugs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1705 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-26 20:16:46 +00:00
Jens Ayton
3d700aaa6e Changes to make Oolite compile in 64-bit for OS X. Does not link yet due to library issues. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1704 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-26 17:54:29 +00:00
Nikos Barkas
940864de42 Saved nightly build from failure ;-) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1703 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-25 17:17:09 +00:00
Jens Ayton
f16c5b3629 Various minor fixes I've forgotten about. Much too little work on camera system. JS shipLaunchedEscapePod called (for player) before resetting legal status and trumbles. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1701 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-25 13:18:56 +00:00
Nikos Barkas
8f745e8978 Added the ship dictionary key hyperspace_motor_spin_time, which allows variable lengths of hyperspace and/or intergalactic jump countdowns. Defaults to 15.0 seconds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1697 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-19 14:03:05 +00:00
Jens Ayton
4d7443c17c Fixed two naughty, naughty mutations of collections being enumerated thanks to run-time warnings generated when linking to OS X 10.5 SDK. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1696 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-18 18:45:30 +00:00
Jens Ayton
0b7f46ef3c Fixed invalid use of return inside NS_DURING block (must use NS_VALUERETURN/NS_VOIDRETURN). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1695 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-18 14:39:31 +00:00
cmdrjames
4b1a5f39f0 Prevent an unusual (but possible) case where it is possible to have an inifinite amount of equipment added to a ship in the shipyard. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1694 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-17 22:04:44 +00:00
Jens Ayton
d5fad77a34 Added JS Ship properties cargoSpaceUsed, availableCargoSpace, passengerCount and passengerCapacity; renamed maxCargo to cargoCapacity (and added compatibility getter in prefix script). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1693 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-15 14:50:25 +00:00
Jens Ayton
51748cae1c Fixed damaged equipment handling. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1692 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-13 13:18:03 +00:00
Jens Ayton
fb3b2b7ebe Shipyard code now uses OOShipRegistry. Simplified some code by using OOEquipmentItem instead of fiddling with arrays; should do more of that. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1691 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-11 20:25:09 +00:00
Jens Ayton
717e72ffae New compiler, new warnings about problems that don't really exist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1690 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-10 21:11:28 +00:00
Jens Ayton
a8b39c4c9a Refactored equipment restriction tests, and apply them in addEquipmentItem: as well as the shopping screen. Added new class representing equipment types, currently only used in these tests. Added new equipment restrictions: requires_free_passenger_berth, requires_full_fuel, requires_non_full_fuel. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1689 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-10 20:45:02 +00:00
Jens Ayton
53e5244d68 Fixes for patrol AIs (bug #14160). Marked Naval Energy Unit incompatible with standard unit. Check docked status in mission scripts for compatibility with scripts that force immediate launch. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1686 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-08 23:15:33 +00:00
Jens Ayton
635d51d98b Fixes for bugs revealed by static analysis. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1685 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-04 18:48:57 +00:00
Jens Ayton
f2c07b5ee7 Fixed a few leaks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1684 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-04 16:01:26 +00:00
cmdrjames
3977c23f1a Bug: 014011 Carriers should have groupID set. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1683 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-23 19:57:28 +00:00
cmdrjames
2e9860dde5 clean up some float (and double) literals 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1682 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-21 10:31:47 +00:00
Nikos Barkas
a4dd5f4043 Modified the Thargoid Plans mission script to remove the standard energy unit - damaged or not - before awarding the naval one. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1680 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-19 15:47:12 +00:00
Nikos Barkas
bfe691b517 Added the missing has_npc_traffic key to the known station keys in verifyOXP.plist 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1678 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-14 07:46:16 +00:00
Nikos Barkas
fea50ac4b7 Added player.contractReputation and player.passengerReputation visibility to the JavaScript player class. Also added the JS methods player.increaseContractReputation(), player.decreasePlayerReputation(), player.increasePassengerReputation() and player.decreasePassengerReputation(). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1677 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-10 15:53:14 +00:00
cmdrjames
ec1d7f45bd Explicit float literal usage 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1676 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-08 21:27:55 +00:00
Nikos Barkas
7212c8a461 Attempt to fix problem with GNUmakefile.postamble not being able to complete the build process on older GNUstep distributions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1675 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-06 13:49:45 +00:00
Jens Ayton
9c9c4b53a0 * Ships with unresolvable like_ships references are now removed as intended. 
* Filtering out ships without roles or models now happens after like_ships relationships are applied, so incomplete ships can be used as templates. Added is_template property to explicitly exclude ships at this stage without error messages.

PAGroove_Stations now works properly.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1674 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-04 19:23:10 +00:00
Jens Ayton
a95a581ac9 Improved fallback behaviour when failing to generate a station. Fixed a "Ship foo was not set up from dictionary" error when failing to create stations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1673 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-04 18:16:50 +00:00
Jens Ayton
ea6fe98212 Avoid “cannot iterate into directory” messages for nonexistent AddOns directories. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1672 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-04 17:36:51 +00:00
Nikos Barkas
baf76050ff Small correction in the GNUmakefile. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1671 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-03 10:58:23 +00:00
Jens Ayton
20e62f3151 Removed junk lines from nova script. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1670 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-03 10:21:34 +00:00
Jens Ayton
db1a95e102 Makefile update for r1668. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1669 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-03 10:19:19 +00:00
Jens Ayton
6110052f8a Added JS system.info property and System.infoForSystem() function to replace setPlanetInfo: and setSpecificPlanetInfo:. Currently these are write-only, should be read/write. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1668 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-03 10:16:40 +00:00
Nikos Barkas
759da63a60 Clean up nearby destinations cached info if the WITCHSPACE UNAVAILABLE message is sent to the AI. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1667 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-02 10:06:15 +00:00
Nikos Barkas
451297e529 Improved implementation of fuzzy booleans. As a result, wrecks work again now. Cached result of [UNIVERSE nearbyDestinationsWithinRange] in -performHyperSpaceExitReplace: because looking for nearby systems in every frame is very expensive. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1665 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-02 08:20:47 +00:00
cmdrjames
1c5949869a Non functional changes to float and double (and a few other types) to make it clearer what is going on with casts and coercion. Most ship entity math is done with floats, so prefer floats over doubles 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1664 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-31 11:25:06 +00:00
cmdrjames
189e8e7eaa Non functional changes to float and double (and a few other types) to make it clearer what is going on with casts and coercion. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1663 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-31 11:20:18 +00:00
Nikos Barkas
1b7b8ea5c8 Player ship turrets are now fire-enabled. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1662 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-31 07:25:54 +00:00
Jens Ayton
a11ce38786 Made JS player.orientation work properly. Fixed some extra-niggly warnings. Made various JS system properties return placeholder values in interstellar space. Added -[Universe inInterstellarSpace] method, and made -[Universe currentSystemData] return placeholder values in interstellar space. Two new localizable strings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1661 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-29 19:12:31 +00:00
Nikos Barkas
08ebc6dd29 One more string farmed out. Apparently they will never end. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1659 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-29 12:09:37 +00:00
Nikos Barkas
d97720b1a7 Even more hardcoded strings found and externalized. Are they ever going to end? 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1658 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-29 10:55:00 +00:00
Nikos Barkas
b81d73ffd7 Fixed copy/paste error that resulted in hyperspace start and hyperspace abort sounds being the same. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1655 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-25 16:44:29 +00:00
Nikos Barkas
c572512be2 Fixed overflow when buying ship in the shipyard. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1654 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-25 10:04:10 +00:00
Nikos Barkas
c6302e5e77 Fixed a small error that would prevent setGalacticHyperspaceBehaviour() from functioning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1653 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-24 10:00:35 +00:00
Jens Ayton
332dfc6a1b More annoying casts to placate the stupidity of gnu-gcc. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1652 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-23 21:45:27 +00:00