Jonathan G Rennison
|
6c3e5642f8
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/fileio.cpp
# src/fileio_func.h
# src/fios_gui.cpp
# src/ini_load.cpp
# src/ini_type.h
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/network/network_client.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/os/windows/win32.cpp
# src/road_cmd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/table/settings.ini
# src/tree_cmd.cpp
# src/tree_gui.cpp
# src/vehicle_base.h
# src/video/cocoa/cocoa_v.mm
# src/video/cocoa/event.mm
# src/video/cocoa/wnd_quartz.mm
# src/viewport.cpp
# src/widgets/tree_widget.h
|
3 years ago |
Michael Lutz
|
0c6e8a8123
|
Codechange: Store file search paths as std::string.
|
4 years ago |
|
Jonathan G Rennison
|
d328f359c9
|
Add string function to strip all SCC characters
|
4 years ago |
|
Jonathan G Rennison
|
3adeff1883
|
Merge branch 'master' into jgrpp
# Conflicts:
# CMakeLists.txt
# cmake/CompileFlags.cmake
# src/bridge_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/town_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/toolbar_gui.cpp
# src/town.h
# src/town_cmd.cpp
|
4 years ago |
Charles Pigott
|
64b1c70fdd
|
Codechange: Add WARN_FORMAT to vseprintf and fix the cascade of warnings that followed
|
4 years ago |
|
Jonathan G Rennison
|
f8d6e781ba
|
Merge branch 'master' into jgrpp
# Conflicts:
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj.filters
# src/base_consist.h
# src/company_base.h
# src/newgrf_config.cpp
# src/newgrf_config.h
# src/openttd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/station_sl.cpp
# src/settings.cpp
# src/signs_base.h
# src/string.cpp
# src/string_func.h
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/town_cmd.cpp
# src/vehicle.cpp
# src/vehicle_cmd.cpp
# src/video/cocoa/cocoa_v.mm
# src/video/null_v.cpp
|
4 years ago |
|
Michael Lutz
|
715aa67a9c
|
Codechange: Use std::string in INI file parsing.
|
4 years ago |
|
Michael Lutz
|
c082f570ce
|
Codechange: Use std::string when translating TTDP NewGRF string codes.
|
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
|
68dbbf5945
|
Add std::string format functions
|
5 years ago |
|
Jonathan G Rennison
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
5 years ago |
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
5 years ago |
|
Jonathan G Rennison
|
d1a287d73c
|
Merge branch 'save_ext' into jgrpp
|
7 years ago |
|
Jonathan G Rennison
|
cb9ffe1bd9
|
Move std::string str_validate to separate header
This is to fix compilation of squirrel on MacOS/clang, as squirrel
defines macros which clash with including <string>
|
7 years ago |
|
Jonathan G Rennison
|
8317eac918
|
Merge branch 'save_ext' into jgrpp
# Conflicts:
# src/lang/german.txt
# src/lang/korean.txt
# src/lang/traditional_chinese.txt
# src/window.cpp
|
7 years ago |
|
Jonathan G Rennison
|
dd0666c5f4
|
Add support for save/loading std::strings.
|
7 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
|
ed33a62bcd
|
Merge branch 'tracerestrict' into tracerestrict-sx
|
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
|
bbe4ea7f50
|
Log truncated revision strings at debug level 1 instead of 0.
|
9 years ago |
|
Jonathan G Rennison
|
4508cfbf93
|
Add format-style versions of SlError and SlErrorCorrupt.
|
9 years ago |
frosch
|
b40d6dfb81
|
(svn r26513) -Fix: 9x compilation, maybe
|
10 years ago |
|
frosch
|
08eeec15be
|
(svn r26513) -Fix: 9x compilation, maybe
|
10 years ago |
rubidium
|
e251d82f96
|
(svn r26507) -Cleanup: remove now unused custom strndup implementation
|
10 years ago |
|
rubidium
|
db8d208bfc
|
(svn r26507) -Cleanup: remove now unused custom strndup implementation
|
10 years ago |
|
rubidium
|
b886c8db8c
|
(svn r26506) -Codechange: replace most of vsnprintf with vseprintf
|
10 years ago |
|
rubidium
|
e61fe21237
|
(svn r26506) -Codechange: replace most of vsnprintf with vseprintf
|
10 years ago |
|
rubidium
|
4768fae6d4
|
(svn r26498) -Add: method for duplicating strings with similar behaviours as strecpy and strecat; give end pointer instead of a size
|
10 years ago |
|
rubidium
|
382ca0941f
|
(svn r26498) -Add: method for duplicating strings with similar behaviours as strecpy and strecat; give end pointer instead of a size
|
10 years ago |
|
frosch
|
24c7134bff
|
(svn r26485) -Codechange: Replace ttd_strlcpy and ttd_strlcat with strecpy and strecat.
|
10 years ago |
|
frosch
|
ef4c2ce031
|
(svn r26485) -Codechange: Replace ttd_strlcpy and ttd_strlcat with strecpy and strecat.
|
10 years ago |
michi_cc
|
e6096cb8af
|
(svn r25653) -Add: Caret movement by words for CJK languages.
|
11 years ago |
|
michi_cc
|
76367f6bf1
|
(svn r25653) -Add: Caret movement by words for CJK languages.
|
11 years ago |
|
michi_cc
|
4248d90937
|
(svn r25652) -Fix: Improve text caret movement for complex scripts.
|
11 years ago |
|
michi_cc
|
e7dc14b25a
|
(svn r25652) -Fix: Improve text caret movement for complex scripts.
|
11 years ago |
|
rubidium
|
87a1860945
|
(svn r25555) -Fix [FS#5632]: [Script] Texts from scripts were not validated before they were shown, causing an assertion to trigger
|
11 years ago |
|
rubidium
|
4c443bce5c
|
(svn r25555) -Fix [FS#5632]: [Script] Texts from scripts were not validated before they were shown, causing an assertion to trigger
|
11 years ago |
|
frosch
|
356ecf05c4
|
(svn r24983) -Change: Apply the same name sorting rules to content and NewGRF list as for the server list.
|
12 years ago |
|
frosch
|
3e02890b73
|
(svn r24983) -Change: Apply the same name sorting rules to content and NewGRF list as for the server list.
|
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 |
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
|
13 years ago |
|
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
|
13 years ago |
|
rubidium
|
8e4b6c3055
|
(svn r23590) -Codechange: make the string validation settings better expandable
|
13 years ago |
|
rubidium
|
fefe22b4aa
|
(svn r23590) -Codechange: make the string validation settings better expandable
|
13 years ago |
|
planetmaker
|
d035658bfb
|
(svn r22889) -Fix [FS#4751]: [OSX] MacOSX 10.7 knows already about strndup (leecbaker)
|
13 years ago |
|
planetmaker
|
5188587a04
|
(svn r22889) -Fix [FS#4751]: [OSX] MacOSX 10.7 knows already about strndup (leecbaker)
|
13 years ago |
alberth
|
ef58554bd2
|
(svn r22669) -Codechange: For non-windows, only test for file existence again if strtolower actually changed the name.
|
13 years ago |
|
alberth
|
d55b380b69
|
(svn r22669) -Codechange: For non-windows, only test for file existence again if strtolower actually changed the name.
|
13 years ago |