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

106 Commits

Author SHA1 Message Date
Jonathan G Rennison
97e6f3062e Adding of _t to (u)int types, and WChar to char32_t 
See: eaae0bb5e
 2024-01-07 17:20:41 +00:00
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
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
d48912aa15 Add setting to show full group hierarchy in group names 2022-06-28 17:41:09 +01:00
Jonathan G Rennison
5b7db9d849 Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/commit-checker.yml
#	src/command.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/crashlog.cpp
#	src/economy.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/misc_gui.cpp
#	src/newgrf_config.cpp
#	src/openttd.cpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/table/settings/gui_settings.ini
 2022-05-15 13:54:13 +01:00
glx22
fb1ac307a4 Fix 44f2ef1: [strgen] Allow gender for {CARGO_SHORT} 2022-04-30 20:38:35 +02: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
227041008f Merge branch 'master' into jgrpp 
# Conflicts:
#	src/debug.cpp
#	src/lang/russian.txt
#	src/misc_gui.cpp
#	src/os/windows/crashlog_win.cpp
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32.cpp
#	src/rail_cmd.cpp
#	src/window_gui.h
 2021-04-11 03:05:08 +01:00
frosch
c6781cbd44 Fix d4c3d01d: add plural form 14 to strgen. (#8999) 2021-04-10 18:09:04 +02: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
keldorkatarn
9ab2b8fa3e FIX: {PREVIOUS_COLOUR} string control code was not activated for some reason. The logic for it is in place. 
(cherry picked from commit 9d7c265fdca7884db26b3c2d0f856cc18a751c54)

Fixes: #41
 2018-04-17 16:11:19 +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
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
Jonathan G Rennison
526cb42608 Merge branch 'master' into depature-boards 
Conflicts:
	src/table/strgen_tables.h
 2015-08-01 20:39:16 +01:00
patch-import
79138de1b9 Import departure boards patch 2015-08-01 19:48:19 +01:00
frosch
14052de6b2 (svn r27295) -Add: [strgen] Default plural subparameter positions for CARGO_xxx string control codes. 2015-05-28 17:26:53 +00:00
frosch
50a3f44539 (svn r27295) -Add: [strgen] Default plural subparameter positions for CARGO_xxx string control codes. 2015-05-28 17:26:53 +00:00
rubidium
ecfed05729 (svn r26050) -Fix: possible, but currently untriggered, out of bounds access in strgen 2013-11-22 21:43:47 +00:00
rubidium
6f21593bf6 (svn r26050) -Fix: possible, but currently untriggered, out of bounds access in strgen 2013-11-22 21:43:47 +00:00
frosch
116ed7cf2c (svn r25193) -Cleanup: [strgen] Remove some ancient unused string codes. 2013-04-17 18:24:13 +00:00
frosch
e28659aa51 (svn r25193) -Cleanup: [strgen] Remove some ancient unused string codes. 2013-04-17 18:24:13 +00:00
frosch
782ac97cb1 (svn r25192) -Change: [strgen] Allow any number of colour codes in translations. 2013-04-17 18:22:37 +00:00
frosch
bcd5038af9 (svn r25192) -Change: [strgen] Allow any number of colour codes in translations. 2013-04-17 18:22:37 +00:00
planetmaker
3a6db3e216 (svn r25078) -Add: New plural form to be used by Scottish Gaelic (1,11; 2,12; 3..10, 13..19; other) 2013-03-10 11:02:11 +00:00
planetmaker
3c2d8cc28d (svn r25078) -Add: New plural form to be used by Scottish Gaelic (1,11; 2,12; 3..10, 13..19; other) 2013-03-10 11:02:11 +00:00
frosch
2655984a5d (svn r24910) -Fix: [strgen] Description of plural form 3 was incorrect. 2013-01-12 17:21:30 +00:00
frosch
fea76bbb78 (svn r24910) -Fix: [strgen] Description of plural form 3 was incorrect. 2013-01-12 17:21:30 +00:00
planetmaker
f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 2013-01-08 22:46:42 +00:00
planetmaker
c24374f99c (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 2013-01-08 22:46:42 +00:00
frosch
b54a165cd8 (svn r24400) -Add: Plural 'names' to the output of strgen -export-plurals. 2012-07-14 14:21:25 +00:00
frosch
17dcc7a899 (svn r24400) -Add: Plural 'names' to the output of strgen -export-plurals. 2012-07-14 14:21:25 +00:00
frosch
e1d7b6ec5c (svn r24373) -Codechange: Improve descriptions of plural forms. 2012-07-03 19:14:51 +00:00
frosch
2ef319d0fe (svn r24373) -Codechange: Improve descriptions of plural forms. 2012-07-03 19:14:51 +00:00