dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,410 Commits 1 Branch 0 Tags
ca23e319861752f368cf13fd065a7b34df5fd188
Commit Graph

121 Commits

Author SHA1 Message Date
Jonathan G Rennison
c8817d7f4e Merge branch 'master' into jgrpp 
# Conflicts:
#	os/macosx/notarize.sh
#	src/3rdparty/CMakeLists.txt
#	src/3rdparty/squirrel/squirrel/sqcompiler.cpp
#	src/3rdparty/squirrel/squirrel/sqdebug.cpp
#	src/3rdparty/squirrel/squirrel/sqvm.cpp
#	src/console_cmds.cpp
#	src/core/span_type.hpp
#	src/crashlog.cpp
#	src/currency.h
#	src/date_gui.cpp
#	src/driver.cpp
#	src/fios.cpp
#	src/genworld_gui.cpp
#	src/hotkeys.cpp
#	src/misc_gui.cpp
#	src/music/os2_m.cpp
#	src/network/core/os_abstraction.h
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_config.h
#	src/newgrf_text.cpp
#	src/openttd.cpp
#	src/os/macosx/font_osx.cpp
#	src/os/macosx/misc_osx.cpp
#	src/os/os2/CMakeLists.txt
#	src/os/os2/os2.cpp
#	src/os/unix/CMakeLists.txt
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32_main.cpp
#	src/saveload/saveload.cpp
#	src/script/api/script_text.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/stdafx.h
#	src/strings.cpp
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_cmd.cpp
#	src/video/dedicated_v.cpp
#	src/video/video_driver.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/waypoint_gui.cpp
#	src/widgets/dropdown_type.h
#	src/window.cpp
#	src/window_gui.h
 2023-09-12 20:06:47 +01:00
Jonathan G Rennison
4c88256183 De-duplicate string IDs used for viewport town labels 2023-07-30 21:47:03 +01:00
Jonathan G Rennison
ebcf8b336c Add SET_COLOUR string code 2023-07-30 21:47:03 +01:00
glx22
b1fb209bed Add: {COLOUR} control code to allow colour changes at runtime 2023-06-20 19:05:10 +02:00
PeterN
ab83725d73 Add: NewGRF string code "9A 21" to display force from textstack. (#10782) 
(cherry picked from commit 61516627ad)
 2023-06-05 21:07:55 +01:00
PeterN
ac1d042550 Remove: obsolete NewGRF text unprinting. (#10884) 
Co-authored-by: Rubidium <rubidium@openttd.org>
 2023-06-04 13:14:56 +02:00
PeterN
61516627ad Add: NewGRF string code "9A 21" to display force from textstack. (#10782) 2023-05-11 08:06:46 +01:00
Jonathan G Rennison
e7f7cd06bd Simplify timetable time/duration string management 2023-05-10 18:51:49 +01:00
Jonathan G Rennison
1f36c3f3e4 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/ai/ai_gui.cpp
#	src/build_vehicle_gui.cpp
#	src/genworld_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/newgrf_sound.cpp
#	src/roadveh.h
#	src/sound.cpp
#	src/station_cmd.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_gui.cpp
 2022-11-26 23:04:14 +00:00
Henry Wilson
59dbcdb5ba Feature: Display power-to-weight ratio in ground vehicle details GUI 2022-11-08 21:02:08 +01:00
Jonathan G Rennison
a7094fec3b Add a STRING8 format code 2021-11-24 02:10:42 +00:00
Jonathan G Rennison
8485ed724b Add {PLUS_NUM} string code which includes leading + for positive values 2021-06-14 22:55:26 +01:00
Jonathan G Rennison
912c62d749 Add timetable lateness/earliness conditional order 2021-03-27 23:19:19 +00:00
Jonathan G Rennison
270a748b64 Tracerestrict: Add time/date conditional 2020-11-27 18:43:32 +00:00
Jonathan G Rennison
817bc44a3e Initial implementation of tracerestrict counter mechanism 2020-08-31 19:08:35 +01:00
Jonathan G Rennison
cbdd9f84d8 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h
 2019-11-12 18:43:10 +00:00
S. D. Cloudt
13cc8a0cee Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
Jonathan G Rennison
1fe0bb76b9 Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp 2018-04-27 02:42:20 +01:00
PeterN
3b32075e8a Add: {PUSH_COLOUR} and {POP_COLOUR} control codes to handle switching colours. (#6737) 
This replaces the internal SCC_PREVIOUS_COLOUR swap.
 2018-04-19 19:33:21 +01:00
Pavel Stupnikov
9175c349da Fix #6465: Add {NORMAL_FONT} and {MONO_FONT} control codes to GS strings (#6726) 2018-04-17 18:41:31 +01:00
Jonathan G Rennison
b8328ad21f Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/command.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/vehiclelist.cpp
#	src/window_type.h
 2017-04-05 19:00:24 +01:00
Jonathan G Rennison
6417fb16c3 Initial implementation of trace restrict slots 2017-03-30 21:14:14 +01:00
Jonathan G Rennison
688ee9ac11 Add string control code to consume an argument. 2017-03-30 20:27:03 +01:00
Jonathan G Rennison
f5e4d8e73a Merge branch 'master' into tracerestrict 
# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
 2017-01-17 19:20:46 +00:00
Jonathan G Rennison
5c7f36ef4b Merge branch 'enhanced_viewport_overlay' into jgrpp 
Further fixes for viewport lines/marker for multiplayer clients.

# Conflicts:
#	src/lang/russian.txt
 2016-12-26 15:38:56 +00:00
frosch
b25afb239a (svn r27706) -Feature: [NewGRF] String command 9A 1E to print the name of a cargo type. 2016-12-23 13:38:50 +00:00
frosch
9145e5d2b5 (svn r27706) -Feature: [NewGRF] String command 9A 1E to print the name of a cargo type. 2016-12-23 13:38:50 +00:00
frosch
2c8b84f21d (svn r27705) -Doc: Add the hex codes to the SCC_NEWGRF_ enum entries. 2016-12-22 20:47:40 +00:00
frosch
124f386fd1 (svn r27705) -Doc: Add the hex codes to the SCC_NEWGRF_ enum entries. 2016-12-22 20:47:40 +00:00
Jonathan G Rennison
f5212b27e4 Add a DECIMAL1 string code, which is DECIMAL with a fixed param of 1. 2016-11-25 23:12:23 +00:00
Jonathan G Rennison
f0fee802a9 Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/lang/english.txt
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/table/settings.ini
#	src/vehicle_gui.cpp
 2016-07-05 22:34:50 +01:00
Jonathan G Rennison
8ec1b2200e Change tracerestrict weight ratio properties to use decimals, and the weight unit. 
Add {POWER_WEIGHT_RATIO} and {FORCE_WEIGHT_RATIO} string codes.
 2016-07-05 21:20:06 +01:00
patch-import
79138de1b9 Import departure boards patch 2015-08-01 19:48:19 +01:00
frosch
968ba79de2 (svn r26244) -Feature: [NewGRF] Add StringCodes 9A 1B, 9A 1C and 9A 1D to display amounts of cargo. 2014-01-12 18:01:33 +00:00
frosch
e9c22ef16f (svn r26244) -Feature: [NewGRF] Add StringCodes 9A 1B, 9A 1C and 9A 1D to display amounts of cargo. 2014-01-12 18:01:33 +00:00
frosch
cb6aee2f27 (svn r26237) -Cleanup: Remove unused SCC_STRING_ID. 2014-01-12 17:59:27 +00:00
frosch
bc86bf9b12 (svn r26237) -Cleanup: Remove unused SCC_STRING_ID. 2014-01-12 17:59:27 +00:00
rubidium
2771de7f34 (svn r25454) -Remove/Fix/Cleanup: SETX(Y) does not work at all with other than default fonts, so get rid of it 2013-06-24 18:39:19 +00:00
rubidium
7c0f34130c (svn r25454) -Remove/Fix/Cleanup: SETX(Y) does not work at all with other than default fonts, so get rid of it 2013-06-24 18:39:19 +00:00
rubidium
b1eb9573c8 (svn r24022) -Add: CARGO_LIST control code for strings 2012-03-10 19:04:49 +00:00
rubidium
19923e81f9 (svn r24022) -Add: CARGO_LIST control code for strings 2012-03-10 19:04:49 +00:00
yexo
d9f3912c59 (svn r23816) -Fix (r23635, r23805): make SCC_ENCODED the first entry in the StringControlCode enum since it's value is not allowed to change 2012-01-16 22:29:25 +00:00
yexo
2c99805117 (svn r23816) -Fix (r23635, r23805): make SCC_ENCODED the first entry in the StringControlCode enum since it's value is not allowed to change 2012-01-16 22:29:25 +00:00
frosch
624f916468 (svn r23805) -Add: {STRING6} and {STRING7}. 2012-01-15 15:49:01 +00:00
frosch
0011f9ce45 (svn r23805) -Add: {STRING6} and {STRING7}. 2012-01-15 15:49:01 +00:00
truebrain
8bff646cf2 (svn r23635) -Add: introduce GSText, to allow translating GameScript text, even over network 2011-12-19 21:05:57 +00:00
truebrain
b0ac529a6f (svn r23635) -Add: introduce GSText, to allow translating GameScript text, even over network 2011-12-19 21:05:57 +00:00
truebrain
71a040776a (svn r23297) -Add: {CARGO_TINY} (Rubidium) 2011-11-23 16:04:28 +00:00
truebrain
4e09cde649 (svn r23297) -Add: {CARGO_TINY} (Rubidium) 2011-11-23 16:04:28 +00:00
rubidium
c591589818 (svn r23269) -Codechange: rename some control/string codes/IDs to be more consistent 2011-11-19 22:15:44 +00:00