cim
a76e24a6ac
Add drawSurround option for HUD which can have colour specified
...
Change to use this for the built-in HUDs
2014-08-30 22:15:27 +01:00
cim
c886c4a404
Move stick sensitivity dial to y_origin = -1 like the rest of the panel.
...
Stops it being displayed in entirely the wrong place in portrait windows
2014-08-30 21:27:02 +01:00
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
794805f790
Use constant
2014-08-30 15:00:54 +01:00
cim
a4764fb776
Fix some market inconsistencies
2014-08-30 14:52:51 +01:00
cim
7ca3045b01
Initial implementation of commodity scripts
2014-08-30 14:52:51 +01:00
AnotherCommander
88c60697e6
Fixed bug where double clicking near a planet to get to its info screen, then returning to galactic chart would cause the target system cursor to be off-centre.
2014-08-28 14:44:24 +02:00
Kevin Anthoney
bc8293e176
Calculate the range to target using actual target position instead of calculated one so target isn't lost if it teleports
2014-08-27 19:51:55 +01:00
AnotherCommander
836e2de452
Silence a compiler warning.
2014-08-26 09:00:32 +02:00
cim
a5eaa36f44
Change market scrolling so it works with mouse and keyboard, and in space
2014-08-25 21:29:08 +01:00
cim
dfad6aafbf
Start on scrolling F8 screen
...
Works okay with keyboard - needs more work with mouse
2014-08-25 18:19:21 +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
2db8cfa872
Start replacing commodity types to use new data structures
...
(This won't compile, and probably will stay that way for a few commits)
2014-08-23 22:51:05 +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
cim
50c8ad846a
PS.multiFunctionDisplayList property
...
> PS.multiFunctionDisplayList
[null, "myoxp_mfd1"]
2014-08-22 19:32:36 +01:00
cim
84721fb024
Reduce ECM shake magnitude slightly
2014-08-22 18:43:51 +01:00
AnotherCommander
02bde6cc69
Fixed bug with ECM scanner fuzziness effect persisting when paused and also when loading new commander before it had timed out.
2014-08-22 09:47:49 +02:00
cim
716c9b7ca7
Fix some valgrind errors
...
by 0x5DE892: _c_ResourceManager__paths (ResourceManager.m:458)
by 0x4B45D2: _i_PlayerEntity_Scripting_removeAllCargo_ (PlayerEntityLegacyScriptEngine.m:1410)
by 0x64FF8D: _i_OOALBufferedSound__initWithDecoder_ (OOALBufferedSound.m:64)
by 0x45A69A: _i_PlayerEntity__setUpAndConfirmOK_saveGame_ (PlayerEntity.m:1803)
by 0x45AD59: _i_PlayerEntity__setUpAndConfirmOK_saveGame_ (PlayerEntity.m:1878)
by 0x64C5A2: _i_OOSoundSourcePool__initWithCount_minRepeatTime_ (OOSoundSourcePool.m:76)
by 0x6628FA: _i_HeadUpDisplay__initWithDictionary_inFile_ (HeadUpDisplay.m:296)
by 0x4C673C: _i_PlayerEntity_Sound_setUpSound (PlayerEntitySound.m:86)
by 0x4598FE: _i_PlayerEntity__setUpAndConfirmOK_saveGame_ (PlayerEntity.m:1683)
by 0x45999F: _i_PlayerEntity__setUpAndConfirmOK_saveGame_ (PlayerEntity.m:1688)
by 0x459FAD: _i_PlayerEntity__setUpAndConfirmOK_saveGame_ (PlayerEntity.m:1733)
by 0x4599F8: _i_PlayerEntity__setUpAndConfirmOK_saveGame_ (PlayerEntity.m:1690)
by 0x66218B: _i_HeadUpDisplay__initWithDictionary_inFile_ (HeadUpDisplay.m:230)
by 0x6001B0: InitOOJSManifest (OOJSManifest.m:203)
2014-08-21 18:27:41 +01:00
cim
e4e6466279
Adjust multi-targeting system
...
Now will assign current target to next missile *if* the next missile
has no target and the current missile has just been fired.
Also fix bug where calling PS.removeEquipment on a missile type when the
player had a missile later than the first of that type selected.
2014-08-20 21:36:46 +01:00
AnotherCommander
d03ca8ba66
Simpler fix was also wrong one and -nosplash did not trump -splash as was supposed to. Revert to older fix, hopefully for the last time. So many commits for such a small thing, sheesh...
2014-08-20 08:15:55 +02:00
AnotherCommander
e2b5a66c6d
Same bugfix as previous commit, simpler way to do it.
2014-08-18 21:27:54 +02:00
AnotherCommander
ebb37e155a
Fix bug where V-sync preference from the command line would not be set when -nosplash was one of the command line arguments.
2014-08-18 14:19:23 +02:00
AnotherCommander
d1aa115593
SDL buids: V-sync can now be disabled from the command line. Use either -novsync or --novsync to achieve this.
2014-08-18 14:01:33 +02:00
Kevin Anthoney
77d739165b
remove unused uniform from planet vertex shader
2014-08-17 16:15:55 +01:00
Kevin Anthoney
db045dffe3
Fix spelling errors for uniforms
2014-08-17 15:53:20 +01:00
AnotherCommander
3807f4c150
Merge pull request #108 from OoliteProject/shader_update
...
Shader update
2014-08-17 14:48:20 +02:00
cim
9f64610ff9
Fix linux dependency submodule
2014-08-16 23:14:52 +01: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
ericwalch
bda182187a
Fixed the compiler warnings for the mac build with the suggestions by Kevin
2014-08-16 16:22:04 +02:00
cim
4add24e138
Fix errors caused by remove()ing ships from the launch queue
2014-08-15 20:18:58 +01:00
Kevin Anthoney
1ad274c0d5
Add OO_ENTER_OPENGL to bindStandardMatrixUniforms and OOGL-wrap GLUniformMatrix3
2014-08-13 19:40:56 +01:00
Kevin Anthoney
9f6591f978
Merge branch 'shader_update' of github.com:OoliteProject/oolite into shader_update
2014-08-13 19:31:35 +01:00
Kevin Anthoney
76a11c5edb
Correct OO_ENTER_OPENGL usage
2014-08-13 19:30:36 +01:00
AnotherCommander
3d4af5fc07
Fixed compile problem on Windows in OOOpenGLMatrixManager and Icosmesh tool.
2014-08-12 09:08:55 +02:00
Kevin Anthoney
b3c88bf9be
Merge branch 'npc_reaction_times' of github.com:OoliteProject/oolite into npc_reaction_times
2014-08-11 23:04:24 +01:00
Kevin Anthoney
c71542c217
Merge branch 'master' of github.com:OoliteProject/oolite into npc_reaction_times
2014-08-11 23:01:05 +01:00
Kevin Anthoney
e2431330ee
Merge branch 'planet_vertices' into shader_update
2014-08-11 20:23:09 +01:00
Kevin Anthoney
d18600b3ea
Add convenience function for retreiving model-veiw-projection matrix
2014-08-11 20:02:09 +01:00
