6446 Commits

Author SHA1 Message Date
AnotherCommander
e532352167 Renamed macro OO_FOV_BY_KEY_ENABLED to OO_FOV_INFLIGHT_CONTROL_ENABLED and extended this compile-time switc functionality also to joystick control. 2015-04-03 17:15:32 +02:00
AnotherCommander
1db36e947f Merge branch 'master' of github.com:OoliteProject/oolite 2015-04-03 16:43:45 +02:00
AnotherCommander
17db38c325 Global FOV now belongs to the MyOpenGLView class. The player entity related fieldOfView variable remains for possible future player JS associated property. 2015-04-03 16:42:41 +02:00
cim
bfc5ed74d0 Update changelog 2015-04-03 15:27:12 +01:00
AnotherCommander
4d20bd0988 Added Day to contributors list. 2015-04-03 16:11:19 +02:00
cim
d483a2a18b More work on explosions and wreckage
shipdata.plist gets show_damage property to control if sparks, etc. are shown
default to no if energy recharge is zero, yes otherwise, to mimic existing
behaviour.
Set hermit explicitly.
2015-04-03 14:44:24 +01:00
cim
9a42498ab2 Remove debug statements 2015-04-03 14:44:24 +01:00
cim
b03fd0e7fb Light particles can't collide 2015-04-03 14:44:24 +01:00
AnotherCommander
7549cb3fd0 Merge pull request #126 from DaymareOn/master
Added ability to increase and decrease the field of view.
2015-04-03 15:42:58 +02:00
cim
2092e0f766 Second parameter to ship.dumpCargo(amount, type)
Preferred cargo type of first pod to be dumped
2015-04-02 13:50:16 +01:00
cim
2ad8320098 Allow precise adjustment of cargo on NPC cargo carriers
ship.adjustCargo(commodity,amount)
2015-04-02 13:50:16 +01:00
AnotherCommander
6a8e5bd4bc One more attempt to fix the Last Updated date in the OXZ Manager. 2015-04-02 14:22:43 +02:00
cim
fa4ee4909c More tuning of manifest screen alignment 2015-04-02 11:32:25 +01:00
cim
c661082ff3 Update changelog 2015-04-02 11:04:17 +01:00
cim
f4e30d5b6c Adjust indentation on manifest screen for consistency 2015-04-01 13:21:53 +01:00
cim
7a4444b287 Allow negative width/height on HUD bars to make them extend the other way 2015-04-01 11:41:37 +01:00
cim
dddb223104 Allow right-align on hyperspace destination 2015-04-01 11:20:21 +01:00
cim
6b568187fa Try again to fix build warnings which don't occur here. 2015-04-01 11:13:46 +01:00
cim
cc8b9f53af Fix bug identified by phkb in home/destination generation 2015-04-01 11:10:28 +01:00
cim
76d6f06da4 Fix checkScanner not correctly ignoring unpowered ships 2015-03-31 16:18:02 +01:00
cim
e559fc034d Add import of NSDate.h 2015-03-31 16:08:51 +01:00
Kevin Anthoney
ce672ab7cd Make sure weapons stats are accurate after leaving dock, too 2015-03-28 13:06:43 +00:00
Kevin Anthoney
2fdd53f50a Merge branch 'master' of github.com:OoliteProject/oolite 2015-03-28 13:01:21 +00:00
Kevin Anthoney
c5c184c2b0 fix bug which prevented laser from being shot after hyperspace 2015-03-28 13:00:46 +00:00
cim
9d1668ffe2 Prevent misjumps on the first jump from a normal start. 2015-03-28 08:39:35 +00:00
Day
f76dd80146 We allow the variation of fov by keys only in non-deployment releases. 2015-03-26 09:20:02 +01:00
Day
f1f2ea8358 Cleaning: we do not need anymore the delta_t variable in the
pollViewControls method.
2015-03-25 19:22:42 +01:00
cim
83f170bb2d Add "last updated" visibility to the OXZ Manager, reformat size indicators 2015-03-25 18:10:35 +00:00
Day
403b098e24 The in-flight fov cannot be changed while in GUI anymore. 2015-03-24 20:45:08 +01:00
cim
9f6972a70d Try to fix issues with ships entering hyperspace near large stations 2015-03-24 18:45:57 +00:00
Day
43c53d3688 We reset field of view in setupAndConfirmOK 2015-03-24 14:49:29 +01:00
cim
afc1e98416 In "extra detail" mode, use even higher resolution planet textures.
Less blurry look from orbit, and seems to generate in acceptable time.
4096x4096 scale works fine with a modern graphics card too, and looks even
better ... but we'd need to get pre-generation of planet textures working
first to avoid unpleasant pauses when exiting hyperspace.

This is slightly experimental - it works for me but needs testing on other
high-end (by Oolite standards...) systems as well.
2015-03-23 18:30:48 +00:00
Jens Ayton
addc2d475d Fix some signed vs unsigned stuff 2015-03-18 19:54:31 +01:00
cim
a5afffeb20 Fix bug with label colour of selected system 2015-03-17 18:17:26 +00:00
Kevin Anthoney
aa6f69a7c6 remove some debugging that got into last commit 2015-03-16 19:20:32 +00:00
Kevin Anthoney
2960af69b7 Stop changing chart position when switching screens or zooming in 2015-03-16 19:04:37 +00:00
Kevin Anthoney
bff24c83c0 Merge remote branch 'upstream/master' 2015-03-16 18:35:09 +00:00
cim
eeaf83c14a Ensure main station exists before checking its properties 2015-03-16 18:13:36 +00:00
cim
e77882ac51 Allow reachable systems to have different F6 colour labels. 2015-03-16 17:59:42 +00:00
cim
b55937e527 Revert accidentally committed test line 2015-03-15 12:09:51 +00:00
cim
82f4759cce More jump distance indicator GUI customisation possible 2015-03-15 12:08:23 +00:00
AnotherCommander
a7c2a76aa8 Fixed buggy handling of spoken language and gender selections for the SDL builds. 2015-03-14 17:33:49 +01:00
Day
134cd5834f Doxygen config file. Use "doxygen Doxyfile" to generate the
documentation.
2015-03-14 17:16:16 +01:00
cim
ce9495e7df Allow alternative display of current jump destinations
To activate, set chart_currentjump_color in gui-settings.plist
(and maybe also set alpha = 0 on chart_range_color)
2015-03-14 11:40:26 +00:00
cim
da31e9f751 Make scrape damage fragment chance selective (fixes #14) 2015-03-14 10:49:43 +00:00
Day
4fccd8339e Field of view ratio is not applied when in GUI 2015-03-12 09:25:09 +01:00
cim
842bd86633 Add second 'price' parameter to playerBoughtNewShip event
(zero for scripted changes, does not include trade-in value of old ship)
2015-03-10 20:20:03 +00:00
AnotherCommander
d34a9a4a08 Fixed incorrect comment. 2015-03-10 18:11:10 +01:00
Day
8e11fdd9c6 Added ability to increase and decrease the field of view. 2015-03-09 23:01:59 +01:00
AnotherCommander
bdccd135ad Faster switching to/from full screen under Windows. Resolves also an issue where the game window would not open up exactly in the center of the screen, as desired. 2015-03-09 09:40:21 +01:00