6726 Commits

Author SHA1 Message Date
Kevin Anthoney
55f70c7431 Make keyconfig.plist consistent with PlayerEntityControls.m 2016-04-16 14:37:13 +01:00
Kevin Anthoney
412d687b2a Revert "Use ctrl + arrow keys instead of </> for moving between information systems"
This reverts commit 89274f982bea094d9fc843624e37dafc3f375b94.
2016-04-16 14:33:37 +01:00
Kevin Anthoney
89274f982b Use ctrl + arrow keys instead of </> for moving between information systems 2016-04-16 14:11:28 +01:00
Kevin Anthoney
f9965400f3 Merge master into ANA_info branch 2016-04-16 11:08:26 +01:00
Kevin Anthoney
d349fb8d40 Hopefully fix disappearing planet problem 2016-04-15 21:13:54 +01:00
AnotherCommander
2e3fdde672 Removed debug line. 2016-04-13 21:12:48 +02:00
Kevin Anthoney
e07af942fe Merge branch 'external_views' 2016-04-13 19:37:19 +01:00
Kevin Anthoney
90c2200cd0 Add external view changes to changelog 2016-04-13 19:36:39 +01:00
AnotherCommander
2c2cffd8e4 Fixed continuous laser fire and ship movement when in rotating camera mode with mouse control. 2016-04-13 18:57:50 +02:00
Kevin Anthoney
265215e310 External view code tidy up, replace magic numbers with constants, ensure consistent speeds when paused and not paused 2016-04-13 17:22:53 +01:00
Kevin Anthoney
b78116cd48 make transition smooth on pressing shift when using mouse in external view 2016-04-13 13:36:43 +01:00
Kevin Anthoney
1648959dbb Mouse wheel zooms external camera 2016-04-13 13:23:39 +01:00
Kevin Anthoney
d478d9c205 Add mouse controls to external view camera 2016-04-13 13:19:46 +01:00
AnotherCommander
5ffa87620e Edit comment from previous commit to make it somewhat more accurate. 2016-04-13 13:59:37 +02:00
AnotherCommander
13f36a03c7 Fixed bug where SDL on Windows would mess up Caps Lock status detection, if the key was toggled outside of Oolite. Solution: bypass SDL, use WinAPI call instead. 2016-04-13 13:45:48 +02:00
Kevin Anthoney
4bb4165787 More sophisticated fix for flickering problem 2016-04-13 00:34:44 +01:00
Kevin Anthoney
228f6a3e13 Fix flickering problem highlighted by external view camera, caused by numerical instability in matrix inverse function 2016-04-12 23:43:12 +01:00
Kevin Anthoney
ce44c5aacd Restore movement of external view camera when paused 2016-04-12 20:32:26 +01:00
Kevin Anthoney
e120c5607b Consolidate code to avoid multiple identical calls 2016-04-12 20:03:04 +01:00
Kevin Anthoney
a3d6a9effc Make external view camera dependent on delta_t 2016-04-12 19:54:54 +01:00
AnotherCommander
d1b5a09d72 Fixed occasional alt-tab switching anomaly when in full screen, seen on some Intel chips. 2016-04-12 18:05:36 +02:00
Kevin Anthoney
cdbb6fd72c Add camera panning to external views 2016-04-12 13:29:06 +01:00
Kevin Anthoney
8f7458c04b Fix jump with rotating external views 2016-04-11 22:15:36 +01:00
Kevin Anthoney
c0898cbb4e Add external view manipulation 2016-04-11 20:53:01 +01:00
AnotherCommander
4cecef419f Hopefully fixed inability to remove OXZs with ogg files in the Music folder on Windows. Resolves issue #185. 2016-04-07 11:56:19 +02:00
AnotherCommander
3118ba2f7d Continuation of previous fix: simply disable mouse interaction, without setting the view to VIEW_GUI_DISPLAY first. 2016-04-04 23:15:30 +02:00
AnotherCommander
5b1289ed38 Fixed bug where turning off the hud in a multi-page status screen would result in the More and Back selections remaining, even if the equipment could fit in one page. Resolves issue #166. 2016-04-04 21:14:36 +02:00
Kevin Anthoney
6bce31b816 Merge branch 'issue_184' 2016-04-04 13:15:44 +01:00
AnotherCommander
aab5f395c7 Fixed a bug where diving into the atmosphere and then resetting player ship position into open space via script, would not reset the air resistance factor to zero, with catastrophic results on sun glare, fog and cabin temperature. 2016-04-03 10:43:06 +02:00
Kevin Anthoney
c5602f7f41 Fix problem with tangent vectors not being orthoganal to normals 2016-04-02 12:20:04 +01:00
Kevin Anthoney
1eb8d83205 Normalize tangents 2016-04-01 15:28:19 +01:00
Kevin Anthoney
f15b3e1f36 Update changelog with retina screen fix 2016-03-29 13:28:52 +01:00
Kevin Anthoney
b7939763e7 Merge branch 'issue_152' of https://github.com/OoliteProject/oolite 2016-03-29 13:15:35 +01:00
AnotherCommander
e98ae999aa Made turret ranges more related to turret shot speed and duration, rather than to some magic numbers. No change in current behaviour. 2016-03-28 14:14:52 +02:00
Kevin Anthoney
95ec3f2c9c Make current location centre of chart zoom after game load 2016-03-25 19:01:12 +00:00
AnotherCommander
2828b0c017 Fix previous fix. 2016-03-21 17:09:41 +01:00
AnotherCommander
0b1524317f Fixed incorrect parcels indexing when more than 10 parcel contracts were present. 2016-03-21 16:22:01 +01:00
AnotherCommander
3f536e7ed4 Fixed crash when attempting to modify goods properties on a nil station. 2016-03-21 12:29:50 +01:00
AnotherCommander
f9588d236a Removed duplicate witch-no-fuel entry from customsounds.plist (thanks Svengali). 2016-03-09 13:47:22 +01:00
AnotherCommander
19e4bdf6e6 Implemented copy of string to clipboard on Windows and applied it to the URL info string in the expansion pack manager oxz info page. Linux and Mac go with stub do-nothing functions for the moment on this matter. 2016-03-06 21:10:02 +01:00
AnotherCommander
248a9b5149 Cleaner, better check of Caps Lock state (Mac still needs this implemented), 2016-03-04 14:03:16 +01:00
AnotherCommander
07a7862727 Typo fixes on changelog. 2016-03-02 15:31:28 +01:00
AnotherCommander
24702af038 Updated changelog. 2016-03-02 13:44:12 +01:00
AnotherCommander
5cf14a12b7 Moved playing of docking music to before execution of playerStartedAutopilot handler, as per issue #180 discussion. 2016-02-26 17:30:18 +01:00
AnotherCommander
8a670aa204 Added marketinfo screen background key to screenbackgrounds.plist and removed unused contracts key from same plist (commented out section). Resolves issue #164. 2016-02-25 18:50:25 +01:00
Kevin Anthoney
d03d2c526f Tweak fogging so that it's probably more in line with the fixed functionality, and use GLSL mix function to simplify the shader code 2016-02-24 18:45:28 +00:00
AnotherCommander
f10b0432c1 Commit the two fixes from shader_fog branch that were left behind due to merging an not up to date version of the branch earlier. 2016-02-22 13:41:27 +01:00
AnotherCommander
8e06d2e801 Merge branch 'shader_fog' 2016-02-22 13:29:55 +01:00
Kevin Anthoney
4dd3aa0b1a Add atmospheric fogging to shaders 2016-02-21 20:03:21 +00:00
AnotherCommander
9c607851b0 Fixed incorrect reporting of fog parameters in heavy OpenGL checking. Also, fixed somewhat a comment from previous commit. 2016-02-21 20:33:45 +01:00