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

6365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cim
211d9ba42a Allow "permanent" to be set on message_gui 
Probably requires quite a significantly redesigned HUD
 2015-01-23 21:11:54 +00:00
cim
aab611fc0d drawCustomImage: HUD dial 
Takes a string as the data source, uses that as an image in Images, displays it
 2015-01-19 21:21:48 +00:00
cim
e5d74f7013 Adjust range for docking clearance warning checks 2015-01-18 21:47:21 +00:00
cim
4f28512cd3 Warn if docking clearance is needed but not granted 
Have to be rather close to the dock for this to work - needs to
detect the problem further out for this to be useful.
 2015-01-18 21:18:15 +00:00
cim
948dc08c01 Weapon type could now be any string depending on what equipment is present. 2015-01-17 14:36:42 +00:00
cim
edf5948962 playerEnteredContract(type,info) method 2015-01-15 18:23:47 +00:00
cim
ab6cd8785a Add playerCompletedContract(type,result,fee,contract) event 
type = parcel | passenger | cargo
result = success | late | failed | short (last one for cargo only)
fee = decicredits
contract = dictionary for that type
 2015-01-14 21:06:15 +00:00
cim
cf303a6305 Add third parameter to playerRescuedEscapePod(...,rescuee) 
Dictionary like in ship.crew
 2015-01-14 19:44:28 +00:00
cim
6ee392913e playerRescuedEscapePod(decicredits, reason) event 
reason = insurance|bounty|slave (slave => decicredits = 0)
Does not occur for scripted pods
 2015-01-14 19:30:18 +00:00
cim
f0da98fd3c Add a second parameter - destination - to shipWillEnterWitchspace 2015-01-13 21:46:38 +00:00
cim
ad6c9b1235 Fix scripting support for unoriented waypoints 2015-01-12 20:30:04 +00:00
cim
0ba0363db5 Add hostile scanner display colours 
ship.scannerHostileDisplayColor1, ship.scannerHostileDisplayColor2
or shipdata.plist
scanner_hostile_display_color1, scanner_hostile_display_color2
 2015-01-12 20:00:14 +00:00
cim
6b6502c3b1 Allow waypoints to be set with orientation [0,0,0,0] to hide direction. 
(Waypoint cube will be aligned to [1,0,0,0])
 2015-01-12 18:36:25 +00:00
cim
78faa542c6 Simplify caching of scaled ship meshes 2015-01-12 18:36:02 +00:00
cim
57e1e22fea Fix cargo rotation message 2015-01-11 12:32:12 +00:00
Jens Ayton
d570f01917 Sundry OOExpand adoptions 2015-01-09 22:57:02 +01:00
Jens Ayton
5e18e767d9 Add separate [hyperspace-blocked] sound 2015-01-09 22:36:03 +01:00
Jens Ayton
11ce36c91d Adopt OOExpand in bounty award message 2015-01-09 22:21:17 +01:00
Jens Ayton
0f90255760 Adopt OOExpand in OXP messages system 2015-01-09 22:21:17 +01:00
Jens Ayton
79bc9e473f Locale function tweaks 
* Use normal string expansions for credit format
* Use format strings for negation
* Insure against recursion in credits expansion
 2015-01-09 22:20:52 +01:00
AnotherCommander
181d1b5439 Fixed inability to unset joystick buttons beyond 16 (copy/paste error). 2015-01-09 19:07:51 +01:00
cim
03e7fb3dd9 Don't lose compass target if the currently selected waypoint is redefined. 
Also deal with compass-providing equipment being added/removed properly
 2015-01-08 22:32:14 +00:00
cim
59519b6e59 Allow patrol lengths to be varied in AI if needed 2015-01-08 22:12:25 +00:00
AnotherCommander
9f8071a73c Added hyperdrive engage button to stick mapper. 2015-01-08 17:42:44 +01:00
AnotherCommander
18f1383265 Added scanner zoom/unzoom and cargo jettison button functions to stick mapper. 2015-01-08 15:14:02 +01:00
Jens Ayton
9b6ee44bdc Remove an incredibly obsolete FIXME 2015-01-08 14:30:52 +01:00
Jens Ayton
f222ee4653 Merge pull request #122 from OoliteProject/fancy-expand 
New string expander
 2015-01-07 08:44:11 +01:00
Jens Ayton
e7028ce0b8 Document formatting operators in descriptions.plist 2015-01-07 08:43:41 +01:00
Jens Ayton
93a597c3c4 Document format string changes 2015-01-07 08:33:24 +01:00
Jens Ayton
d82de76de5 Remove unused string 2015-01-07 08:33:21 +01:00
Jens Ayton
1e844ec19d Fix type mismatch warning 2015-01-07 01:20:01 +01:00
Jens Ayton
2ce1c87fb4 Remove unused variables 
These were left over from 77cb18c.
 2015-01-05 16:56:02 +01:00
Jens Ayton
f142638754 Fix some system screen problems 2015-01-05 16:48:44 +01:00
cim
e8c3178b26 Some updates to OXP verifier config 2015-01-04 21:42:37 +00:00
Jens Ayton
c7f5d16d3e Merge remote-tracking branch 'origin/master' into fancy-expand 2015-01-04 15:35:40 +01:00
Jens Ayton
c50ce0e9e8 Update documentation in descriptions.plist 2015-01-04 15:35:22 +01:00
Jens Ayton
46ca20cc56 Implement %I in terms of OOExpand 2015-01-04 15:24:38 +01:00
Jens Ayton
f07e48b2b2 Clean up merge messes 2015-01-04 15:13:29 +01:00
Jens Ayton
f1d2070420 Merge master into fancy-expand (using imerge) 2015-01-04 15:07:47 +01:00
cim
6a0598e9eb Scoop/missile positions also need to be scaled. 2015-01-01 18:43:44 +00:00
cim
2b6c555d6f Stop OXP verifier reporting false positives on shipdata templates 2015-01-01 17:17:12 +00:00
cim
346c3e0dfd Merge branch 'model_scale_parameter' 2015-01-01 15:04:37 +00:00
AnotherCommander
2bac7ae954 Change year to 2015 in visible game and Win installer messages. Happy new year. 2015-01-01 11:59:41 +01:00
cim
ac08b0ace8 Adjust specification of JS external view positions 2014-12-31 22:44:30 +00:00
cim
c8fa6cb7fa model_scale_factor shipdata property 
Rescales:
 - mesh
 - subentities and positions
 - view positions
 - weapon positions
 - custom views
Allows easy introduction of size variations with like_ship without having
to make several separate Models files and recalculate other properties. May
also be useful to the rescaling experiments.
 2014-12-31 22:32:45 +00:00
cim
8075317536 Fix for importing old post-nova savegames 2014-12-31 17:28:41 +00:00
cim
02d7423196 Fix error with sun display at extreme ranges 2014-12-30 16:54:37 +00:00
Jens Ayton
31f0ca6ea5 Bump Mac-specific 
* 9718c76 Suppress deprecation warnings
 2014-12-30 16:20:25 +01:00
cim
c8dcb0233e Contracts should not be generated to nova systems 2014-12-29 22:32:54 +00:00
cim
617de79fc1 With Advanced Nav Array, allow jumping to next spot on route 2014-12-29 18:29:30 +00:00