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

1612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikos Barkas
b99dc5cc56 Added Eric's proposed playerBoughtEquipment script event handler. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1763 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-17 14:27:22 +00:00
Nikos Barkas
cea5c716dd Fixed textures related crash (not sure if this fix is the best possible, as it is mostly a revert of some code entered at revision 1759, but since it does not seem to crash on modern hardware anymore, it will have to do for now. Testing will be required). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1762 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-13 14:50:58 +00:00
Nikos Barkas
e06aa2a400 Applied a slightly modified version of CmdrLUke's and Cmdr Wyvern's code for joystick deadzone control. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1761 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-07 11:44:23 +00:00
Nikos Barkas
2c8bb802cb Increased default joystick deadzone from 0.02 to 0.05 in hope of achieving slightly better joystick response. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1760 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-05 14:11:10 +00:00
Jens Ayton
c2349842e3 Fixed build with NO_SHADERS defined, and other fixes for Irix. Also fixed some faulty logic confusing textures and materials. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1759 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-02 17:11:07 +00:00
Jens Ayton
5458fc508c Improved error messages for JS addShips commands when passing insufficient parameters. Four static analysis diagnostics fixed: one real one-time memory leak, one false alarm about a memory leak due to silly memory managment, a potential uninitialized variable in key config set-up, and one bug in the clang static analyzer fixed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1758 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-02 00:41:41 +00:00
Jens Ayton
8b5d9523c0 Some missing shipdata verifier things. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1757 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-01 19:15:52 +00:00
Jens Ayton
3f07f2230c Fiddling with script converter, and bunch of scripting changes as a result: added player.rank, player.legalStatus, system.countShipsWithPrimaryRole(), system.pseudoRandomNumber, system.pseudoRandom100, system.pseudoRandom256; renamed Ship.shipDescription to Ship.name and Ship.shipDisplayName to Ship.displayName. Also, JS console script now strips out trailing line breaks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1755 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-01 18:21:21 +00:00
Jens Ayton
705c2aa739 Cleanup and tweakage. Assigning null to a mission variable in JS now deletes it. incomplete JS console lines that are buffered rather than executed are prefixed with _ instead of >. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1753 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-31 18:49:19 +00:00
Nikos Barkas
513bfaccef Reverted experimental code from revision 1748, due to GCC 3.4.2 not being able to handle native ObjC exception syntax. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1752 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-30 16:37:15 +00:00
Jens Ayton
8d71d62b2d Fixed JS system.shipsWithPrimaryRole() as in r1751. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1751 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-30 02:21:49 +00:00
Jens Ayton
379bd91c6d Fixed JS system.filteredEntities(), entitiesWithScanClass() and shipsWithRole() (all were completely non-functional). Added groovy new entity-finding console macros: :nearest, :tnearest, :find, :findS, :target (see debugConfig.plist). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1750 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-30 01:43:00 +00:00
Jens Ayton
c3da65606f Fixed some OXP verifier issues, twiddled OOCocoa.h so clang static analysis works again. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1749 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-29 20:44:06 +00:00
Jens Ayton
28727321da Experimentally checking in some native exception syntax to see if it breaks anyone's build. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1748 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-29 20:26:15 +00:00
Nikos Barkas
9c5d0b418e Fixed a small language problem with MinGW. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1747 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-26 06:01:50 +00:00
cmdrjames
03e2e67761 [ Bug #13945 ] escorts don't have turrets in 1.71.2 
There was a look which didn't stop when it got to the ship which owns the subentity, and went up the chain to the group leader.  I have also changed docking behaviour, as during my testing I found that anyone docking would ignore me when I attacked it.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1746 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-25 11:14:53 +00:00
cmdrjames
bedf7cbecc Collision detections were previously set for both ships that were close, but were tested for independently. This gave the impression that maybe only one party would be alerted. I think there is still a problem though, I think ships will normally not avoid collisions with carriers (as they are stations) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1745 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-25 09:43:22 +00:00
cmdrjames
75806ac5e3 Simple fix for traders crashing after launch. Discussed here: http://www.aegidian.org/bb/viewtopic.php?t=4906&highlight= 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1744 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-25 09:27:55 +00:00
Jens Ayton
4d59905fc8 Fix for JS Entity.isValid not working for invalid entities. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1743 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-24 22:32:11 +00:00
Jens Ayton
5307011661 More happy loose end fun. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1742 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-24 22:30:11 +00:00
Jens Ayton
86859ce8e9 Cleaning up my mess. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1741 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-24 22:13:59 +00:00
Jens Ayton
1586904cb3 Cleaning up my mess. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1740 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-24 22:12:53 +00:00
Jens Ayton
61e4d9f989 New SDL sound code. Architecturally more similar to Mac code; main feature is that the same sound can be playing on more than one channel at once. Written without test builds, built almost without fixes and worked straight away, so there are almost certainly lurking bugs waiting to bite. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1739 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-24 21:59:52 +00:00
Jens Ayton
02a8e76d59 Fix for locale issues under Windows. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1738 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-23 14:49:07 +00:00
Jens Ayton
2e5fbccf83 Yet more legacy sound code stripped out for the great interface simplicity win. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1737 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-22 14:43:25 +00:00
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