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

6952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AnotherCommander
4b322372a4 HUD Weapons Offline and FPS counter texts have now configurable colors by means of the rgb_color key in hud.plist. 2017-07-03 02:35:29 +02:00
AnotherCommander
71cf3d8f07 Generate noteGuiWillChange notification also when going to short and long range chart screens. Closes #233. 2017-06-25 13:04:23 +02:00
AnotherCommander
88cbd02664 Windows port: Fixed broken first-time window resize when starting the game with -nosplash. 2017-06-23 15:12:01 +02:00
AnotherCommander
4b68e0ce09 Merge pull request #232 from phkb/primed_equip_events 
Adds events and controls for MFDs and primed equipment
 2017-06-18 15:04:36 +02:00
phkb
32f288fe0d fixes for streamlined code and readability 2017-06-18 20:03:37 +10:00
phkb
0b475d91be setPrimedEquipment can now have a blank param, and messages can be suppressed 2017-06-18 14:28:24 +10:00
phkb
08eff89a48 revert to prior equip and visual notification of change 2017-06-17 12:02:02 +10:00
phkb
bf20a8784a setting return val for setPrimedEquipment 2017-06-16 16:20:45 +10:00
AnotherCommander
7eae3c8282 Fixed crash in JavaScript profiler. 2017-06-16 01:42:58 +02:00
AnotherCommander
ab0302d421 Windows port: Oolite is now DPI-aware. Closes #229. 2017-06-14 19:47:27 +02:00
AnotherCommander
32cbe37324 Fixed bogus warning about not setting v-sync even when v-sync was correctly set. 2017-06-13 15:18:39 +02:00
phkb
6422e13710 Adds events and controls for MFDs and primed equipment 2017-06-12 16:00:52 +10:00
AnotherCommander
feb6270180 Fixed potential mode duplication in screen modes list, which in some cases could result in not being able to select desired fullscreen resolution properly. 2017-06-08 22:16:26 +02:00
AnotherCommander
2ba6cf6c65 Merge pull request #230 from OoliteProject/travis-fix-test 
Fix Travis builds
 2017-06-07 16:07:10 +02:00
Jens Ayton
a00a80e17a Fix Travis builds 2017-06-07 09:05:32 +02:00
Jens Ayton
61f1127039 Mac: Remove profiler marker macros 
These are no longer supported by Instruments and the replacement
isn't drop-in.
 2017-06-06 12:34:00 +02:00
Jens Ayton
020c8ac003 Fix bracketing error 2017-06-06 12:29:30 +02:00
Jens Ayton
5de272321b Fix MiniZip comma misuse 2017-06-06 12:29:30 +02:00
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