923 Commits

Author SHA1 Message Date
Chris Morris
478698a2da Fix compiler warning in AI
Fix interstellar bug in parcel contracts (Berlios #18735)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5345 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-21 16:56:06 +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
40c975ffcb Fix potential crash with interfaces.
Remove "far too late" parcel contracts from the list.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5329 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-15 20:18:56 +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
Jens Ayton
fa2cf4c9f5 Added oolite-default-effect-script.js to Xcode project. Removed copy-and-pasted comment about legacy script actions.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5303 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-08 18:46:54 +00:00
Chris Morris
5ff5dc09fd Allow scripts and scriptInfo to be attached to visual effects.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5299 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-08 14:51:45 +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
Chris Morris
6cf87ddc2a Fix some speeds in attack routines.
Make sure pirate escorts will redeploy properly in extended fights


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5166 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-05 12:06:20 +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
Chris Morris
ae84915d19 Some AI changes and related tidying:
1) Make pirates with full holds (and other offenders using route1traderAI) less likely to go to main station, especially not fugitives. (Expansion of changes from r4770)
2) Experimentally ensure always at least one rock hermit in all non-nova systems. If normal generation does not place a hermit, one is added well away from all spacelanes.
3) New "ATTACKER_MISSED" AI event for when a ship tried to shoot a laser at its target but narrowly missed. Many stock AIs modified to treat this as a hostile action.
4) Tidy function/property names in docking code
5) Add checks for cloaking in some AI routines
6) Use weak refs rather than universal ID for targeting, and clean up


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5144 127b21dd-08f5-0310-b4b7-95ae10353056
2012-07-29 20:21:11 +00:00
Jens Ayton
267276263e [Mac] HiDPI icon for saved games.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5143 127b21dd-08f5-0310-b4b7-95ae10353056
2012-07-29 17:17:53 +00:00
Chris Morris
37703e68c3 Change allowPlayerDocking to disallowedDockingCollides (with approximately reversed meaning)
Fix some bugs with player docking clearance in new docking code
Disable logging of "ship could not launch because there aren't any launch docks"


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5130 127b21dd-08f5-0310-b4b7-95ae10353056
2012-07-24 16:51:28 +00:00
Jens Ayton
d69513681f Added joystick buttons for target memory.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5123 127b21dd-08f5-0310-b4b7-95ae10353056
2012-07-22 22:00:47 +00:00
Chris Morris
34673db0d5 A cornucopia of changes:
- Fix "ghost wormhole" bug most common around zero-distance doubles
 - Fix minor bug in handling of wormhole player carriers
 - Fix display bug with wormholes and sun
 - Fix other minor bugs with wormholes
 - Add "dayChanged" world script event
 - Remove some runaway bounties, and remove some player/NPC distinction in bounty awards
 - Offenders won't call for help, but may still beg for mercy
 - Traders may dump cargo when attacked by NPCs, not just the player (and sometimes they will escape as a result, too)
 - new "long-range-chart-title-N" descriptions.plist entries for individually-named galaxies.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5113 127b21dd-08f5-0310-b4b7-95ae10353056
2012-07-20 20:04:02 +00:00
Jens Ayton
2378df9e35 Plist syntax nit.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5099 127b21dd-08f5-0310-b4b7-95ae10353056
2012-07-16 11:47:00 +00:00
Jens Ayton
96221108ce Sneakily switching to tgmath.h to see if anyone explodes.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5086 127b21dd-08f5-0310-b4b7-95ae10353056
2012-07-13 13:33:28 +00:00
Jens Ayton
6a52ff134f Prefixing applies to us, too.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5078 127b21dd-08f5-0310-b4b7-95ae10353056
2012-07-12 11:55:33 +00:00
Chris Morris
b56e4acb72 Add allow_player_docking property
Add a virtual dock subent to stations without dock subents. Proximity docking should now work as before


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5077 127b21dd-08f5-0310-b4b7-95ae10353056
2012-07-12 11:27:54 +00:00
Chris Morris
2e0ee4070a More docking changes:
- allocate launch queues better when incoming ships
 - player only blocks allocated queue now
 - fix clearance messages
 - allow bays to be named; include bay names in messages (if >1 dock)
 - allow bays to be marked launch-only / dock-only. Still some bugs in this bit 


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5062 127b21dd-08f5-0310-b4b7-95ae10353056
2012-07-10 22:04:52 +00:00
Chris Morris
ae014d1496 Expose individual weapon mount temperatures (readonly!) to script for both player and NPC
Move laserHeatLevel from PlayerShip to Ship


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5047 127b21dd-08f5-0310-b4b7-95ae10353056
2012-07-04 21:08:38 +00:00
Jens Ayton
b7ccf80512 [Mac] Updated game icon and splash screen for retina displays.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5015 127b21dd-08f5-0310-b4b7-95ae10353056
2012-06-16 17:51:05 +00:00
Chris Morris
000ff5c546 Remove debug lines mistakenly left in last commit
Add 'alertCondition' as an NPC shader property


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5012 127b21dd-08f5-0310-b4b7-95ae10353056
2012-06-16 12:01:17 +00:00
Jens Ayton
899d9e42b6 Gave myself top billing. (But no I want to implement kerning.)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5010 127b21dd-08f5-0310-b4b7-95ae10353056
2012-06-15 21:49:04 +00:00
Chris Morris
48e2a103bb weaponRecoveryTime (for shaders, mimics 1.76 laserHeatLevel behaviour for NPCs)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5003 127b21dd-08f5-0310-b4b7-95ae10353056
2012-06-11 19:17:30 +00:00
Jens Ayton
bc38ee7621 Disabled half-baked material synthesizer.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5001 127b21dd-08f5-0310-b4b7-95ae10353056
2012-06-10 17:09:03 +00:00
Nikos Barkas
d833c9fb31 Small typo fix.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4998 127b21dd-08f5-0310-b4b7-95ae10353056
2012-06-08 17:20:13 +00:00
Chris Morris
9f22081e2b Wormholes:
- set wormhole exit speed to 25% max ship speed
- add small perpendicular displacement to ships following the leader
- special case treatment where player is both following and being followed
- activate Eric's wormhole positioning code now it is safe to do so

AI:
- fix bug in stick refactoring causing problems with pitch and missile tracking
- tone down in-combat injector usage (fleeing still at full speed)
- tune "back off for another attack run" behaviour
- increase general laser accuracy for combat (though still not as high as 1.76, to compensate for overheating changes)
- apply SIX and TWELVE behaviour to bad pilots not good pilots
- make sure the Constrictor always has positive accuracy 0-5


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4989 127b21dd-08f5-0310-b4b7-95ae10353056
2012-06-06 10:02:31 +00:00
Jens Ayton
8e342317fe Fixed some out-of-date version and copyright strings.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4965 127b21dd-08f5-0310-b4b7-95ae10353056
2012-05-27 16:33:21 +00:00
Eric Walch
cea95deb2d - Changed 'setDestinationToJinkPosition' slightly to give a faster pitch reaction.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4958 127b21dd-08f5-0310-b4b7-95ae10353056
2012-05-25 21:24:22 +00:00
Chris Morris
84f3278234 Add weapon_facings property to shipdata.plist (optional, default 15)
Prevent (and remove existing) weapons on player ships not allowed by weapon_facings
Move weaponFacings JS property from PlayerShip to Ship
Prevent addition of weapons to NPC ships not allowed by their weapon_facings


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4957 127b21dd-08f5-0310-b4b7-95ae10353056
2012-05-25 20:11:01 +00:00
Eric Walch
0167b32938 - Added a new AI command 'setDestinationToJinkPosition'
- Updated several AIs with reaction to cloaked attacks.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4954 127b21dd-08f5-0310-b4b7-95ae10353056
2012-05-22 20:06:21 +00:00
Chris Morris
7ec9ba3211 Add side weapon points to NPCs.
- automatically used sometimes in combat if weapons fitted
 - performBroadside AI command to force use if fitted
 - JS properties added for NPC ships
 - shipdata.plist properties added (no core ship uses them, of course)
 - works better if you fit the same weapon to each side, but it can cope...


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4949 127b21dd-08f5-0310-b4b7-95ae10353056
2012-05-20 15:59:44 +00:00
Eric Walch
27bb46cacd - Added two new AI commands: 'storeTarget' and 'recallStoredTarget'
- Used both commands in pirate and missile AI for a better reaction on cloaked targets.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4941 127b21dd-08f5-0310-b4b7-95ae10353056
2012-05-16 12:46:14 +00:00