58d08ede52
Remove main menu buttons from C++ CPanel
2017-05-08 18:44:58 +02:00
0623624047
Remove C++ UI code for projected bodies
2017-05-03 10:26:37 +02:00
94a93d8c64
Add combat target pro- and retrograde indicators
...
Also remove redundant text (combat target speed / distance) that is shown
already near the reticule.
2017-05-03 10:16:00 +02:00
5075b3483c
Set the overlay colour for text item, and use it for the hull pressure indicator.
2017-05-02 20:15:47 +01:00
1f336bef4b
Prepare C++ for imgui HUD.
...
Remove the existing C++ HUD, add necessary functions for lua.
2017-04-24 10:35:50 +02:00
2013fae968
Make ship code modular
...
Closes #3914
Solves #2012
2017-02-07 17:47:46 +01:00
74d50958fe
MERRY HAPPY 2017
2017-01-04 15:11:15 +00:00
7c20fce6cf
Merge pull request #3876 from jaj22/fix-orphan-connections
...
Fix orphaned connections in WorldView
2016-11-24 11:46:47 +00:00
31730c0293
Fix orphaned connections in WorldView
2016-11-23 20:53:37 +00:00
1036e9e33f
Workaround for player ship label jittering in external view due to positioning at exact screen centre
2016-11-19 00:17:14 +00:00
e61465015f
call it target scanner also internally
2016-10-31 14:48:04 +01:00
b8a0df405d
"Probability to jump:" -> "Jump complete:"
2016-08-22 14:51:27 +02:00
b9cfe0f440
Ship knows when a hyperjump is legal or not
2016-08-17 16:46:07 +02:00
a296c54546
Hyperspace button uses three more icon-states
2016-08-17 10:18:32 +02:00
f6e1ff8381
prefix std:: to isnan so it builds on Linux
2016-08-11 15:45:09 +01:00
b983219c44
Prevent calculateHeadingPitch from generating NaN values.
2016-08-09 22:17:19 +01:00
092eb8852f
Remove bogus assert.
2016-05-25 12:09:35 +01:00
2f6a80e171
Get the function name and line number for all render error checking
2016-04-27 21:46:15 +01:00
fea5ac26b2
MERRY HAPPY 2016
2016-01-29 11:31:54 +00:00
c9ceb3a71b
fix spelling of LONGITUDE. fixes #3573
2015-12-19 22:44:25 +00:00
9f5747b2a0
round 359.5 degrees up to 0 (=360) degrees. fixes #3550 .
2015-12-11 23:58:28 +00:00
78194add73
translation for #3499
2015-12-06 18:10:44 +01:00
6f29670b8a
1. buttons used for requesting a time acceleration / deceleration are now rebindable from the Settings view; the default values are still set to PageUp (time acceleration) and PageDown (time deceleration)
...
2. the function has been extended to all views
3. default keybinding for mapViewShiftForward / mapViewShiftBackward have been changed to avoid conflicts with the request time acceleration / deceleration function
2015-12-06 12:16:18 +01:00
dc617f5094
Variable shadowing
2015-11-09 18:58:22 +00:00
74112b71ec
Use tabs for indentation.
2015-10-31 14:12:37 +00:00
0b64eaf050
fixed indentation
2015-10-29 17:25:29 -04:00
27b69be6a7
slight position change of lat/lon + uncomment #include utils.h
2015-10-21 11:03:35 -04:00
e6c851f29a
display in degree/minute/second format and moved status bars up
2015-10-21 08:29:20 -04:00
c96d0ea0bd
Showing Lat/Lon whenever altitude is shown (test version with different lat/lon displays)
2015-10-19 14:33:38 -04:00
d73330b72c
Added lat/lon display whenever the player is < 10 km from planet surface
2015-10-16 16:44:17 -04:00
032affcf9d
Show more info to help Frame debugging in future.
2015-10-11 18:44:44 +01:00
a859578150
Changed totalMass to staticMass since it's a measure of the unchanging weight of the ship.
...
Kept totalMass around for backwards compatiblity with mods.
Account for the fuel mass in the hyperspace jump duration.
2015-10-10 15:32:43 +01:00
8bbba7c717
Split the flightstate DOCKING into an UNDOCKING state as well
...
The new UNDOCKING state behaves identical to DOCKING for now,
except it shows the text "Undocking" when so doing, instead of
"Docking". Thus this cosmetic modification fixes #3480 .
2015-10-08 17:41:58 +02:00
bfed53f0b8
Fix indentation
2015-10-07 12:13:48 +02:00
f77164453f
Merge pull request #3438 from impaktor/twostate_hyperspace_button
...
Two state hyperspace button
2015-09-04 12:29:27 +01:00
c09125d39e
Don't change hyperbutton-state when pressed while docked or landed
2015-08-13 19:10:06 +02:00
f13abdc6c9
Must reset hyperspace button after jump
2015-08-13 08:46:40 +02:00
894f3da7ea
Hyperspace button has two states: engage/abort
2015-08-13 08:46:40 +02:00
70c3c3ae13
Fixed nan on burn indicator
2015-08-10 15:20:37 +02:00
7e575f0b07
Cherry-picked many features from testing branch
...
Many interesting features have been introduced without changing the
main graphical appealing:
* Introduced Orbit::OrbitalTimeAtPos. Very useful to predict future
characteristics of an orbit
* Better ingame support for orbital transfer planner: ETA label, real
burning indicator (thanks to OrbitalTimeAtPos!) and time controls
support.
* Changed the scale of the time controls for a better low-scale
adjustments
* Fixed a stupid bug where the burning indicator was showed only when
moving
2015-08-10 14:21:39 +02:00
4fc3442cef
Fixed burn indicator and nicer orbit draw
...
There was a bug about the burn indicator, not the vector is correctly
calculated.
Now an estimation of the number of points needed to draw the orbital is
performed, and the obtained curve is smoother.
2015-08-10 14:20:18 +02:00
11933f783e
Added new way to handle planner
...
Now it is possible to specify when the maneuver will start. It adds new
buttons inside SystemView to change that value.
The system still does not work completely: the speed value at a
specific time of the orbit must be calculated. Soon...
Squash commit: reverted changes to json lang data, except en.json
2015-08-10 14:20:18 +02:00
c448610a2e
Changed the way planner works
...
Now the planner uses a fixed point to evaluate parameters and the final
orbit. In this way in is possible to really plan a manouver and apply
thrust until satisfied.
In this commit it is only possible to start the transfer manouver from
the actual position of the player. This will be changed in future
commits.
2015-08-10 14:07:36 +02:00
999c915fa8
bodyscanner and SensorType. fixes #3287
2015-06-25 20:04:56 +02:00
eba5df82ad
Merge branch 'master' of git://github.com/pioneerspacesim/pioneer into JSONSerialise
2015-03-10 22:50:36 +00:00
44520a4be2
allow using already set mode to reset view mode
2015-03-09 09:24:56 +01:00
dc36866d93
Removing more old serialisation code.
2015-02-17 23:41:57 +00:00
550b9a6a32
Added missing JSON serialisation function in WorldView.cpp
2015-02-16 00:54:30 +00:00
5ff0bed893
Added JSON serialisation code for views.
2015-02-15 15:41:24 +00:00
91f206a034
Merge remote-tracking branch 'impaktor/cleanup_equip_str'
2015-01-25 21:48:54 +11:00
b750e6179b
move renderer error checks onto the renderer
2015-01-07 07:54:45 +11:00
2ff79c01fa
Remove all of the DrawLines and DrawPoints method calls.
2015-01-02 22:43:26 +00:00
9935b16aec
GalacticView using Points, SpeedLines using Lines, WorldView constness, Bug Fix Drawables::Points
2015-01-02 17:36:49 +00:00
9f95339a9d
MERRY HAPPY
2014-12-31 23:05:37 +11:00
0878786d70
Don't use the same autopilot language string
...
for "ship under AUTOPILOT control" and "AUTOPILOT ship equipment".
2014-12-30 20:27:44 +01:00
3470065f2e
Merge branch 'master' of https://github.com/pioneerspacesim/pioneer into GL33
2014-11-13 20:48:38 +00:00
ad0bc01f62
Fix the crosshair rendering, fully remove the old method.
2014-10-20 19:22:59 +01:00
54b1ec45ff
No more glLineWidth post OpenGL 3.x
2014-10-14 20:43:09 +01:00
9ad8b6ced6
Disable wheel button if lowering would be dangerous.
2014-10-01 19:06:46 +02:00
949e20fe20
GalacticView, SectorView, SystemView, SystemInfoView and WorldView no longer use global Galaxy object.
2014-09-26 18:21:47 +02:00
51a76abb5c
Remove extra semicolon.
2014-09-26 18:18:56 +02:00
0d6383699b
Renamed data.glsl to attributes.glsl.
...
Fixed up unsigned to signed int comparisons.
Removed unused variables.
2014-09-23 19:48:52 +01:00
e9733bb5f0
Convert some of WorldView to use newer Drawables classes - fixes last rendering bug I know of.
2014-09-23 09:31:08 +01:00
0f5650a53e
Remove DrawLines2D, Node::DrawAxes.
...
Reimplement both DrawLines methods.
Add a bunch of profiling code to Drawables classes.
2014-09-21 18:38:11 +01:00
8b72c4bdca
Eliminate Pi::sectorView.
2014-09-15 21:01:24 +02:00
b84caaf484
Eliminate Pi::cpan.
2014-09-15 21:01:23 +02:00
7637f8bc2f
Pass Game to DeathView and WorldView.
2014-09-15 21:01:23 +02:00
06bedca77b
Merge branch 'master' of https://github.com/pioneerspacesim/pioneer into better_docking
...
Conflicts:
src/SpaceStation.cpp
2014-09-06 15:10:30 +01:00
2f8212f2dc
Added Advanced Radar Mapper ship equip.
...
It is a long range radar mapper that has the ability to give information on
ships selected in orbital view. It uses same slot as the normal radar mapper.
2014-08-15 11:38:10 +02:00
e7981ffef7
use msg log instead
2014-08-08 15:00:31 +02:00
d4bcf34f91
lang and logic cleanup
2014-08-08 14:59:16 +02:00
f413fd55a6
don't create and destroy widgets or reconnect signals every frame
2014-08-08 14:57:40 +02:00
3e9616c781
use frame-relative position in WorldView.cpp calculateHeadingPitch
2014-08-08 14:57:40 +02:00
f97da1f095
click
2014-08-08 14:57:40 +02:00
0f1005589b
convert WorldView heading & pitch labels to new-ui
2014-08-08 14:57:40 +02:00
a68cafc8e8
display heading and pitch
2014-08-08 14:57:40 +02:00
1f8a5e4a6b
Fix hypercloud analyzer target button overlapping
...
In F4 communications menu when having a hypercloud selected,
the button was on top of the other buttons.
2014-08-05 15:46:19 +02:00
145dabdb64
Merge branch 'master' of https://github.com/pioneerspacesim/pioneer into LuomuMsgLog
...
Conflicts:
src/Makefile.am
src/Pi.cpp
src/Pi.h
src/SectorView.cpp
src/Ship.cpp
src/ShipCpanel.cpp
src/ShipCpanelMultiFuncDisplays.cpp
src/WorldView.cpp
win32/vc2010/pioneer.vcxproj
win32/vc2010/pioneer.vcxproj.filters
win32/vc2012/pioneer.vcxproj
win32/vc2012/pioneer.vcxproj.filters
win32/vc2013Express/pioneer.vcxproj
win32/vc2013Express/pioneer.vcxproj.filters
2014-07-30 23:25:32 +01:00
f3029d3b7f
add hud icons
2014-07-29 21:26:52 +02:00
6f1f652d19
Merge branch 'master' of https://github.com/pioneerspacesim/pioneer into better_docking
2014-07-29 20:18:31 +01:00
6c27522866
initial
2014-07-23 19:47:47 +02:00
f63617c541
Allow the external cameras when docked.
2014-07-20 16:31:30 +01:00
3776fd13f1
whitespace fixes
2014-07-16 15:17:05 +01:00
046b6c5170
Merge remote-tracking branch 'dvolk/attitude-autopilot-2'
2014-07-16 15:14:54 +01:00
20de2a6cc0
arrange attitude autopilots into two columns
2014-07-16 15:54:12 +02:00
bc38d8d174
use GetName() method to retrieve hyperdrive equipment name for radar mapper
...
fixes #3054
2014-07-15 19:30:31 +01:00
4a559b5621
attitude autopilot v2
2014-07-05 08:16:24 +02:00
219b934724
Merge pull request #2974 from dvolk/retro-indicator
...
add retro velocity indicator to worldview
2014-06-29 10:42:34 +01:00
111f23934e
use navtarget if it exists
2014-06-28 12:41:48 +02:00
af9330a65a
add retro velocity indicator to worldview
2014-06-28 10:51:56 +02:00
5745e0b815
Bunch of n-e capabilities conversions
2014-06-26 15:56:01 +02:00
a13aadbf89
Convert the laser handling to n-e
2014-06-26 15:56:00 +02:00
a7f97faa0f
Replace the C++ hyperjump handling by a Lua-based system
2014-06-26 15:56:00 +02:00
7316c7d38e
WorldView: Update radar handling to use capabilities
2014-06-26 15:55:58 +02:00
a065b5a152
Include "HudTrail.h" now I've removed it from "Ship.h"
2014-05-09 21:54:37 +01:00
85d92c4769
hull damage bar, visible when hull <= 99.9% - related to #2901 - WorldView.cpp
2014-05-07 16:23:15 +02:00
3ca0a5b142
Move StarSystem::cache and StarSystem::attic to Galaxy class.
2014-05-06 21:15:46 +02:00
4634b5fb61
Move Sector::cache to Galaxy class.
2014-05-06 21:15:46 +02:00
002a7b6724
Use GalaxyObjectCache template for StarSystemCache.
2014-04-26 17:15:32 +02:00
87edcea926
Rename SectorCache.* to GalaxyCache.*
2014-04-26 17:15:32 +02:00
Peter
Andrew Copland
mike-f1
Andrew Copland
John Jordan
Karl F
John Bartholomew
radius75
Sal Borrelli
Claudius Mueller
Edoardo Morandi
cccpxx78
nick-the-ninja
Denis Volk
Robert Norris
Lars W. (lwho)
Simon Chopin