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

1597 Commits

Author SHA1 Message Date
cim
4ed485cd24 Add sort function for market screen (default key '/') 2014-08-30 19:44:08 +01:00
cim
86319b57b2 Add filter to F8 screen ('?' by default to cycle) 2014-08-30 18:41:51 +01:00
cim
22e4b3689d Use canonical commodity name in nova mission 2014-08-30 15:14:39 +01:00
cim
d3b9bd2c59 Legality and capacity adjustments 
- capacity can now be set per-station per-good
 - import and export legality per station
 - market_monitored = no; shortcut to make all goods legal
 2014-08-25 17:28:41 +01:00
cim
aae9bc71c7 Make station markets defined on first update if not before 
...okay, I think this branch is now (inevitable bugs aside) back to
providing about the same core functionality as it did before I started
poking at it. Onwards...
 2014-08-25 14:51:13 +01:00
cim
361ae65f15 Basic support for secondary markets, first draft of rock hermit 2014-08-25 13:41:20 +01:00
cim
2b07415355 Remove old files 2014-08-24 21:50:22 +01:00
cim
38b534aea3 Set up some commodity classes 
More than we need for the rock hermits, but should give OXPers a bit of flexibility
 2014-08-24 21:49:04 +01:00
cim
ed416e4b3d Sort trade goods list back to traditional ordering 2014-08-24 20:43:35 +01:00
cim
a45a762640 A few more adjustments - cargo contracts now (mostly?) work again 
New JS method
systemInfo.samplePrice(commodity)
 - get a sample price for a trade good in an arbitrary system
Saves changing oolite-contracts-cargo for every change in the algorithm
 2014-08-24 18:53:31 +01:00
cim
819ffde5d9 Game now loads again 
Station and player commodities preserved over load/save properly

System market actually used for the main station now
 2014-08-24 17:22:24 +01:00
cim
6e50efd88b Finally compiles again... 
(Doesn't work yet in all sorts of ways, of course)
 2014-08-24 16:19:07 +01:00
cim
f2087acf34 Fix typos, memory management, formulae 2014-08-23 17:39:56 +01:00
cim
5fc0ebc193 Fix obvious errors in economic bias calculator, add initial trade-goods plist 2014-08-23 16:27:53 +01:00
cim
fd53d87bf7 Define basic trade-goods.plist reader 2014-08-23 14:47:38 +01:00
Kevin Anthoney
77d739165b remove unused uniform from planet vertex shader 2014-08-17 16:15:55 +01:00
AnotherCommander
3807f4c150 Merge pull request #108 from OoliteProject/shader_update 
Shader update
 2014-08-17 14:48:20 +02:00
cim
45425e65d7 OXZ manager now asks about dependency downloads. 
Options: download all, download next one only, stop.
 2014-08-16 23:12:25 +01:00
Kevin Anthoney
ab32bb2b71 Merge remote branch 'upstream/master' into shader_update 2014-08-11 19:15:12 +01:00
cim
86c9f89d01 Get scenario restrictions working 
Add "tag:oolite-tutorial-compatible" restriction to Tutorial scenario
 2014-08-10 20:45:08 +01:00
cim
ce4c3e1e44 Register ship forms should return to the interfaces screen when complete 2014-08-09 13:54:49 +01:00
cim
97019ba92c Make sure ECM delay timer is stopped before ship is destroyed 2014-08-07 19:20:16 +01:00
cim
262b3760c4 Automatically download dependencies, if available, when installing OXZ 
Dependencies already met won't be downloaded (e.g. if an OXZ depends on
ABC >= 0.4, and ABC 0.6 is installed, ABC 0.8 won't be automatically
downloaded)
 2014-08-04 21:38:29 +01:00
Kevin Anthoney
da6b2e70ad merge changes 2014-08-02 11:33:34 +01:00
cim
e40fc68afc Label current download with name of what's being downloaded 2014-08-01 11:22:10 +01:00
cim
131c8244e3 Allow "long-range-chart-title-G-S" to be defined 
e.g "long-range-chart-title-0-7" = "Near Lave";
 2014-08-01 10:24:21 +01:00
cim
7f90b5dcd6 Slightly more conservative detection of 'credits' abbreviation 2014-07-31 22:09:10 +01:00
cim
aa5e137f18 Fix constrictor hunt ship script for some unusual cases 2014-07-26 20:10:17 +01:00
cim
a6d81c40e9 Fix typo 2014-07-26 14:54:23 +01:00
cim
03bb19a730 Fix (ish) alloy behaviour 
As far as I can tell, most alloys were being spawned from the wreckage
objects, not the ships themselves, and at some point in 1.77-1.80 ended
up properly inheriting their superheated temperature and exploding
instantly.

I've changed this around to give what seems to be roughly similar
behaviour to before - maybe 1 piece sometimes from light fighters,
probably 1, occasionally 2 from bigger ships. Wreckage now has its
fragment_chance set to 0, and a bug related to that setting is also
fixed.

Also increased the potential wreckage count from really big explosions,
if the graphics settings are high enough.
 2014-07-23 23:01:42 +01:00
cim
06f5c4f122 Update dependency statuses in OXZ manager after every download 2014-07-12 22:07:32 +01:00
Kevin Anthoney
41b7c613b9 Merge remote-tracking branch 'origin/master' into shader_update 2014-07-11 17:38:39 +01:00
cim
abddb9fc67 Make traders and especially smugglers avoid suspicious craft 2014-07-09 22:42:36 +01:00
Kevin Anthoney
3f93e545f5 Merge remote branch 'upstream/master' into shader_update 2014-07-09 15:53:25 +01:00
Kevin Anthoney
2dd2996737 Modify vertex shaders to use new uniforms 2014-07-09 09:40:26 +01:00
cim
3421f75216 Fix the remaining font assumption 
Two new parameters to oolite-font.plist (default to the 1.80 hard-coded
values if not set) "f6KernGovernment" and "f6KernTechLevel". Fonts with
proportional numbers should set the latter to 0.0.
 2014-07-07 22:02:32 +01:00
Kevin Anthoney
59d29c6431 Fix shadow problem at poles 2014-07-07 21:40:16 +01:00
cim
abb3f2bc55 Fix some variable-defined errors in priority AI 2014-07-07 17:34:32 +01:00
Kevin Anthoney
6dd1296ac2 Remove reference to OO_REDUCED_COMPLEXITY from fragment shader 2014-07-07 17:32:08 +01:00
Kevin Anthoney
d99f401559 make ooliteNormalMatrix a mat3 and normalize it 2014-07-07 14:22:41 +01:00
Kevin Anthoney
5ce1987e3c forgot to commit actual shaders 2014-07-06 18:50:30 +01:00
cim
cf4da8cf65 Catch occasional problem with docking AI frustration 
Requires station to be destroyed at inconvenient time.
 2014-07-06 17:28:36 +01:00
ericwalch
ed44de864b Updated versioning and gvNumberPadKey’s for the Mac build 2014-07-05 17:36:53 +02:00
cim
b9bcacc0c7 Adjust AI reconsideration and ECM delays to depend on accuracy 2014-07-05 15:32:38 +01:00
cim
4843f8b16d Revert inadvertent change to keyconfig 2014-07-03 18:13:31 +01:00
cim
61718766b2 ...and the first bug fix of 1.80 - string conversion of numpad key settings 2014-07-02 19:50:17 +01:00
cim
80cc302379 Fix assassin chase routines 2014-06-29 17:19:09 +01:00
cim
2ef15dfb84 Try again to fix docking code 2014-06-29 17:08:34 +01:00
cim
0c87450f06 Documentation update in OXZ manager 
Warn that OXP versions of old expansions should be removed before installing the OXZ versions.
 2014-06-25 22:03:35 +01:00
cim
c2800c3e5d Warn on download of OXZs on Windows due to bad GNUStep buffer 2014-06-22 15:15:29 +01:00