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

7029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
phkb
de017b9414 Remove instances of 'vicious vicious' from planetinfo.plist 2017-10-29 09:55:58 +11: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
AnotherCommander
b7d61428be Bring mozilla submodule to the current revision. 2017-10-08 17:17:18 +02:00
Kevin Anthoney
db6d5a96c8 Remove errors when compiler complains about format strings so that Oolite will compile without having to manually hack GNUstep make files (#263) 2017-10-08 16:41:56 +02:00
AnotherCommander
d714407ba0 Hopefully fixed some more OSX build warnings. Inserted stub resetMouse method; implementation needed. 2017-10-07 21:06:44 +02:00
AnotherCommander
68fb3b5918 Implementation of the stringToClipboard method for the Mac port (thanks hoqllnq). 2017-10-07 20:11:44 +02:00
AnotherCommander
758ae97a50 Fixed some more reticle color warnings on the Mac, similar to the ones addressed in previous commit. 2017-10-07 12:32:37 +02:00
AnotherCommander
195eb15f3c Fixed broken reticle indicator cue on Macs, while at the same time fixing some Mac-specific warnings and cleaning up a bit the direction cue color code (thanks hoqllnq). 2017-10-07 11:54:48 +02:00
AnotherCommander
19017b08ee Fixed typo in the Win32 Deployment to Test Release Updater script. 2017-10-06 16:07:26 +02:00
KonstantinosSykas
f6bf782094 CHANGELOG update 
Update Doc/CHANGELOG.TXT as per the latest code changes, relevant to procedural Perlin 3D planet texture generation.
 2017-10-03 18:45:23 +03:00
AnotherCommander
9ef1ce93bb Perlin3D planets are now the default at the highest detail level (Extrq Detail). 2017-10-03 12:42:50 +02:00
KonstantinosSykas
538a0d6583 Procedural 3D Perlin noise terrain generation 2017-10-02 20:42:59 +03:00
AnotherCommander
3594e7e455 Windows port: Force restoring desktop resolution if we exit the app from full screen on a resolution different to that of the desktop. Should not be really necessary, but it looks that we need it for some Win10 Intel configurations. 2017-10-02 16:20:27 +02:00
phkb
399de8c449 making playership.compassTarget readwrite 2017-09-29 19:17:53 +02:00
AnotherCommander
16e47d9690 Merge branch 'master' of github.com:OoliteProject/oolite 2017-09-26 12:08:28 +02:00
AnotherCommander
f0ff146b56 Up to 8K resolution for SDL builds now possible. 2017-09-26 12:07:49 +02:00
phkb
5dd53ad72f updates to CHANGELOG 2017-09-13 11:55:54 +10:00
AnotherCommander
4fe0e39048 Updated comment in new JS primedEquipment property declaration and adjusted a curly brace style while at it. 2017-09-12 21:45:56 +02:00
phkb
ea4c4a3a2a Added primedEquipment property and playerChangedPrimedEquipment event (#256) 2017-09-12 21:36:24 +02:00
AnotherCommander
0119485ac6 Updated TODO comment regarding issue #204 fix to indicate that the applied fix is deemed satisfactory. 2017-08-18 18:55:40 +02:00
Nick Rogers
35d1eab7d2 Merge branch 'master' of https://github.com/OoliteProject/oolite 2017-08-10 11:52:13 +10:00
Nick Rogers
4e8a996acc Duplicate word in planet description 2017-08-10 11:50:37 +10:00
phkb
5a8538eae1 Added info regarding {get/set}ScreenBackgroundForKey 2017-08-08 08:14:00 +10:00
AnotherCommander
934bd29df1 Cleanup and optimizations on the default atmosphere shader. Thanks to CmdrSvengali for this contribution. Closes #254. 2017-08-07 00:16:07 +02:00
phkb
fd819d59de Adds get/set method to adjust values for screenbackgrounds.plist keys (#251) 2017-08-06 09:07:28 +02:00
phkb
55e3e28d3d Added displayColor items to changelog 2017-08-04 06:46:50 +10:00
AnotherCommander
4e19314dc2 Use the length function in the atnosphere shader for calculating the length of the vector of the relative position of the player ship and the atmosphere entity. Closes #253. 2017-08-03 00:50:34 +02:00
AnotherCommander
8e192e052f Merge pull request #247 from phkb/equipment_display_color 
Adds a "display_color" property to equipment items, used on equip ship screen
 2017-07-28 11:08:54 +02:00
phkb
3d31560ac6 Weapons and passenger berth displayColor picked up for status screen 2017-07-26 09:04:11 +10:00
phkb
4fda067a63 Add ability to set displayColor in JS, plus color now applied to status screen 2017-07-25 13:19:07 +10:00
AnotherCommander
665bd1999a Removed duplicate comment. 2017-07-23 17:41:17 +02:00
AnotherCommander
12c7aa1d2a More changelog updates. 2017-07-23 12:09:28 +02:00