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

4550 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
5bf9884011 Cache legacy script method SELs in string expander because hey, why not? 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5401 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-06 19:09:13 +00:00
Jens Ayton
8534333eac Always include Target: line in ship state dumps to reduce risk of confusion. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5400 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-06 18:45:22 +00:00
Jens Ayton
4f80e846f1 String expander JS warnings are now suppressed when the corresponding log message class is disabled. Oolite-defined JS warnings no longer have 'error' in their log message class. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5399 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-06 18:04:11 +00:00
Jens Ayton
546ac08df5 Fix build with GCC 4.6. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5398 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-06 10:51:31 +00:00
Jens Ayton
64997626fd Enabled new, safer prototypes for ObjC runtime functions when building against 10.8 SDK (currently not the default). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5397 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-06 08:52:12 +00:00
Jens Ayton
a64d2ee6b5 Minor cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5396 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-05 20:58:31 +00:00
Jens Ayton
334fd0a5ac Cleaned up string expansion usage errors (not tied to rewrite). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5395 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-05 20:48:42 +00:00
Jens Ayton
ae709384c0 Initial implementation of new string expander, as per 
http://www.aegidian.org/bb/viewtopic.php?f=4&t=12615

Currently, it's shimmed into the old code to enable easier rollback. I have a
local branch where it's better integrated and will check that in when any
obvious kinks have been worked out.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5394 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-05 20:34:14 +00:00
Jens Ayton
c16dbd92b5 Cleanup: removed a bunch of unused macros. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5393 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-05 13:45:27 +00:00
Jens Ayton
5f518f0c5f Fix bug where callObjC() missclassified methods taking an object and returning an object. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5392 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-02 21:44:43 +00:00
Chris Morris
aa15e3e1bc Lasers: worsen aim a bit to compensate for beam rate of fire 
Parcels: fix contract time calculation, increase effect of reputation on price


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5391 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-02 20:58:51 +00:00
Jens Ayton
83255f87b2 Redundant condition is redundant. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5390 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-30 21:29:09 +00:00
Chris Morris
5831f2fe24 Retain carrier containing player to prevent possible early release. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5389 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-30 21:17:37 +00:00
Chris Morris
65399f471d Unify NPC and player combat laser cycle times to the player spec 
(weapon_reload_time left as separate variable for now, for easy reversion if this doesn't work out)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5388 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-30 19:09:53 +00:00
Jens Ayton
797cb2f7ee Renamed Geometry to OOMeshToOctreeConverter and documented it a bit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5386 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-30 14:56:44 +00:00
Chris Morris
3c5898edf8 Fix exhaust entity display oddity 
Fix failure to come off red alert when energy recovers


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5385 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-30 14:40:42 +00:00
Jens Ayton
a43b8b0b98 Fix for particle drawing artefacts (http://www.aegidian.org/bb/viewtopic.php?f=3&t=12597). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5384 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-30 13:34:35 +00:00
Chris Morris
66083d18be Fix bugs in display of missile lock status and in visual effect shader parameters. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5383 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-30 09:19:58 +00:00
Chris Morris
2d3d75a91c Compatibility between legacy script and special backgrounds 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5382 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-29 15:48:08 +00:00
Jens Ayton
de2486a0cb Comment typos and missing assertions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5381 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-29 12:11:34 +00:00
Jens Ayton
86ffd635c7 Use fewer octrees with very low resolution, which were causing oddities with Griff ships' detail subentities. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5380 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-29 11:56:29 +00:00
Jens Ayton
a3e6bfd92b Fixed invalid use of reserved identifiers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5379 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-29 11:55:50 +00:00
Jens Ayton
15db8a0c3d Fixed a bug where Geometry only considered positive coordinates when determining octree bounds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5378 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-29 11:41:25 +00:00
Chris Morris
a4b9803430 Fix bug in contract summary display, adjust tab stops 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5377 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-29 10:02:07 +00:00
Chris Morris
667bc9e683 Adjust sending of target lost messages on missile re-targeting to be in line with 1.76 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5376 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-28 17:34:49 +00:00
Chris Morris
3a79944c9a Adjust HUD drawing for better compatibility with 1.76 HUD behaviour 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5375 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-28 16:58:05 +00:00
Jens Ayton
89f9f30403 Sped up Geometry some more by throwing yet more stack space at the problem (still less than 32 KiB). I think I'm done now. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5374 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-28 15:30:26 +00:00
Jens Ayton
88c72eca43 Placate gcc, which apparently can't understand its own attributes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5373 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-28 13:01:55 +00:00
Jens Ayton
2391a5f726 Cheap (nearly free) and optimal structural simplification of octrees. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5372 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-28 11:14:01 +00:00
Jens Ayton
38501e3499 Yet faster geometry by putting guts in a struct and using the stack instead of all those objects. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5371 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-28 08:50:47 +00:00
Chris Morris
f749731f95 Reduce NPC mining laser firing rate to match player's. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5370 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-27 17:27:53 +00:00
Chris Morris
2b2b3afe52 Try re-enabling planet culling. Seems stable enough in tests. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5369 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-27 17:26:10 +00:00
Jens Ayton
3e11441df4 [Mac] bumped libpng version. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5368 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-27 13:34:30 +00:00
Jens Ayton
f994150b93 Disabled Geometry allocation pool in GNUstep builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5367 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-26 19:21:39 +00:00
Jens Ayton
bf1fb6f08e Fix for rainbow dust. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5366 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-25 21:21:26 +00:00
Jens Ayton
841c118230 Fixed a comment to reflect actual interface. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5365 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-25 20:33:37 +00:00
Chris Morris
ff4bcf88d2 Take out frustum culling of planet while the reason this causes instability is figured out. -DRAINBOW_DUST_INVESTIGATION re-enables. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5364 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-25 20:22:21 +00:00
Jens Ayton
1475b6dce6 Octrees are now generated directly by Geometry processing instead of using an intermediate plist representation. Unnecessary copies of octree data eliminated. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5363 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-25 20:06:37 +00:00
Jens Ayton
652c32a915 Further minor Geometry tweaks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5362 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-24 20:33:17 +00:00
Jens Ayton
41d796540a Removed some innacuracies in Geometry performance notes. Fortunately this brain fart didn't affect the actual outcome. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5361 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-23 22:34:36 +00:00
Marc
bc40d48947 - rev5353 redux: go faster sauce poured on GNUStep builds too... here goes nothing! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5360 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-23 20:28:50 +00:00
Marc
53b1c1407d * OXP related compass behaviour update: 
- if compass is not visible, compass mode changes are disabled.
- compassTargetChanged now fires when compass display switches from visible to invisible during in-system flight - target is null, signifying the compass is being turned off.
- compassTargetChanged now fires also after willEnterWitchspace, with target undefined, meaning the compass lost its target.
- compassTargetChanged should now fire after a witchjump to a new system, under all circumstances.

* escape_pod_role property added to shipdata, to be used in preference to escape_pod_model
- yet some more, mostly whitespaces, cleanup...


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5359 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-23 16:27:37 +00:00
Jens Ayton
97b2ee5e27 Additional tweaks to Geometry. Bonus: typo fix. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5356 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-23 13:19:19 +00:00
Eric Walch
2aa4e75178 Fixed C&P bug #18737 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5355 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-23 09:43:07 +00:00
Jens Ayton
b921850072 Cleaned up a bit after previous commit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5354 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-22 19:48:27 +00:00
Jens Ayton
abded89d8d Poured go-faster source on Geometry. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5353 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-22 17:57:19 +00:00
Jens Ayton
b2f7b3fdf9 Removed write-only normal from Triangle struct. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5352 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-22 15:09:41 +00:00
Jens Ayton
38b0ad95ad Clean up intermediate Geometry objects immediately after creating octrees. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5351 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-22 14:20:20 +00:00
Jens Ayton
d37d178a3a Isolated uses of Geometry class. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5350 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-22 12:41:13 +00:00
Jens Ayton
7491a2b6d4 Xcode 4.5 project updates. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5349 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-22 12:18:22 +00:00