Commit Graph

24032 Commits

Author SHA1 Message Date
Jonathan G Rennison
add9be20a0 Merge branch 'enhanced_viewport_overlay' into jgrpp 2017-08-31 20:23:54 +01:00
Jonathan G Rennison
d3a1e8060d Fix vehicle draw flickering, particularly in viewport map mode
Incorrect bounds check in ViewportAddVehicles/ViewportMapDrawVehicles
2017-08-31 20:23:32 +01:00
Jonathan G Rennison
9212188191 Merge pull request #27 from kiwitreekor into jgrpp 2017-08-29 20:59:57 +01:00
kiwitreekor
8b3137c9c7 Korean translation update 2017-08-26 12:08:54 +09:00
Jonathan G Rennison
c3a9eca1a9 Add town growth setting, rate depends on proportion of transported cargo 2017-08-26 01:15:16 +01:00
Jonathan G Rennison
bf18b1cdbe Merge remote-tracking branch 'kruemelmagic/jgrpp' into jgrpp 2017-08-20 23:31:29 +01:00
kruemelmagic
7fda737ac9 Update german.txt
newly translated strings from comparison with upstream English language file (english.txt)
2017-08-20 22:23:34 +02:00
kruemelmagic
d15525da77 Update german.txt
- almost complete own translation added (reworked)
- a few corrections to trunk strings
- a few corrections of previous translations
2017-08-20 21:42:11 +02:00
Jonathan G Rennison
ee169c4455 Fix numerical/signed overflow when using high day lengths
Bug reported at day length = 125
2017-08-20 20:41:13 +01:00
Jonathan G Rennison
36a712a579 Add very and extremely slow options to town growth rate setting 2017-08-20 11:14:43 +01:00
Jonathan G Rennison
0d2be99827 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	src/settings_internal.h
#	src/table/company_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
2017-08-20 10:38:23 +01:00
Jonathan G Rennison
a3d1585826 Add settings callback field to re-order setting options in GUI 2017-08-20 10:37:45 +01:00
Jonathan G Rennison
46050820c5 Fix missing template definition in company_settings.
(cherry picked from commit 6e505ceab1)
2017-08-20 01:52:07 +01:00
Jonathan G Rennison
6fcb156989 Add generic mechanism to cross-ref settings at load time.
This is useful for loading settings from legacy/special versions,
where the corresponding setting is somewhere else and/or a PATX setting,
with duplicating all the info.

(cherry picked from commit b5c453b21e)
2017-08-20 01:44:10 +01:00
Jonathan G Rennison
2e7e712f06 Ctrl+click on shared list button in order/timetable window to add veh to group 2017-08-18 19:17:16 +01:00
Jonathan G Rennison
4255d8a131 Remove gui.enable_single_veh_shared_order_gui from settings GUI 2017-08-18 19:11:48 +01:00
Jonathan G Rennison
ac016eae5e Add client setting to enable shared order group window for single vehicles 2017-08-18 01:49:21 +01:00
Jonathan G Rennison
2a3f59dc8a Refresh screen when changing day length 2017-08-18 01:49:21 +01:00
Jonathan G Rennison
2e7380bc72 Add scope info logging to tile loop 2017-08-16 18:30:06 +01:00
Jonathan G Rennison
473fbe6cd5 Merge branch 'tracerestrict-sx' into jgrpp 2017-08-15 19:28:44 +01:00
Jonathan G Rennison
ba33754993 Merge branch 'save_ext' into tracerestrict-sx
# Conflicts:
#	src/vehiclelist.cpp
2017-08-15 19:28:30 +01:00
Jonathan G Rennison
f34833f111 Merge branch 'improved_breakdowns' into jgrpp
# Conflicts:
#	src/vehiclelist.cpp
2017-08-15 19:26:26 +01:00
Jonathan G Rennison
2d66f25f6c Merge branch 'save_ext' into improved_breakdowns
# Conflicts:
#	src/vehicle.cpp
2017-08-15 19:17:12 +01:00
Jonathan G Rennison
258e591f71 Merge branch 'cpp-11' into save_ext 2017-08-15 18:44:36 +01:00
Jonathan G Rennison
f3a0aace0c Merge branch 'master' into cpp-11
# Conflicts:
#	src/stdafx.h
2017-08-15 18:44:17 +01:00
Jonathan G Rennison
1d1718c226 Merge branch 'tracerestrict-sx' into jgrpp 2017-08-13 22:55:33 +01:00
Jonathan G Rennison
58a860c087 Fix selected item in dropdown for conditional to test slot occupancy state 2017-08-13 22:55:21 +01:00
frosch
a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
Jonathan G Rennison
acea2e83fe Merge branch 'crashlog_improvements' into jgrpp 2017-08-12 00:58:03 +01:00
Jonathan G Rennison
fd9a2e680c Fix using crash abort reason string as printf format string 2017-08-12 00:57:54 +01:00
Jonathan G Rennison
43f847cebb Merge remote-tracking branch 'auge8472/lang-de' into jgrpp
Fix a STRING/STRING2 mixup
2017-08-12 00:48:52 +01:00
Heiko August
fcd08d0daa translation for safer level crossings 2017-08-11 23:22:32 +02:00
Heiko August
18f104e644 translation for custom street bridge heads 2017-08-11 23:18:09 +02:00
Heiko August
550e393f86 translation for several viewport map settings 2017-08-11 23:09:40 +02:00
Heiko August
dd4fe36bf8 next part of translation for more conditional orders(comparators) 2017-08-11 23:08:37 +02:00
Heiko August
a61d6ae95e translation for adjusted placement of arctic trees 2017-08-11 23:07:17 +02:00
Heiko August
28cd475ccd translation for removing sea and river tiles ingame 2017-08-11 23:05:27 +02:00
Heiko August
c5d233904e partial translation for more conditional orders (orders) 2017-08-11 22:36:22 +02:00
Heiko August
65726ff9a1 translation for increase of station catchment area 2017-08-11 22:35:26 +02:00
Jonathan G Rennison
31e343b4ff Merge remote-tracking branch 'auge8472/lang-de' into jgrpp 2017-08-11 20:05:48 +01:00
Jonathan G Rennison
724d19f47d Sound: Add checks for incorrect sample rate, channel num and rate
Log a message instead of asserting
2017-08-11 19:53:24 +01:00
Jonathan G Rennison
10766f116c Debug logging: add sound category 2017-08-11 19:52:21 +01:00
Jonathan G Rennison
835c172edf Fix wrong type of whitespace in Korean translation 2017-08-11 19:42:52 +01:00
Heiko August
6c5ef1ea38 translation for map mode 2017-08-10 23:21:58 +02:00
Heiko August
7567e8fcf5 translation for random road reconstruction 2017-08-10 22:43:08 +02:00
Heiko August
05337d067b translation for towns building street bridges over rails 2017-08-10 22:32:03 +02:00
Heiko August
50f2095b50 translation for minimal distance between towns 2017-08-10 22:31:06 +02:00
Charles Pigott
f5931e1782 Fix: Broken assert.
Patch applied from https://gist.github.com/LordAro/421dacee7b6911628849beaabc209f0c#file-0004-fix-broken-assert-patch
2017-08-10 12:37:31 +01:00
Jonathan G Rennison
fa89013bc8 Merge pull request #22 from kiwitreekor/jgrpp
Add Korean Translations
2017-08-03 21:23:04 +01:00
kiwitreekor
181988e1fd Add Korean Translations
Translated STR_CONFIG_SETTING_TOWN_ROAD_OVER_RAIL / STR_CONFIG_SETTING_TOWN_ROAD_OVER_RAIL_HELPTEXT
2017-08-02 13:17:01 +09:00