Permalink
Browse files

Merge branch 'master' into new-ui

  • Loading branch information...
2 parents a7a60b5 + b2b8d20 commit a572204acd2fc900175a3c7fa1a092b7c208dcae @robn robn committed Sep 24, 2012
Showing with 1,194 additions and 610 deletions.
  1. +9 −0 Changelog.txt
  2. +26 −10 Quickstart.txt
  3. BIN data/icons/{cam_front.png → cam_internal.png}
  4. BIN data/icons/{cam_front_on.png → cam_internal_on.png}
  5. BIN data/icons/cam_rear.png
  6. BIN data/icons/cam_rear_on.png
  7. +2 −2 data/lang/Catala.txt
  8. +2 −2 data/lang/Deutsch.txt
  9. +32 −6 data/lang/English.txt
  10. +2 −2 data/lang/Francais.txt
  11. +2 −2 data/lang/Hrvatski.txt
  12. +2 −2 data/lang/Italiano.txt
  13. +2 −2 data/lang/Magyar.txt
  14. +2 −2 data/lang/Nederlands.txt
  15. +34 −8 data/lang/Polski.txt
  16. +2 −2 data/lang/Romanian.txt
  17. +2 −2 data/lang/Spanish.txt
  18. +2 −2 data/modules/Assassination/Languages.lua
  19. +2 −2 data/modules/BreakdownServicing/Languages.lua
  20. +8 −8 data/modules/DeliverPackage/Languages.lua
  21. +1 −1 data/modules/DonateToCranks/Languages.lua
  22. +1 −1 data/modules/Taxi/Languages.lua
  23. +11 −3 data/ships/adder.lua
  24. +11 −3 data/ships/asp_explorer.lua
  25. +11 −3 data/ships/boa_freighter.lua
  26. +11 −3 data/ships/caribou.lua
  27. +11 −3 data/ships/cobra.lua
  28. +11 −3 data/ships/cobra3.lua
  29. +11 −3 data/ships/constrictor.lua
  30. +11 −4 data/ships/eagle_lrf.lua
  31. +11 −4 data/ships/eagle_mk2.lua
  32. +11 −4 data/ships/eagle_mk3.lua
  33. +11 −4 data/ships/eagle_mk4.lua
  34. +11 −3 data/ships/eye.lua
  35. +11 −3 data/ships/flowerfairy.lua
  36. +11 −3 data/ships/hammerhead.lua
  37. +11 −3 data/ships/imperial_courier.lua
  38. +3 −3 data/ships/imperial_trader.lua
  39. +11 −3 data/ships/ip_shuttle.lua
  40. +11 −3 data/ships/ladybird_starfighter.lua
  41. +11 −3 data/ships/lanner.lua
  42. +3 −3 data/ships/long_range_cruiser.lua
  43. +3 −3 data/ships/lynx_bulk_carrier.lua
  44. +11 −3 data/ships/meteor.lua
  45. +1 −1 data/ships/missile_guided.lua
  46. +1 −1 data/ships/missile_naval.lua
  47. +1 −1 data/ships/missile_smart.lua
  48. +1 −1 data/ships/missile_unguided.lua
  49. +11 −3 data/ships/natrix.lua
  50. +11 −3 data/ships/sidewinder.lua
  51. +11 −3 data/ships/sirius_interdictor.lua
  52. +11 −3 data/ships/stardust.lua
  53. +11 −3 data/ships/talon_military_interceptor.lua
  54. +11 −3 data/ships/turtle.lua
  55. +11 −3 data/ships/viper_defence_craft.lua
  56. +11 −3 data/ships/viper_police_craft.lua
  57. +11 −3 data/ships/viper_x.lua
  58. +11 −3 data/ships/wave.lua
  59. +2 −1 scripts/nightly-build.pl
  60. +1 −0 src/GalacticView.h
  61. +127 −116 src/GameMenuView.cpp
  62. +10 −2 src/GameMenuView.h
  63. +50 −42 src/InfoView.cpp
  64. +2 −1 src/InfoView.h
  65. +26 −95 src/KeyBindings.cpp
  66. +8 −33 src/KeyBindings.h
  67. +97 −0 src/KeyBindings.inc.h
  68. +16 −3 src/LangStrings.inc.h
  69. +1 −0 src/ObjectViewerView.h
  70. +2 −7 src/Pi.cpp
  71. +2 −1 src/SectorView.h
  72. +15 −2 src/Ship.cpp
  73. +13 −0 src/Ship.h
  74. +10 −15 src/ShipCpanel.cpp
  75. +12 −1 src/ShipType.cpp
  76. +6 −0 src/ShipType.h
  77. +2 −1 src/SpaceStationView.h
  78. +2 −2 src/SystemInfoView.cpp
  79. +2 −2 src/SystemInfoView.h
  80. +1 −0 src/SystemView.h
  81. +15 −13 src/View.cpp
  82. +5 −3 src/View.h
  83. +115 −29 src/WorldView.cpp
  84. +18 −4 src/WorldView.h
  85. +61 −16 src/WorldViewCamera.cpp
  86. +26 −14 src/WorldViewCamera.h
  87. +31 −20 src/graphics/Graphics.cpp
  88. +11 −1 src/graphics/Graphics.h
  89. +31 −20 src/gui/GuiContainer.cpp
  90. +9 −5 src/gui/GuiContainer.h
  91. +0 −1 src/gui/GuiFixed.cpp
View
@@ -4,10 +4,15 @@ Alpha 27
* The settings screen is now acessible from the main menu (#1187, #1512)
* There's now an option to enable texture compression (#1522)
* New mission type, Scout (get paid to scan particular planets) (#1348, #779)
+ * New view modes (Left/Right/Top/Bottom, Cockpit Front/Rear) (#1454, #1539, #1544)
+ NOTE -- view mode controls are bound to Numeric Keypad by default
+ (they can be rebound in the View tab of the Settings screen)
* Minor changes and tweaks
* Smooth zoom animation in World, System, Sector and Galactic views (#1170)
* Earth start location has returned to Los Angeles (in daytime now) (#1506)
+ * Player cash is shown on the 'Personal' page of the Info (F3) screen (#1525, #1500)
+ * Equipment listed on the Info (F3) screen is split over two columns (#1525, #1527)
* Fixes
* Avoid icons in some ternary systems overlapping each other (#1510, #1511)
@@ -19,6 +24,7 @@ Alpha 27
* EventQueue, which was deprecated in alpha 26, has been removed (#1485)
* Orbital phase (season) and rotational phase (time) can now be set in custom
systems with :rotational_phase_at_start and :orbital_phase_at_start (#1506)
+ * Thruster values in ship definitions are now all positive (#1536)
* Internal changes
* Terrain generation thread now sleeps until being signalled (#1169)
@@ -27,6 +33,9 @@ Alpha 27
* Many minor cleanups identified by valgrind (#1524)
* Copyright and license is now made explicit at the top of all code files (#1515)
* Max terrain height for heightmapped planets is computed more accurately (#1504)
+ * Code to detect supported video modes has moved to Graphics (#1535, #1385)
+ * Cleaned up UI view code for consistency and stability (#1528)
+ * Removed duplication in key bindings code (#1545)
Alpha 26
View
@@ -9,18 +9,34 @@ the mouse.
The eight main console buttons are activated by the F1-F8 keys or the mouse.
-F1: Change view.
+F1: Change view mode (cockpit/external/sidereal)
F2: Use the map system.
F3: Look at your own information.
F4: Select targets, operate autopilot and communicate.
+The view direction can be controlled, with keys:
+KP 8: Front Camera / Rotate External/Sidereal Up
+KP 2: Rear Camera / Rotate External/Sidereal Down
+KP 4: Left Camera / Rotate External/Sidereal Left
+KP 6: Right Camera / Rotate External/Sidereal Right
+KP 9: Top Camera
+KP 3: Bottom Camera / Roll External/Sidereal Right
+KP 7: Cockpit view forward
+KP 1: Cockpit view rearward / Roll External/Sidereal Left
++: Zoom in (external/sidereal view only)
+-: Zoom out (external/sidereal view only)
+Home: Reset zoom (sidereal view only)
+
+(NOTE: If you do not have a numeric keypad, please rebind the view direction
+controls from the View tab in the Settings screen)
+
The next four buttons change function depending on the first four. Hover the
mouse over them to see what they do.
F5 turns off the autopilot, and changes between manual flight and set speed
-flight
+flight.
-To fly your ship manually, the keys are:
+Flight controls are:
Q: Roll left
W: Pitch forward
E: Roll right
@@ -34,13 +50,13 @@ J: Starboard thruster (slide left)
K: Forward thruster (go backwards)
L: Port thruster (slide right)
-In "set speed" mode, the keys are:
-Q: Roll left
-W: Pitch forward
-E: Roll right
-A: Yaw left
-S: Pitch up
-D: Yaw right
+In manual flight mode, the thrusters only fire when you tell them to.
+In "set speed" mode, the autopilot tries to keep your velocity vector
+in the direction that your vehicle is facing, with a constant speed.
+Thruster controls still work in "set speed" mode, and override the
+autopilot while you hold the thrust key down.
+
+"Set speed" controls:
Enter: Set speed faster
RightShift: Set speed slower
File renamed without changes
File renamed without changes
View
Deleted file not rendered
View
Deleted file not rendered
View
@@ -740,9 +740,9 @@ SHIP_IS_FULLY_LADEN
La vostra nau està completament carregada.
YOU_DO_NOT_HAVE_ANY_X
No teniu cap %item.
-FRONT_VIEW
+CAMERA_FRONT_VIEW
Vista anterior
-REAR_VIEW
+CAMERA_REAR_VIEW
Vista posterior
EXTERNAL_VIEW
Vista externa
View
@@ -705,9 +705,9 @@ SHIP_IS_FULLY_LADEN
Ihr Schiff ist voll.
YOU_DO_NOT_HAVE_ANY_X
Sie haben keine Waren des Artikels %item.
-FRONT_VIEW
+CAMERA_FRONT_VIEW
Sicht nach vorn
-REAR_VIEW
+CAMERA_REAR_VIEW
Sicht nach hinten
EXTERNAL_VIEW
Außenansicht
View
@@ -500,8 +500,8 @@ N_LIGHT_YEARS_N_MAX
%distance{f.1} light years (%maxdistance{f.1} max)
SHIP_INFORMATION
Ship information
-REPUTATION
- Reputation
+PERSONAL
+ Personal
MISSIONS
Missions
SHIFT
@@ -746,14 +746,38 @@ SHIP_IS_FULLY_LADEN
Your ship is fully laden.
YOU_DO_NOT_HAVE_ANY_X
You do not have any %item.
-FRONT_VIEW
- Front view
-REAR_VIEW
- Rear view
+FRONT_COCKPIT_VIEW
+ Front cockpit view
+REAR_COCKPIT_VIEW
+ Rear cockpit view
+CAMERA_FRONT_VIEW
+ Front camera
+CAMERA_REAR_VIEW
+ Rear camera
+CAMERA_LEFT_VIEW
+ Left camera
+CAMERA_TOP_VIEW
+ Top camera
+CAMERA_RIGHT_VIEW
+ Right camera
+CAMERA_BOTTOM_VIEW
+ Bottom camera
+INTERNAL_VIEW
+ Internal view
EXTERNAL_VIEW
External view
SIDEREAL_VIEW
Sidereal view
+ROTATE_UP
+ Rotate Up
+ROTATE_DOWN
+ Rotate Down
+ROTATE_LEFT
+ Rotate Left
+ROTATE_RIGHT
+ Rotate Right
+RESET
+ Reset
NAVIGATION_STAR_MAPS
Navigation and star maps
COMMS
@@ -1230,3 +1254,5 @@ MONTH_NOV
Nov
MONTH_DEC
Dec
+MISCELLANEOUS
+ Miscellaneous
View
@@ -734,9 +734,9 @@ SHIP_IS_FULLY_LADEN
Votre vaisseau est rempli.
YOU_DO_NOT_HAVE_ANY_X
Vous n'avez aucun %item.
-FRONT_VIEW
+CAMERA_FRONT_VIEW
Vue avant
-REAR_VIEW
+CAMERA_REAR_VIEW
Vie arrière
EXTERNAL_VIEW
Vue extérieure
View
@@ -721,9 +721,9 @@ SHIP_IS_FULLY_LADEN
Vaš brod je pun.
YOU_DO_NOT_HAVE_ANY_X
Nemate niti jedan %item.
-FRONT_VIEW
+CAMERA_FRONT_VIEW
Prednji pogled
-REAR_VIEW
+CAMERA_REAR_VIEW
Stražnji pogled
EXTERNAL_VIEW
Vanjski pogled
View
@@ -726,9 +726,9 @@ SHIP_IS_FULLY_LADEN
L'astronave è a pieno carico.
YOU_DO_NOT_HAVE_ANY_X
Non hai nessun %item.
-FRONT_VIEW
+CAMERA_FRONT_VIEW
Vista di fronte
-REAR_VIEW
+CAMERA_REAR_VIEW
Vista di dietro
EXTERNAL_VIEW
Visuale esterna
View
@@ -730,9 +730,9 @@ SHIP_IS_FULLY_LADEN
A hajód teljesen tele van.
YOU_DO_NOT_HAVE_ANY_X
Nincs ilyen árud: %item.
-FRONT_VIEW
+CAMERA_FRONT_VIEW
Első nézet
-REAR_VIEW
+CAMERA_REAR_VIEW
Hátsó nézet
EXTERNAL_VIEW
Külső nézet
View
@@ -705,9 +705,9 @@ SHIP_IS_FULLY_LADEN
Uw schip is volledig beladen.
YOU_DO_NOT_HAVE_ANY_X
U heeft geen %item.
-FRONT_VIEW
+CAMERA_FRONT_VIEW
Zicht voorzijde
-REAR_VIEW
+CAMERA_REAR_VIEW
Zicht achterzijde
EXTERNAL_VIEW
Extern zicht
View
@@ -220,10 +220,12 @@ WINDOW_OR_FULLSCREEN
Okno lub pełny ekran (wymagany restart)
FULL_SCREEN
Pełny ekran
+COMPRESS_TEXTURES
+ Kompresja Tekstur
OTHER_GRAPHICS_SETTINGS
- Inne ustawienia graficzne
+ Inne ustawienia graficzne (wymagany restart)
USE_SHADERS
- Użyj cieniowania (wymagany restart)
+ Użyj cieniowania
SOUND_SETTINGS
Ustawienia dźwięku
VOL_MASTER
@@ -498,8 +500,8 @@ N_LIGHT_YEARS_N_MAX
%distance{f.1} lat świetlnych (%maxdistance{f.1} maks.)
SHIP_INFORMATION
Informacje o statku
-REPUTATION
- Reputacja
+PERSONAL
+ Osobiste
MISSIONS
Misje
SHIFT
@@ -744,14 +746,38 @@ SHIP_IS_FULLY_LADEN
Ładownia jest pełna.
YOU_DO_NOT_HAVE_ANY_X
Nie masz %item.
-FRONT_VIEW
- Widok z przodu
-REAR_VIEW
- Widok z tyłu
+FRONT_COCKPIT_VIEW
+ Kokpit przód
+REAR_COCKPIT_VIEW
+ Kokpit tył
+CAMERA_FRONT_VIEW
+ Kamera dziobowa
+CAMERA_REAR_VIEW
+ Kamera rufowa
+CAMERA_LEFT_VIEW
+ Lewa kamera
+CAMERA_TOP_VIEW
+ Górna kamera
+CAMERA_RIGHT_VIEW
+ Prawa kamera
+CAMERA_BOTTOM_VIEW
+ Dolna kamera
+INTERNAL_VIEW
+ Widok wewnętrzny
EXTERNAL_VIEW
Widok zewnętrzny
SIDEREAL_VIEW
Widok radialny
+ROTATE_UP
+ Rotacja w górę
+ROTATE_DOWN
+ Rotacja w dół
+ROTATE_LEFT
+ Rotacja w lewo
+ROTATE_RIGHT
+ Rotacja w prawo
+RESET
+ Reset
NAVIGATION_STAR_MAPS
Nawigacja i mapy gwiezdne
COMMS
View
@@ -703,9 +703,9 @@ SHIP_IS_FULLY_LADEN
Nava dumneavoastră e încărcată la maxim.
YOU_DO_NOT_HAVE_ANY_X
Nu aveţi %item.
-FRONT_VIEW
+CAMERA_FRONT_VIEW
Vedere frontală
-REAR_VIEW
+CAMERA_REAR_VIEW
Vedere posterioară
EXTERNAL_VIEW
Vedere exterioară
View
@@ -744,9 +744,9 @@ SHIP_IS_FULLY_LADEN
Su nave está completamente cargada.
YOU_DO_NOT_HAVE_ANY_X
No dispone de %item.
-FRONT_VIEW
+CAMERA_FRONT_VIEW
Vista frontal
-REAR_VIEW
+CAMERA_REAR_VIEW
Vista trasera
EXTERNAL_VIEW
Vista externa
@@ -102,8 +102,8 @@ Translate:Add({ English = {
Translate:AddFlavour('Polski','Assassination', {
adtext = "POSZUKIWANY: Do usunięcia {target} z systemu {system}.",
introtext = "Cześć, Jestem {name}. Zapłacę {cash} za pozbycie się {target}.",
- successmsg = "Cieszą mnie wieści o wysłaniu {target}'s na długie wakacje. Dobra robota, rozpocząłem przelew pieniędzy.",
- failuremsg = "Jestem bardzo rozczarowany że {target} wciąż żyje. Chyba nie muszę mówić, że nie zobzczysz żadnych pieniędzy.",
+ successmsg = "Cieszą mnie wieści o wysłaniu {target}'s na długie wakacje. Dobra robota, rozpoczynam przelew pieniędzy.",
+ failuremsg = "Wyrażam wielkie rozczarowanie że {target} wciąż żyje. Chyba nie muszę mówić, że nie zobaczysz żadnych pieniędzy.",
failuremsg2 = "Nie ty pozbyłeś się {target}'s. Tym razem bez zapłaty.",
})
@@ -142,7 +142,7 @@ Translate:AddFlavour('Polski','BreakdownServicing', {
intro = [[Witamy w SuperFix Maintenance.
{lasttime}
-Czas na co półroczny przegląd? Pozwól że obejrze twój napęd!
+Czas na co półroczny przegląd? Pozwól że obejrzę twój napęd!
Mogę wyregulować twój {drive} za jedyne {price}. Nie znajdziesz nikogo tańszego!]],
yesplease = "Zleć usługę SuperFix!",
response = "Napęd wyregulowany, z gwarancją SuperFix!",
@@ -154,7 +154,7 @@ Translate:AddFlavour('Polski','BreakdownServicing', {
title = "Time and Space Engines, Inc.",
intro = [[Witamy w Time and Space.
-Specjalizujemy się w napędach nadprzestrzennych. Dajemy dwuletnią gwarancje na wszystkie prace konserwacyjne.
+Specjalizujemy się w napędach nadprzestrzennych. Dajemy dwuletnią gwarancję na wszystkie prace konserwacyjne.
{lasttime}
Za {drive} cena wynosi {price}. Kontynuować?]],
yesplease = "Tak, proszę",
Oops, something went wrong.

0 comments on commit a572204

Please sign in to comment.