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

12 Commits

Author SHA1 Message Date
Chris Morris
b8761626c0 mission.exitScreen r/w property (only useful to set from callback) 
mission.screenID property (set from screenID property in runScreen)
Built-in interfaces set a screenID 
Update Changelog.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5485 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-12 15:01:07 +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
6c87f5c487 Fix various mission screen / parcels bugs 
GUI_SCREEN_INTERFACES now triggers guiScreenChanged
GUI_SCREEN_STATUS now triggers guiScreenWillChangeTo
Parcels script now has an API to add parcels to list
Parcels script now has a variable to set a custom overlay


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5435 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-19 18:05:03 +00:00
Chris Morris
dae5fa6466 Allow mission screens (while docked) to choose their exit screen. 
Update parcels script to exit to the interface screen.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5433 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-18 18:26:37 +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
Chris Morris
dccd6497bc - Add "allowInterrupt" parameter to mission.runScreen. If set, function keys still work within the mission screen, exiting it *without callback*. Intended mainly to allow interfaces to blend in with the main GUI a little better. 
- Applied "allowInterrupt" to parcel contracts.
 - Consequential change to player.ship.targetSystem to allow setting from shipWillLaunchFromStation


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5420 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-11 21:14:02 +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
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
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
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