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

7159 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AnotherCommander
0231ed5a58 Windows port: Ensure that, in the case of both an integrated and a high-performance GPU being available, the high-performance one is selected. Also, comment and formatting fixes while we are there. 2018-03-22 08:41:47 +01:00
AnotherCommander
91a36b8a76
Introducing the %G###### string expander. 
It works like the %J### one, but it takes two triplets of numbers rather than one, namely the system ID followed by the galaxy ID. This way we can refer to planet names in galaxies other than where the player is. %J### remains for compatibility reasons. Updated Constrictor Hunt mission strings to eliminate hard coded references to Xeer in the mission texts. (#290)
 2018-03-06 12:16:42 +02:00
AnotherCommander
0d445de09b Player comms messages are now fully expanded before shown, just like any other ship's messages. 2018-03-05 13:08:01 +01:00
phkb
9e72022bb3 Updates to changelog 2018-02-20 09:57:42 +11:00
AnotherCommander
c8a4f74759 Rather than silently failing, report error if a non-expected player.ship.chartHighlightMode is used. 2018-02-17 21:32:05 +01:00
phkb
835770bfad Added player.ship.chartHighlightMode property, and chartHighlightModeChanged event (#288) 2018-02-17 11:19:05 +02:00
phkb
c3406ef600 Fix for custom_chart_mission defaulting to correct background 2018-01-25 14:20:08 +11:00
AnotherCommander
c608fdb856 Windows port: For cleanness, print UBR in the log only when the UBR registry value is available. 2018-01-11 18:32:09 +01:00
AnotherCommander
3ad742b418 Windows port: Include Update Build Revision in OS detection method. 2018-01-09 22:08:01 +01:00
KonstantinosSykas
151e098fd9 License copyright year update to 2018 2018-01-09 22:23:39 +02:00
AnotherCommander
8f2e500c01 Merge branch 'master' of github.com:OoliteProject/oolite 2018-01-03 12:17:26 +01:00
AnotherCommander
ffe656979d Happy new year 2018-01-03 12:16:44 +01:00
phkb
a01d250cc1 Updates to CHANGELOG.txt 2018-01-02 13:35:03 +11:00
phkb
433d8d7583 Added extra chart configuration options for mission screens (#284) 2017-12-29 14:12:19 +02:00
phkb
e486175777 Multipage primable equip (#282) 
Adds multi-page ability to primable equipment manager
 2017-12-16 13:55:57 +02:00
AnotherCommander
dbb5b52d46 Windows port: Enabled PerMonitorV2 DPI awareness wherever possible (Win10 Creators Update and later). 2017-12-13 14:06:46 +01:00
AnotherCommander
de4b48c38d
Windows Resources Addition & Manifest Embedding (#279) 
Added resource files and enabled manifest embedding on Windows. This allows us to handle high-DPI and newer Windows versions support in one go (and is the recommended by Microsoft way for handling these things), can provide a way for potential future manifest settings to be added, simplifies existing code and adds an icon to the Oolite Windows executable.
 2017-12-12 15:10:48 +02:00
AnotherCommander
dcf8abe665 Unbreak 32-bit Windows build. Some older MinGW headers may be missing the RTL_OSVERSIONINFOEXW definition. 2017-12-04 11:09:50 +01:00
AnotherCommander
2aa78d9711 Windows port: Report correct OS version on releases newer than Windows 8. 2017-12-03 20:26:00 +01:00
AnotherCommander
8e417bc70a Easier to read version of the new planet diffuse lighting calculation. 2017-11-06 11:51:32 +01:00
jobi-wan
8d5277d31d Bumps master branch version number to 1.87 (#277) 2017-11-04 19:15:15 +01:00
AnotherCommander
7b58bc9382 Improved diffuse lighting on default planet shader. 2017-11-04 12:46:23 +01:00
Job Bolle
9a1b4a2cc4 Merge branch 'analyzer-issues' again 
These are da2f747 and 2bd99d0 from PR #270
 2017-11-03 13:03:39 +01:00
Job Bolle
2855cc9bc4 Fixes analyzer issue: Initial value never used 
targetCoordinates is assined a value in its declaration. Its first use is another assignment.
Moved declaration to first assignment that gets used.
 2017-11-03 11:48:12 +01:00
Job Bolle
54b620694d Fixes analyzer issue: initial value never used 
targetName is declared and assigned a vale. Its first use is another assignment.
Moved declaration to first assignment that gets used.
 2017-11-03 11:47:31 +01:00
phkb
b1366f0020 Merge branch 'master' of https://github.com/OoliteProject/oolite 2017-10-29 09:57:49 +11:00
phkb
de017b9414 Remove instances of 'vicious vicious' from planetinfo.plist 2017-10-29 09:55:58 +11:00
jobi-wan
4df6613f52 Scripting: Makes pitch/roll/yaw for playerShip writable (#273) 
* Scripting: Makes pitch/roll/yaw for playerShip writable

* Fixes bounds checking issue when passing negative deltas

The increase/decrease_flight_pitch/roll/yaw methods in ShipEntity assume that deltas are always positive. The increase_ functions only check upper bounds, decrease_ functions only check lower bounds.

Now checking both upper and lower bounds in all of them, so they cope well with negative deltas.
 2017-10-28 21:36:59 +02:00
jobi-wan
7e555ef15b Scripting: adds 'pauseGame()' method to pause the game from script (#274) 
* Scripting: adds 'pauseGame()' method to pause the game from script

* Disable scriptable pause for some GUI screens

Excludes the same screens as in PlayerEntityControls.m:-pollDockedControls
Method returns false in script if the call didn't pause the game.
 2017-10-28 21:36:25 +02:00
jobi-wan
9466fdef8f Unbalanced braces break function dropdown in xcode IDE (#275) 2017-10-28 18:14:34 +02:00
jobi-wan
dae8242a9c Implements mouse wheel for Mac (#272) 2017-10-28 13:09:14 +02:00
AnotherCommander
bb0717b16f Changed version number on downloads table. 2017-10-25 22:56:18 +02:00
Job Bolle
0819f1be35 Merge branch 'analyzer-issues' 2017-10-21 12:54:58 +02:00
Job Bolle
e0f311bb77 Fixes analyzer issue: Access to instance variable results in null pointer dereference 
We test for (self == nil) indicating this is a possibility. Then we touch an instance variable regardless.
Removed this line. If self == nil, this is a null pointer dereference; if not, standardMatrixUniformLocations is already nil.
 2017-10-21 12:53:47 +02:00
Job Bolle
c24bb8d9fe Fixes analyzer issue: Access to instance variable results in null pointer dereference 
If error != NO_ERROR, we release and nillify self, then touch _source.
Put subsequent code in else block.
 2017-10-21 12:53:44 +02:00
Job Bolle
aac51d6832 Fixes analyzer issue: Instance variable used while 'self' is not set 
matrixManager is assigned before self is set to [self init..] or [super init..]
Moved assignment to after self = [super init...]
 2017-10-21 12:53:37 +02:00
KonstantinosSykas
6c8a4ca5eb Yet another import of Mac-specific submodule 
restructuring the previous fix attempt.
 2017-10-20 09:08:02 +03:00
KonstantinosSykas
67d9bd3b5f Import Mac-specific submodule 
with fix on a compiler warning.
 2017-10-19 22:04:27 +03:00
KonstantinosSykas
b3c80fc6d8 Import Mac-specific submodule 
with fix on a compiler warning.
 2017-10-19 16:41:09 +03:00
jobi-wan
1951039177 Bumps Copyright year to 2017 (#269) 
Copyright line in license says 2004-2011.
Changed 2011 into 2017 as that is the current year
 2017-10-19 15:20:36 +02:00
AnotherCommander
51634b3d5e Updates to changelog. 2017-10-17 21:13:19 +02:00
AnotherCommander
888f7b23af Fixed typo. 2017-10-17 16:07:04 +02:00
AnotherCommander
0929cb9099 Version bump to 1.86 for the distributed readme files, plus some updates in Oolite_Readme.txt that is distributed with the Windows version. 2017-10-17 16:03:49 +02:00
AnotherCommander
451665081a Version number bumped to 1.86. Code Freeze. 2017-10-17 15:36:47 +02:00
KonstantinosSykas
378a36b591 Merge branch 'master' of github.com:OoliteProject/oolite 2017-10-17 01:12:50 +03:00
KonstantinosSykas
1109840c79 Bump oolite-linux-dependencies for README file update. 2017-10-17 01:12:02 +03:00
AnotherCommander
9bb9b93f60 Test Release builds: Make relief intensity on planets adjustable by the p3dnsf (P3D Normal Scale Factor) user defaults setting. Default value is 1.0. 2017-10-16 22:39:13 +02:00
jobi-wan
20233c8236 Prevents recalculating route every frame on Chart view (#267) 
* Don't re-calc route on every frame

savedPlanet and savedDest were not static, and re-inited to zero each time.
Made them static, so they persist across calls.

* But do re-calc when Nav Array Mode changes

Now that we don't re-calculate the route all the time anymore, we should re-calculate it when changing nav array mode.
Added savedArrayMode to save the array mode across calls, and test the current mode against.
 2017-10-13 14:33:08 +02:00
jobi-wan
38dac87005 Implements MyOpenGLView::resetMouse for Mac (#266) 2017-10-09 21:19:59 +02:00
Kevin Anthoney
adb2688b5c Fix a couple of errors from #263 2017-10-08 19:15:57 +01:00