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

1537 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
35d09e3f75 Updated remaining old-style sound code. Afterburner loop fixed to use a single sound file instead of two identical ones. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1736 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-21 20:48:24 +00:00
Nikos Barkas
7947339436 Part three of the fix for conditional equipment addition. I hope this will be the last. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1735 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-18 11:52:30 +00:00
Nikos Barkas
b1011e5e96 Previous fix did not work as expected, reattempting with a hopefully functional one. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1734 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-18 09:47:16 +00:00
Nikos Barkas
1b8301ffc8 Fixed a bug whereby sometimes equipment would not be added to the arsenal during initialization, due to the canAddEquipment check being performed on a partially complete only equipment list. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1733 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-17 07:34:25 +00:00
Nikos Barkas
26584c1f33 Implemented [HeadUpDisplay setReticleTargetSensitive] method. Made reticleTargetSensitive visible to JavaScript as a read/write property. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1732 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-15 08:51:22 +00:00
Nikos Barkas
8a91fa3be7 Implemented the reticle_target_sensitive key in hud.plist. If set to true, selected targets that pass through the center of the reticle cause the targetting box to change color to red. Default is false. Also added a couple of missing break statements in OOJSTimer.m. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1731 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-14 18:36:42 +00:00
cmdrjames
c1b22c284f fix for bounty availability in js 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1730 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-12 20:36:42 +00:00
Nikos Barkas
d731ef1a52 Added the v1.65 code to [UNIVERSE findSystemNumberAtCoords], so that overlapping systems can be selected on the two chart screens. Still not perfect (going to F5 screen will reset the selection), but now travel to such systems is possible. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1729 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-10 12:14:21 +00:00
Jens Ayton
14b36f0f64 Deprecated messy ability to use a list of number arguments as a vector/quaternion literal, in favour of array literals. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1728 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-07 16:12:51 +00:00
Jens Ayton
e10591c31a Renamed JS Vector to Vector3D to avoid namespace issues in JavaScript 2.0. Added bounty property back to JS player. Oversight of player vs. player.ship in built-in scripts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1727 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-07 08:06:08 +00:00
Jens Ayton
ab359ea4af Noticed an interesting jsapi function; now console can take input split across multiple lines. (Input an empty line to cancel.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1726 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-06 08:02:49 +00:00
Nikos Barkas
a9a0c88f82 Fixed a small copy/paste error of the previous commit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1725 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-04 11:39:36 +00:00
Jens Ayton
4ca8806312 Bunch of cleanup, mostly tabs vs. spaces (yes, I'm silly). Reformatted AIs for consistency, and removed do-nothing handlers. Deleted old sky code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1724 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-03 15:44:57 +00:00
cmdrjames
62c3168d0f Fix a stupid mistake making min_fuel a variable instead of a constant. Also some changes for intra-group fighting (accidental damage less likely to cause weird effects). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1723 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-03 15:36:45 +00:00
Jens Ayton
585a1bb940 Fix for OS X-specific build issues (recommend deleting build folder and rebuilding all). Missiles now respond to ECM during initial launch. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1722 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-03 13:25:30 +00:00
cmdrjames
19e276697c make the amount of fuel required for afterburners to fire consistent (make it 1, as this is what it is set to in most places currently) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1721 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-03 10:28:50 +00:00
Jens Ayton
dee4989151 Catch exceptions when reading cache and rebuild instead of crashing. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1720 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-02 20:49:23 +00:00
cmdrjames
ff1877412e make hard heads same as normal misiles for launch phase 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1719 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-02 20:45:55 +00:00
Jens Ayton
e92acd10cc Better support for cluster missiles - submunitions can now inherit their parent's target (using is_submunition shipdata.plist property). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1718 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-02 20:37:58 +00:00
cmdrjames
89d837daaf reduce deprecation warnings by changing player.docked to player.ship.docked 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1717 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-02 20:16:22 +00:00
Jens Ayton
87d724fc8a Fix for bug in prefix script adding player compatibility aliases to all objects. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1716 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-02 19:19:01 +00:00
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