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

6765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
dc7df01eb7 Fix integer type mismatch 2016-05-05 18:12:23 +02:00
Jens Ayton
80dd437217 Fix questionable use of logic 2016-05-05 18:12:23 +02:00
Jens Ayton
e40ce5d0dd Remove custom definition of nil on OS X 
Xcode/clang complains that nil has multiple definitions, even though
we #undef and the system ones use #ifndef.
 2016-05-05 18:12:22 +02:00
Jens Ayton
fac4dda7ce Bump Mac-specific 
* 1c68bb1 Fix various warnings
* d29c53c Update project files
* 8464752 Fix integer type mismatch
 2016-05-05 18:11:54 +02:00
AnotherCommander
2be8c6898c Updated Reference Sheet with the Caps Lock camera control. 2016-05-01 14:44:09 +02:00
AnotherCommander
aed4dd738c Updated Reference Sheet with copyright year, new controls and comment regarding offender status. Closes #188. 2016-05-01 12:12:34 +02:00
Kevin Anthoney
789d2886d4 Add infoSystem property and infoSystemChanged event to changelog 2016-04-29 16:08:35 +01:00
Kevin Anthoney
35108d2078 Stop chart moving due to info system cursor when ANA route turned off 2016-04-28 18:47:00 +01:00
Kevin Anthoney
a6b8eb01dc Merge branch 'master' of https://github.com/OoliteProject/oolite 2016-04-27 17:23:31 +01:00
Kevin Anthoney
19a4620e4a Move info system cursor when jumping via wormhole 2016-04-27 17:22:54 +01:00
AnotherCommander
b979a9f595 Merge branch 'master' of github.com:OoliteProject/oolite 2016-04-26 13:42:29 +02:00
AnotherCommander
6fb18d0151 Pass correct parameter types to the MoveWindow WinApi function when changing placement of the game window. 2016-04-26 13:41:12 +02:00
Kevin Anthoney
cf135bb2c0 Fix problem with contracts chart screen altering info system 2016-04-23 17:31:40 +01:00
Kevin Anthoney
c863b451dd Emit infoSystemChanged event after the change and swap the parameters 2016-04-22 14:28:13 +01:00
Kevin Anthoney
e47dff3eaf stop chart from jumping around as much as it does when selecting system 2016-04-22 13:27:52 +01:00
Kevin Anthoney
18a418dbe9 remove unused chart_cursor_coordinates variable 2016-04-22 13:08:27 +01:00
Kevin Anthoney
ebc49f2d68 Fix chart so that if you set the infoSystem property while not in the chart screen the chart will show that system when you switch to it. 2016-04-21 17:49:34 +01:00
Kevin Anthoney
36451a172a Merge branch 'master' of https://github.com/OoliteProject/oolite 2016-04-21 17:35:46 +01:00
Kevin Anthoney
d33b29f731 Add infoSystem property and infoSystemChanged event to javascript 2016-04-21 17:35:41 +01:00
AnotherCommander
042c1cbb3a Fix broken Linux build resulting from previous commit. 2016-04-21 14:01:25 +02:00
AnotherCommander
4910373eb1 Small overhaul of the full screen switching system on Windows. The code should now be simpler, more robust, with less hacks and should hopefully also work in the cases observed with some Intel gfx cards on Windows 7, where going full screen from maximized window or minimizing a full screen window and returning to full screen could result in the game's window becoming stuck as topmost until full screen was re-toggled. 2016-04-21 13:53:39 +02:00
Kevin Anthoney
a58715c311 Move info system along route when jumping 2016-04-18 19:55:09 +01:00
AnotherCommander
d116d782bc More compact code for the new -resetSDLKeyModifiers method. 2016-04-18 18:35:07 +02:00
AnotherCommander
c08ac1de54 Ensure that all used keyboard modifiers (alt, ctrl, shift and caps lock) are set up correctly whenever the game window receives focus. Solves SDL issues with keyboard handling following a focus change event and allows for a few less ifdefs. 2016-04-18 17:51:44 +02:00
AnotherCommander
5e2f97448e Return Mac-specic and Windows-deps submodules to their correct revisions. 2016-04-16 22:42:46 +02:00
Kevin Anthoney
63322e6b85 Merge pull request #186 from OoliteProject/ANA_info 
System information facility for all systems on a route.
 2016-04-16 21:27:48 +01:00
Kevin Anthoney
eb6fbdad47 Add ANA info system to changelog 2016-04-16 20:54:45 +01:00
Kevin Anthoney
4cf43d7b8c Fix bug where info system jumped to target system if chart was zoomed in or out 2016-04-16 20:52:50 +01:00
Kevin Anthoney
60618e87b7 Remove </> key combination for information system traversing in F7 screen 2016-04-16 20:43:51 +01:00
Kevin Anthoney
e154a4fd51 Fix chart movement 2016-04-16 20:37:52 +01:00
AnotherCommander
eca62109f6 Implemented the Alt modifier handling and used it on the star chart screens to select next info system on a route. 2016-04-16 21:11:14 +02:00
Kevin Anthoney
0438dd659e Add alt-home and alt-end key bindings to move info system to home system and target system respectively. Home and end keys in F7 screen 2016-04-16 18:59:26 +01:00
Kevin Anthoney
afb791191f Make chart less jumpy when moving information cursor along ANA route 2016-04-16 16:55:19 +01:00
Kevin Anthoney
326d64dd6b Move chart if ANA information system cursor moves off the screen 2016-04-16 15:32:58 +01:00
Kevin Anthoney
25b0bf9797 Use arrow keys to switch between systems on system info screen 2016-04-16 15:00:58 +01:00
Kevin Anthoney
fe5bbbe4f1 Insert missing break between chart screen controls and system data controls 2016-04-16 14:43:29 +01:00
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
AnotherCommander
3b2c2f784c Whitespace fix for previous commit. 2016-04-16 00:00:55 +02:00
AnotherCommander
68286afe02 Blind debugging: Hopefully implemented Caps Lock detection on Mac, based on documentation from developer.apple.com. Testing is absolutely necessary. 2016-04-15 23:58:33 +02:00
Kevin Anthoney
d349fb8d40 Hopefully fix disappearing planet problem 2016-04-15 21:13:54 +01:00
AnotherCommander
74954f280f Fixed two atmosphere-camera related bugs: 1. applying air resistance to the camera viewpoint rather than the ship and 2. sudden switch to black sky when rotating external view in atmosphere with the camera far away from the ship. 2016-04-15 12:59:38 +02: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