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

497 Commits

Author SHA1 Message Date
Jens Ayton
86707d5cd7 Sorted some JS property/method declarations for easier comparison with docs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4340 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-12 19:34:41 +00:00
Jens Ayton
c39d9f285f JS audit: OOJSPlayer. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4303 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-11 17:24:11 +00:00
Jens Ayton
27bac3ca61 JS audit: OOJSShip. Moved addPassenger() and awardContract() to PlayerShip where they belong. Also made them not print warnings when conditions aren't fulfilled, because returning an error flag _and_ logging a warning is an unhelpful combination. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4292 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-11 01:13:21 +00:00
Jens Ayton
435c218d6e JS audit: OOJSEntity. Also cleaned up some redundant [entity isPlanet] && ![entity isSun] checks - -[OOSunEntity isPlanet] is false. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4289 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-10 23:47:42 +00:00
Jens Ayton
1cf9e115fb [credits_number] no longer localized for legacy scripts, as it might be used for arithmetic. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4286 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-10 21:10:34 +00:00
Jens Ayton
c33a8fbc73 Updated icon and related files. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4275 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-09 18:57:34 +00:00
Jens Ayton
d1db0f0f64 JS formatInteger() now punts on *very* large values correctly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4273 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-08 22:45:30 +00:00
Jens Ayton
54d5c4b350 Breakpattern entity reform. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4266 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-08 19:09:22 +00:00
Jens Ayton
b0eb0f1676 * OOParticleSystem now uses the "new" particle blur texture for better 
blending. blur256.png is no longer used for anything.
* The particle effect textures are now preloaded to avoid stutter.
* The sound preloader is now actually invoked. (This appears to have been an
  oversight; I couldn't find a reference to it being deliberately disabled.)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4248 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-06 09:23:16 +00:00
Jens Ayton
a61d8db295 Turned remaining ParticleEntity flavours into OOParticleSystem, no longer based on OOSelfDrawingEntity. Only remaining OOSelfDrawingEntity is now OOBreakPatternEntity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4244 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-05 21:03:10 +00:00
Jens Ayton
342fbcae27 More ParticleEntity breakupage. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4241 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-05 18:58:34 +00:00
Jens Ayton
badd140260 Gave quirium cascades an entity class of their very own. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4239 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-05 17:35:50 +00:00
Jens Ayton
2ad5277d7b Renamed confusingly-named RingEntity to OOBreakPatternEntity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4237 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-05 15:38:02 +00:00
Jens Ayton
ee0dbc2afd * Ship damage is reported to scripts with event shipTakingDamage(amount, 
fromEntity, damageType). This is sent after decrementing energy and before
  responding to death, so it can be used to resurrect if ship.energy <= 0.
  Damage may be zero (for player with intact shields). (Feature request #5077)
* Player now correctly uses damage type "cascade weapon" instead of "energy
  damage" when appropriate.
* Player now cascades when hit by a q-mine.
* Player now reports shipEnergyIsLow as appropriate when taking scrape damage.
* Dead ships once again have status STATUS_DEAD during shipDied()/
  shipKilledOther() message pairs.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4235 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-05 13:42:36 +00:00
Jens Ayton
b6b00ab89a Cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4223 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-04 12:53:25 +00:00
Jens Ayton
4ade099cec Reduced laser memory usage by a factor of 850. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4207 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-31 22:26:06 +00:00
Jens Ayton
a07e74113e Save half a meg per planet (and atmosphere) instance by hard-coding base geometry instead of subclassing OOSelfDrawingEntity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4204 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-31 20:59:44 +00:00
Jens Ayton
5e4d3e5695 Purged OO_NEW_JS. Now would be a good time for comprehensive test builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4197 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-30 17:27:40 +00:00
Jens Ayton
2fd63cfc12 Fixed JS ship properties that weren't updated properly in r4169. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4177 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-29 17:17:48 +00:00
Jens Ayton
fcb033d3ef Added Entity.prototype.dumpState() method when using debug console. [Mac] Debug.OXP is once again build by Build All target. Don't know what happened there. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4175 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-29 15:18:51 +00:00
Jens Ayton
adec267577 Fixed JS missionVariable enumerable, and made SystemInfo objects enumerable (so :d system.info works, for example). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4163 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-27 18:50:21 +00:00
Jens Ayton
19f05aa8f2 Changed assertion on targeting a wormhole without a wormhole scanner to soft fallback behaviour, after a report in the forum. Possibly a recycled entity ID? Memo: entity IDs are evil. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4160 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-27 00:29:27 +00:00
Jens Ayton
f987fd0829 [Mac] Added Sparkle update support, finally. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4157 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-25 23:31:19 +00:00
Jens Ayton
9c99848716 More JS event handling reform. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4147 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-24 20:00:49 +00:00
Jens Ayton
ade28ce185 Work on reducing the number of object translations involved in script dispatch. Also, hid every single JS_BeginRequest()/JS_EndRequest() pair inside OOJavaScriptEngine by baking them into acquireContext and releaseContext:. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4140 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-24 16:28:46 +00:00
Jens Ayton
0aba4b0971 Removed support for changedScriptHandlers.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4130 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-23 19:39:03 +00:00
Jens Ayton
4ef5f4a8b0 New JS method global.defaultFont.measureString(). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4129 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-23 18:24:52 +00:00
Jens Ayton
027dbea907 Renamed OpenGLSprite to OOTextureSprite for consistency. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4122 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-23 13:53:52 +00:00
Jens Ayton
8bf132296c Support for Mac touchpad release events, and better windowed mouse control. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4117 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-22 14:14:46 +00:00
Jens Ayton
f99dd38018 Escort positions are now cached. Fixed copying of scripts under OS X. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4116 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-22 13:52:38 +00:00
Jens Ayton
28152d9031 Added mission screen parameter spinShip and mission property displayModel. Also fixed bug where non-JS-visible ships turned up in system.allShips. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4101 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-20 15:07:43 +00:00
Jens Ayton
968adda264 [Mac] Added Snow Leopard feature bundle. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4099 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-19 15:14:07 +00:00
Jens Ayton
3f1e7ae3b5 More futzing around with enums and string constants. Also, setting player.ship properties to invalid values now throws an exception rather than halting script; this should be extended to other classes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4095 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-18 19:20:50 +00:00
Jens Ayton
7f2ed7eec1 Rearranging headers to reduce interdependence. OOJavaScriptEngine.h doesn't include all profile management stuff (and has some big blocks of preprocessor hacks moved into new files, OOJSEngineNativeWrappers.h and OOJSEngineTransitionHelpers.h). Started breaking up ill-concieved OOTypes.h (entirely my fault) and putting relevant declarations in more sensible places. To support this, some OOConstToString functions are now declared in Entity.h and ShipEntity.h, and have been renamed while I'm at it. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4088 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-18 13:39:12 +00:00
Jens Ayton
96c9b7dbe6 More macro madness! JS scanClass and status strings are now interned singletons, for efficiency and also simpler callbacks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4073 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-15 17:49:14 +00:00
Jens Ayton
a804bf350f Moved some enum definitions into separate table files, to avoid potentially bug-inducing redundancy (because I'm going to add more of that). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4072 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-15 16:14:34 +00:00
Jens Ayton
676ed097e9 Cleaned up JS debug helpers, made them easier to use and added some basic documentation. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4071 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-15 14:25:49 +00:00
Jens Ayton
56f5e760ce Implemented frame callbacks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4035 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-08 17:03:04 +00:00
Jens Ayton
7067036207 Compatibility fixes for libpng 1.5.0, and some general libpng usage fixes. Didn't update to 1.5.0 for Mac because it's buggy and spews a bunch of spurious warnings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4030 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-07 15:13:58 +00:00
Jens Ayton
607a842dd8 [Mac] Libpng now gets its own Xcode project rather than skulking around in the main one. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4029 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-07 13:59:33 +00:00
Jens Ayton
e6e4c0e3d7 WHAT! is your quest?" 
"To make building Oolite under Mac OS X a simple, one-shot affair."
"WHAT! is the point?"
"Well, I don't know that. ... Aaaaaargh!"

The debug console split view is now set up programatically, obviating the need to muck about with the RBSplitView IB plug-in.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4026 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-07 01:41:36 +00:00
Jens Ayton
ae8383fe33 [Mac] Dock tile plug-in is now built by Build All config in main project, so Build All now requires Snow Leopard. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4024 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-07 00:20:32 +00:00
Jens Ayton
6e515e60ed Big renaming of JavaScript helpers for internal consistency and clarity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4004 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-05 12:58:27 +00:00
Jens Ayton
01b4f5a6d7 Fixed Mac deployment build, and some other fiddling with export lists. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4002 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-04 19:58:03 +00:00
Jens Ayton
473e4e5c5e Mac startup messages now reflect reality, and are more fine-grained in debug builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3976 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-03 17:25:11 +00:00
Jens Ayton
71793e8ef8 Removed Mac oldjs project and associated bits & BLOBs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3949 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-01 16:13:56 +00:00
Jens Ayton
08654dcef0 Xcode project cleanup. Build All target now works properly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3931 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-30 23:01:15 +00:00
Jens Ayton
416c5c1498 Switching to newjs as Mac OS X default. ...and in with the new. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3930 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-30 22:37:18 +00:00
Jens Ayton
8bb9caad32 Switching to newjs as Mac OS X default. Out with the old (temporarily keeping it around for easy reference)... 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3929 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-30 22:35:57 +00:00
Jens Ayton
3af03a2988 Fixed 32-bit Mac debug builds, which someone had sabotaged. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3905 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-26 11:14:40 +00:00