Commit Graph

109 Commits (jgrpp)

Author SHA1 Message Date
Jonathan G Rennison 45b6079899 Add string code for absolute timetable time 3 months ago
Jonathan G Rennison b13b2781bd Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
Jonathan G Rennison e98d9a1d1d Strings: Remove DATE_WALLCLOCK_* string codes, add TT_TIME 4 months ago
Jonathan G Rennison 97e6f3062e Adding of _t to (u)int types, and WChar to char32_t
See: eaae0bb5e
5 months ago
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
9 months ago
Jonathan G Rennison 4c88256183 De-duplicate string IDs used for viewport town labels 10 months ago
Jonathan G Rennison ebcf8b336c Add SET_COLOUR string code 10 months ago
glx22 b1fb209bed Add: {COLOUR} control code to allow colour changes at runtime 12 months ago
Jonathan G Rennison e7f7cd06bd Simplify timetable time/duration string management 1 year ago
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
2 years ago
Henry Wilson 59dbcdb5ba Feature: Display power-to-weight ratio in ground vehicle details GUI 2 years ago
Jonathan G Rennison d48912aa15 Add setting to show full group hierarchy in group names 2 years ago
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
2 years ago
glx22 fb1ac307a4 Fix 44f2ef1: [strgen] Allow gender for {CARGO_SHORT} 2 years ago
Jonathan G Rennison a7094fec3b Add a STRING8 format code 3 years ago
Jonathan G Rennison 8485ed724b Add {PLUS_NUM} string code which includes leading + for positive values 3 years ago
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
3 years ago
frosch c6781cbd44
Fix d4c3d01d: add plural form 14 to strgen. (#8999) 3 years ago
Jonathan G Rennison 912c62d749 Add timetable lateness/earliness conditional order 3 years ago
Jonathan G Rennison 270a748b64 Tracerestrict: Add time/date conditional 4 years ago
Jonathan G Rennison 817bc44a3e Initial implementation of tracerestrict counter mechanism 4 years ago
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
5 years ago
S. D. Cloudt 13cc8a0cee Cleanup: Removed SVN headers 5 years ago
Jonathan G Rennison 1fe0bb76b9 Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp 6 years ago
PeterN 3b32075e8a
Add: {PUSH_COLOUR} and {POP_COLOUR} control codes to handle switching colours. (#6737)
This replaces the internal SCC_PREVIOUS_COLOUR swap.
6 years ago
Pavel Stupnikov 9175c349da Fix #6465: Add {NORMAL_FONT} and {MONO_FONT} control codes to GS strings (#6726) 6 years ago
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
6 years ago
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
7 years ago
Jonathan G Rennison 6417fb16c3 Initial implementation of trace restrict slots 7 years ago
Jonathan G Rennison 688ee9ac11 Add string control code to consume an argument. 7 years ago
Jonathan G Rennison f5212b27e4 Add a DECIMAL1 string code, which is DECIMAL with a fixed param of 1. 8 years ago
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
8 years ago
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.
8 years ago
Jonathan G Rennison 526cb42608 Merge branch 'master' into depature-boards
Conflicts:
	src/table/strgen_tables.h
9 years ago
patch-import 79138de1b9 Import departure boards patch 9 years ago
frosch 14052de6b2 (svn r27295) -Add: [strgen] Default plural subparameter positions for CARGO_xxx string control codes. 9 years ago
frosch 50a3f44539 (svn r27295) -Add: [strgen] Default plural subparameter positions for CARGO_xxx string control codes. 9 years ago
rubidium ecfed05729 (svn r26050) -Fix: possible, but currently untriggered, out of bounds access in strgen 11 years ago
rubidium 6f21593bf6 (svn r26050) -Fix: possible, but currently untriggered, out of bounds access in strgen 11 years ago
frosch 116ed7cf2c (svn r25193) -Cleanup: [strgen] Remove some ancient unused string codes. 11 years ago
frosch e28659aa51 (svn r25193) -Cleanup: [strgen] Remove some ancient unused string codes. 11 years ago
frosch 782ac97cb1 (svn r25192) -Change: [strgen] Allow any number of colour codes in translations. 11 years ago
frosch bcd5038af9 (svn r25192) -Change: [strgen] Allow any number of colour codes in translations. 11 years ago
planetmaker 3a6db3e216 (svn r25078) -Add: New plural form to be used by Scottish Gaelic (1,11; 2,12; 3..10, 13..19; other) 11 years ago
planetmaker 3c2d8cc28d (svn r25078) -Add: New plural form to be used by Scottish Gaelic (1,11; 2,12; 3..10, 13..19; other) 11 years ago
frosch 2655984a5d (svn r24910) -Fix: [strgen] Description of plural form 3 was incorrect. 12 years ago
frosch fea76bbb78 (svn r24910) -Fix: [strgen] Description of plural form 3 was incorrect. 12 years ago
planetmaker f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
planetmaker c24374f99c (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
frosch b54a165cd8 (svn r24400) -Add: Plural 'names' to the output of strgen -export-plurals. 12 years ago