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

567 Commits

Author SHA1 Message Date
Jens Ayton
a106f4055f Shader synthesizer: light maps can now be controlled by bindings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4793 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-02-26 17:08:49 +00:00
Jens Ayton
95b6e5f175 Fixed stringification of null and undefined log message classes in JS logging. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4788 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-02-21 20:43:57 +00:00
Jens Ayton
d623cef04d [Mac] Fixes for Xcode 4.3 compatibility. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4786 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-02-17 00:00:39 +00:00
Jens Ayton
73cd4d321a Work on shader synthesizer integration. Doesn't work properly yet. Controlled by USE_NEW_SHADER_SYNTHESIZER macro (currently off). When on, adds new secret preference: dump-synthesized-shaders (boolean, default false; writes synthesized shaders and material plists to logs directory, no effect in deployment builds). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4763 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-02-06 23:01:06 +00:00
Jens Ayton
9bbc0e8176 [Mac] Fewer nib/xib-related warnings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4759 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-02-03 22:33:03 +00:00
Jens Ayton
4365c0c9ad Removed some obsolete optimization flags. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4758 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-02-03 09:36:03 +00:00
Jens Ayton
68a9515e24 Cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4753 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-29 22:36:29 +00:00
Jens Ayton
d5d10f44f3 Reenabled heavy GL checking in Mac debug builds, I think that got lost in the project upgrade. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4745 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-20 23:03:48 +00:00
Jens Ayton
bc7369e1a8 Cosmetic changes to project settings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4722 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:38:30 +00:00
Jens Ayton
c8d7e46a44 Removed a bunch of PowerPC arithmetic stuff that probably wasn't helping much anyway. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4719 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:16:08 +00:00
Jens Ayton
5921ace94f Repeated a bunch of configuration changes for Xcode 4 that somehow got lost in a git rebase. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4714 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:15:17 +00:00
Jens Ayton
d15e4988ad Added Xcode 4 schemes for Oolite's three configurations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4713 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:15:04 +00:00
Jens Ayton
86e3077e96 Merged Leopard support bundle into game. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4709 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:14:31 +00:00
Jens Ayton
b3e2d8ccd0 Mac build setting changes and code compatibility fixes: 
SDK is now 10.6.
Deployment target is now 10.5.
PowerPC support disabled.
Compatibility wrappers added to NSFileManager.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4705 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:13:56 +00:00
Jens Ayton
af3e049cbc Fixes to build with Xcode 3.2.6 under Mac OS X 10.7. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4584 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-07-21 12:30:48 +00:00
Jens Ayton
fa23e7bc11 Set max_missiles to 4 for NPC cobra3. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4454 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-10 20:53:53 +00:00
Jens Ayton
67dd32dc17 [Mac] Removed custom configuration for libpng; too much bother for a 133 KiB saving. Fixes bug #17968. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4451 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-10 17:27:18 +00:00
Jens Ayton
f15a119569 Mac build now uses PDF version of Read Me. RTFD version is gone. (Incidentally, has anyone noticed that the font size in the PDF is insanely, illegibly small? I suspect people want to be able to read it without printing it on A3 paper.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4444 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-08 16:14:54 +00:00
Jens Ayton
1e08cd022f Use recommended keys for fallback material. Removed some new-planets stuff that isn't used. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4363 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-16 16:44:29 +00:00
Jens Ayton
c6ed8d2694 Lasers now end at their impact point. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4343 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-13 11:39:25 +00:00
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