4566 Commits

Author SHA1 Message Date
Jens Ayton
c2a1122dfd Spinny cobra is now PlayerProxyEntity, as intended.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5418 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-10 20:28:23 +00:00
Jens Ayton
6e37e3d15f More fiddling with startup logging.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5417 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-10 18:33:42 +00:00
Jens Ayton
f4d8901bbe Got tired of the confusion about random number generators and added OOReallyRandom(), which is guaranteed not to be used for any sort of repeatable value anywhere, and is seeded exactly once.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5416 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-10 18:32:16 +00:00
Jens Ayton
76347c282b Tweaked startup logging.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5415 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-10 16:44:54 +00:00
Jens Ayton
f3df081d5b Aliased scriptActionOnTarget: to safeScriptActionOnTarget:.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5414 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-10 16:27:30 +00:00
Jens Ayton
9951eaba7b Script loading now uses standard search behaviour. Normalized some OOLogs in there while I was at it.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5412 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-08 21:55:51 +00:00
Chris Morris
170ef96413 Change to objc BOOL from C bool type.
Fix bugs in visual effects for model-less effects.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5411 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-08 17:51:37 +00:00
Jens Ayton
b3b2005bc6 Renamed misleading script.trace log message classes, and simplified the legacy script subset.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5410 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-08 17:32:54 +00:00
Jens Ayton
15502b9bf4 Removed support for deprecated tickle() event handler.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5409 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-08 17:14:03 +00:00
Jens Ayton
d942817f9b Removed legacy script detailed trace facility. If you're still debugging legacy scripts, you're doing it wrong.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5408 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-08 16:50:46 +00:00
Jens Ayton
00660249a6 Weeded out unused logcontrol.plist entries, and renamed a few.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5407 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-08 16:26:08 +00:00
Jens Ayton
c4e5f44183 Cut down on the number of random digraph generators.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5406 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-08 15:34:04 +00:00
Jens Ayton
b9b13db852 [Mac] Snow Leopard compatibility fix.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5405 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-07 14:25:45 +00:00
Chris Morris
a943e125a6 Shader/JS bindings for vector up/right/forward in visual effects
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5404 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-07 11:04:56 +00:00
Jens Ayton
082ecb64be Cleaned up string expander and documented the pieces. It should be almost comprehensible now.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5403 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-06 22:55:03 +00:00
Jens Ayton
9bf8bd8b10 Fixed exception wrapping in conjunction with OOJS_BEGIN_FULL_NATIVE. Added missing implementation of [commander_bounty].
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5402 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-06 20:02:41 +00:00
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