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

7134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
11504bb64f Fix bad return of credits quantity 2017-06-06 12:29:30 +02:00
Jens Ayton
55212d4d02 Fix NSArray API misuse 2017-06-06 12:29:30 +02:00
Jens Ayton
3b4173596a Fix various type warnings 2017-06-06 12:29:30 +02:00
Jens Ayton
43328c7963 Fix various bad prototypes 2017-06-06 12:29:29 +02:00
Jens Ayton
aeb8f33364 Mac: Enable recommended warnings 2017-06-06 12:29:29 +02:00
phkb
c5a91cc87b Merge branch 'master' of https://github.com/OoliteProject/oolite 2017-06-04 14:36:33 +10:00
phkb
6637f9b33e Updates to Changelog and spelling corrections 2017-06-04 14:35:59 +10:00
AnotherCommander
cafd0de14a Merge pull request #227 from phkb/addCargoEntity 
Adding 'addCargoEntity' method to player ship
 2017-06-03 23:54:30 +02:00
phkb
82be186701 Further fixes for improved stability and code consistency 2017-06-02 08:37:01 +10:00
phkb
973f6b0bff Fix for crash when using 'addCargoEntity' with optional parameters 2017-06-01 17:10:55 +10:00
phkb
b22d53dfcb Adding 'addCargoEntity' method to player ship 2017-05-31 09:02:50 +10:00
phkb
412349ffe9 Updates to Changelog 2017-05-27 11:29:26 +10:00
Kevin Anthoney
fba8c967bb Fix #225 with BGS 2.0 backgrounds going AWOL 2017-05-26 18:37:25 +01:00
AnotherCommander
bb6f37f4d9 Merge pull request #224 from phkb/F7_Screen_Config 
F7 screen config and layout
 2017-05-26 16:27:14 +02:00
AnotherCommander
94bab6f551 Fixed conflicting types warning. 2017-05-24 21:50:39 +02:00
Kevin Anthoney
3e3e528556 Fix nova screen backgrounds when traversing route (#225) 2017-05-24 18:24:11 +01:00
phkb
6866e53437 F7 screen config and layout 2017-05-24 08:26:19 +10:00
AnotherCommander
9a7a947f6a Reverted ambient light recalibration and added the ambient_level = 0.25 line in planetinfo for each system instead. This way OXPs can change ambient level lighting on a per-system basis without requiring scripting. 2017-05-20 12:46:49 +02:00
AnotherCommander
0b12ed3a22 Attempted fix for gcc6 compile error 2017-05-19 18:29:27 +02:00
AnotherCommander
ae68efa00c Made default ambient level lower and removed a magic constant while at it by defining the SKY_AMBIENT_ADJUSTMENT macro. 2017-05-19 17:47:53 +02:00
KonstantinosSykas
5b608aa0ab Bump deps/mozilla 
* e909c46 GCC6 compile fixes
 2017-05-17 14:56:59 +03:00
AnotherCommander
64296a466c Merge pull request #223 from OoliteProject/perlin3d-as-param 
Perlin3D Planet and Atmosphere Textures as planetinfo.plist Option
 2017-05-13 18:55:27 +02:00
AnotherCommander
4cec746d09 Perlin3D planet and atmosphere textures are now optional by using the perlin_3d key in planetinfo.plist. They are disabled by default due to performance reasons. 2017-05-08 18:50:18 +02:00
AnotherCommander
c89def1b22 Added weaponsSystemsToggled script event handler. Takes the new weapons state as argument. 2017-05-05 00:00:30 +02:00
phkb
afc14831bb Updating CHANGELOG with cancelDockingRequest items 2017-05-03 10:08:10 +10:00
phkb
2633a73c47 Adding player.ship.cancelDockingRequest method 2017-05-03 09:11:47 +10:00
phkb
567e46b1e9 Adding player.ship.requestDockingClearance method 2017-04-19 10:38:19 +10:00
AnotherCommander
31394c505c Made the compass mode in the JS Player Ship class read/write. Contributed by Astrobe. 2017-03-26 19:45:34 +02:00
AnotherCommander
6b3704cf6e Fixed clouds on planets and also the miniature rendering on the F7 screen. 2017-03-19 01:37:54 +01:00
AnotherCommander
85f6099401 Merge pull request #220 from OoliteProject/atmosphere-improve 
Support for shader + texture atmosphere drawables simultaneously
 2017-03-19 00:21:15 +01:00
AnotherCommander
d7c2915d0b Added a bit of commentary 2017-03-16 10:29:24 +01:00
AnotherCommander
5442cc8a86 Enabled both shader and texture materials for atmospheres. The clould layer of a planet can now co-exist with the new shader atmospheres. 2017-03-15 22:03:20 +01:00
Kevin Anthoney
44254411b7 Add issue #204 fix to changelog 2017-03-14 13:50:27 +00:00
Nick Rogers
b0882fdea9 Updates to Changelog 2017-03-12 13:28:27 +11:00
Nick Rogers
9d9f67d4c3 Adding playerDockingClearanceGranted JS event 2017-03-12 09:07:46 +11:00
Kevin Anthoney
bddef55dc5 add TODO comment for issue #204 fix 2017-03-10 21:22:29 +00:00
Kevin Anthoney
16e2498a2d attempt to solve issue 204 by setting missile_list elements to nil 2017-03-09 22:39:34 +00:00
AnotherCommander
15eb90fd79 Removed warning-generating test commodity data from Easy Start scenario. 2017-02-17 17:04:27 +01:00
AnotherCommander
16dcffc86f Experimental addition of Easy Start scenario (docked at Tionisla, 1000 Cr). 2017-02-16 20:51:48 +01:00
AnotherCommander
90b06abdfe Some more updates to the changelog. 2017-01-26 11:52:52 +01:00
Kevin Anthoney
da4b3f7361 Remove jumps line from long range chart and contracts screen to avoid clashes 2017-01-25 13:16:48 +00:00
AnotherCommander
9d5ffb47aa Do not rely on DESC_PLURAL for reporting travel time on sysdata screen; fixes cases where the integer part of travel time is 1. 2017-01-24 21:27:14 +01:00
AnotherCommander
43bbdac795 Return Linux deps to their current revision. 2017-01-24 21:08:11 +01:00
Kevin Anthoney
0dab7143a5 Merge branch 'master' of https://github.com/OoliteProject/oolite 2017-01-24 19:51:54 +00:00
Kevin Anthoney
f3c7b9e5be Add number of jumps to F6 chart screen 2017-01-24 19:50:58 +00:00
AnotherCommander
3ae3988347 Fixed incomplete implementation of class RouteElement warning and added distinction between singular and plural forms for hours and jumps on system data screen. 2017-01-23 19:40:40 +01:00
Kevin Anthoney
da688e4b5d Put systems data route info strings in descriptions.plist 2017-01-23 17:27:25 +00:00
Kevin Anthoney
100d2f990e Start new section of changelog 2017-01-22 22:15:24 +00:00
Kevin Anthoney
a423030438 Add number of jumps to route information on F7 screen 2017-01-22 22:07:21 +00:00
AnotherCommander
bd7bc02823 Reinstated rotational_velocity also for base entities and made the shipdata entry recognizable both as string and as quaternion format. Closes #218. 2017-01-22 16:26:09 +01:00