855 Commits

Author SHA1 Message Date
Chris Morris
e64f74399d Fix crash bug in trackCloseContacts functionality
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5576 127b21dd-08f5-0310-b4b7-95ae10353056
2012-12-14 18:24:19 +00:00
Chris Morris
a894b4dd63 Add some high level profiling log statements, since gprof seems to miss some of the time spent in various routines.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5575 127b21dd-08f5-0310-b4b7-95ae10353056
2012-12-13 20:59:22 +00:00
Chris Morris
2208333f70 Revert r5523
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5536 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-25 11:50:54 +00:00
Jens Ayton
07b05f6839 [Mac] Fixed some state management problems in legacy full screen controller.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5530 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-24 15:50:50 +00:00
Nikos Barkas
23de81392f Nitcpick: More 'professionally' sounding message when a distant hyperspace destination is selected.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5525 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-23 09:35:07 +00:00
Chris Morris
c30778b3b5 Update planetinfo.plist to preserve 1.76 planet descriptions
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5523 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-22 22:42:15 +00:00
Chris Morris
80f2f4f6da New engine flare appearance. (breaks Mac build again)
Engine flare z size now does something. Values from 0.5-2.0 scale the flare compared with its 'normal' scale. All other values treated as equal to 1.0. shipdata.plist updated with new exhaust z-size parameters for completeness.
Slightly tweak laser turbulence parameter.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5521 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-22 19:55:51 +00:00
Chris Morris
20b59c9a62 Use station name on F8 screen for non-main stations
Fines only applied at main station


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5517 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-18 20:58:08 +00:00
Chris Morris
f599d0f5f1 Remove testing code which snuck into commit.
Add condition script to a few items it was missed from.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5516 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-18 18:17:06 +00:00
Chris Morris
d497aebc53 Equipment condition scripts now include context of award.
NEU, cloak moved to use condition scripts rather than TL:99 hack
Base equipment now uses condition script to allow OXP writers to deny particular items at their own stations. (e.g. no fuel)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5514 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-18 16:33:41 +00:00
Jens Ayton
a4050d5218 Spelling fix.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5507 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-17 12:07:55 +00:00
Nikos Barkas
41267a8aeb Added ZygoUgo to contributors list. Minor clean up on startextures.plist.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5506 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-17 10:20:42 +00:00
Nikos Barkas
e693c8f3ae With creator's permission, added ZygoUgo's new star textures in the core resources.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5504 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-16 16:31:50 +00:00
Nikos Barkas
5cb844bb60 Minor cosmetic change in interfaces screen: capitalization on titles.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5502 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-14 21:08:46 +00:00
Chris Morris
603a934fa8 Add interfaces for cargo and passenger contracts. Including:
- API to allow OXPs to insert contracts
 - New customsounds entries for contract acceptance and rejection
 - New choicesKey parameter to make choice unselectable
 - More than 5 contracts viewable at once


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5466 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-01 20:36:08 +00:00
Chris Morris
0301dd6959 Enable OO_GL_CHECK_HEAVY in debug builds (SDL)
Fix splash screen GL settings (SDL)
Remove obsolete shipdata.plist line


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5456 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-28 21:29:27 +00:00
Chris Morris
23315623af Explicitly specify hermit scan class rather than relying on populator.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5449 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-28 09:10:02 +00:00
Chris Morris
7ecd1f84bf Fix error in parcels scripts.
Document "interfaces" entry in screenbackgrounds.plist


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5426 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-12 19:13:39 +00:00
Jens Ayton
99f2065b9b Fully integrated new string expander.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5423 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-12 12:49:55 +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
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
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
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
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
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
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
Chris Morris
cc769b14b6 Make background for parcel delivery maps come from screenbackgrounds.plist
Add some more (unused in core) entries to screenbackgrounds.plist so that OXPs can define slightly different backgrounds for F6 screens and their missionscreen alternates. 


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5334 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-17 17:53:08 +00:00
Marc
5e11ee5103 * Mass lock/hud internals refactoring part II - boosted various hud elements rendering speed, & hopefully didn't break xcode4 builds - there's more to come...
* disabled the obsolete & unclear AEGIS_CLOSE_TO_PLANET AI message (AEGIS_CLOSE_TO_MAIN_PLANET & CLOSE_TO_PLANET are sent for main & extra planets respectively)
* fixed Aegis status edge case - events & messages should now also fire correctly when moving directly from one oxp planet vicinity to another, plus somewhat streamlined the algorithm.
- assorted minor cleanup: code, comments & blank spaces

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5331 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-16 21:16:25 +00:00
Jens Ayton
7ee42fcbf5 Tagged some more performance bottlenecks.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5330 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-15 21:44:41 +00:00
Chris Morris
266294005b - Add "interfaces" mechanism to stations (F4) to allow "pull" rather than "push" access to mission screens.
- Add parcel deliveries to interfaces so that there's something there.
- Tweak mission screen options to add colour to choices, for parcel consistency with r5320.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5327 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-14 19:49:53 +00:00
Jens Ayton
63de7edcc6 Missing logcontrol entry for r5324.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5325 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-14 00:11:36 +00:00
Marc
e878d62401 - New feature: contracts that might still be completed, but are now past the estimated departure time, are shown in orange for a while. New translation string added.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5320 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-13 15:54:31 +00:00
Nikos Barkas
8ce944d4df Need for space.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5317 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-11 13:56:58 +00:00
Nikos Barkas
661901f5d6 Made Docking Clearance Protocol a game option (note: one spacer line had to be removed for the SDL builds - werun out of screen space!)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5314 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-10 19:42:30 +00:00
Jens Ayton
f118568099 Missing space.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5312 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-09 13:03:29 +00:00
Jens Ayton
1d07de7a62 Like r5309, but not broken.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5310 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-09 12:45:38 +00:00
Jens Ayton
e19364dc57 Mapped Unicode HAIR SPACE to 031.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5309 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-09 10:13:19 +00:00
Chris Morris
9fea652a2e Make \037 in the Oolite font (obsolete "unit separator" control character) usable as a very narrow spacing character, to make up for the absence of tab and formatting support in mission screens.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5282 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-02 16:13:28 +00:00
Chris Morris
d9e2ce7368 Revert r5243, since that needs OOMesh rewriting first
Update verifyOXP config


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5244 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-25 14:10:01 +00:00
Chris Morris
5ac25bb344 Provide some shader-bindable properties for visual effects
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5238 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-24 20:20:43 +00:00
Chris Morris
55b8b21944 Start shader bindings for Visual Effects (fake hullHeatLevel for default shader)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5220 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-22 19:40:56 +00:00
Chris Morris
44f1494b13 Initial addition of "Visual Effect" entities.
- effectdata.plist defines them
 - VisualEffect JS representation
 - System.addVisualEffect()
 - System.breakPattern and Station.breakPattern properties to allow override of usual break pattern
 - No appearance on scanner yet
src/Core/Entities/OOVisualEffectEntity and src/Core/Scripting/OOJSVisualEffectEntity will need adding to XCode project, please.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5212 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-19 17:09:51 +00:00
Jens Ayton
e638ea259b Removed vestiges of Groolite; Growl and Notification Center notifications appear above the game anyway in 64-bit now, and fixing Groolite for 32-bit ain't gonna happen.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5206 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-18 16:47:46 +00:00
Jens Ayton
52ad424bf8 Reorganized handling of mouse cursor visibility, adding GameController
property mouseInteractionMode which also reflects the distinction between
flight mode with mouse control on and flight mode with mouse control off.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5205 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-18 16:09:15 +00:00
Chris Morris
0db1d55fb6 Introduce Javascript-based frame-by-frame AI management
Add ship.max(Pitch|Roll|Yaw) properties
Modify player.ship.(Pitch|Roll|Yaw) properties so that signs reported are the same as for NPC ships.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5190 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-16 19:33:38 +00:00
Jens Ayton
c283c03ce4 Minor optimization and cleanup of AI dispatch.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5175 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-11 11:55:33 +00:00
Jens Ayton
a9c0e85649 Use OOWeakSet for ship defense targets.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5151 127b21dd-08f5-0310-b4b7-95ae10353056
2012-07-30 23:13:55 +00:00