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
|
edfd378e93
|
Merge branch 'master' into jgrpp
# Conflicts:
# source.list
# src/blitter/32bpp_anim.cpp
# src/linkgraph/linkgraphjob.cpp
# src/order_cmd.cpp
# src/vehicle.cpp
# src/vehicle_type.h
|
5 years ago |
Charles Pigott
|
71a3e83468
|
Fix: GCC9's warnings about deprecated implicit assignment operators
|
5 years ago |
JMcKiern
|
04f659e768
|
Fix: Some typos found using codespell
|
5 years ago |
|
Jonathan G Rennison
|
e64706d147
|
Log string ID in GetGRFStringPtr assertion
|
5 years ago |
|
Jonathan G Rennison
|
bd2fdde759
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/core/sort_func.hpp
# src/rail_cmd.cpp
# src/timetable_cmd.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
|
5 years ago |
PeterN
|
d2b6176cdf
|
Add: NewGRF string codes to access PUSH/POP_COLOUR. (#7527)
|
5 years ago |
|
Jonathan G Rennison
|
55fbf37373
|
Add missing includes to newgrf_text.cpp
|
5 years ago |
|
Jonathan G Rennison
|
1c0643e419
|
Add GRF ID/name to "Too many NewGRF string parameters" messages
|
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
|
ba34ec7ade
|
Merge branch 'master' into jgrpp
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
|
5 years ago |
|
Henry Wilson
|
c01a2e2a81
|
Codechange: Removed SmallVector completely
|
5 years ago |
|
Henry Wilson
|
ab711e6942
|
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
|
5 years ago |
|
Jonathan G Rennison
|
e735c1a51a
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
|
6 years ago |
|
Charles Pigott
|
f5b1115039
|
Doc: Lots and lots of doxymentation fixes
|
6 years ago |
|
Jonathan G Rennison
|
d1a287d73c
|
Merge branch 'save_ext' into jgrpp
|
7 years ago |
peter1138
|
0d13f793f2
|
(svn r27851) -Fix [FS#6555]: StringID truncation to 16 bits broke string remapping test.
|
7 years ago |
|
peter1138
|
02b6c533aa
|
(svn r27851) -Fix [FS#6555]: StringID truncation to 16 bits broke string remapping test.
|
7 years ago |
|
Jonathan G Rennison
|
a6168dd2f0
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/saveload/company_sl.cpp
|
7 years ago |
frosch
|
2bb80d280c
|
(svn r27758) -Change: Increase the maximum number of GameScript texts to 64k, and NewGRF texts to 512k.
|
7 years ago |
|
frosch
|
ce32ca4dc6
|
(svn r27758) -Change: Increase the maximum number of GameScript texts to 64k, and NewGRF texts to 512k.
|
7 years ago |
|
frosch
|
a56e2bccd0
|
(svn r27756) -Codechange: Add StringTab enum
|
7 years ago |
|
frosch
|
49b940f69c
|
(svn r27756) -Codechange: Add StringTab enum
|
7 years ago |
|
frosch
|
f4da8ece0c
|
(svn r27755) -Codechange: Move TAB_SIZE to strings_type.h and use it consistently.
|
7 years ago |
|
frosch
|
b54a79f13e
|
(svn r27755) -Codechange: Move TAB_SIZE to strings_type.h and use it consistently.
|
7 years ago |
|
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
|
8 years ago |
|
frosch
|
1a92b0c7c3
|
(svn r27707) -Fix: Make the result of NewGRF's CARGO_NAME string code reliably print 'Nothing', if an invalid type is provided.
|
8 years ago |
|
frosch
|
2be42dadea
|
(svn r27707) -Fix: Make the result of NewGRF's CARGO_NAME string code reliably print 'Nothing', if an invalid type is provided.
|
8 years ago |
|
frosch
|
b25afb239a
|
(svn r27706) -Feature: [NewGRF] String command 9A 1E to print the name of a cargo type.
|
8 years ago |
|
frosch
|
9145e5d2b5
|
(svn r27706) -Feature: [NewGRF] String command 9A 1E to print the name of a cargo type.
|
8 years ago |
|
Jonathan G Rennison
|
20a090b077
|
Show warning dialog if NewGRFs use too many string IDs.
Show when reloading/changing NewGRF config, or starting new game.
|
8 years ago |
|
frosch
|
8d8c06ce86
|
(svn r26713) -Fix (r23027): [NewGRF] Parameters to SCC_NEWGRF_PUSH_WORD and SCC_NEWGRF_UNPRINT were not skipped during drawing.
|
10 years ago |
|
frosch
|
9119ebe2ce
|
(svn r26713) -Fix (r23027): [NewGRF] Parameters to SCC_NEWGRF_PUSH_WORD and SCC_NEWGRF_UNPRINT were not skipped during drawing.
|
10 years ago |
rubidium
|
034735a54c
|
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
|
10 years ago |
|
rubidium
|
9ed12b0f07
|
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
|
10 years ago |
|
rubidium
|
2be4215f43
|
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
|
10 years ago |
|
rubidium
|
0463dbdc9e
|
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
|
10 years ago |
|
frosch
|
968ba79de2
|
(svn r26244) -Feature: [NewGRF] Add StringCodes 9A 1B, 9A 1C and 9A 1D to display amounts of cargo.
|
11 years ago |
|
frosch
|
e9c22ef16f
|
(svn r26244) -Feature: [NewGRF] Add StringCodes 9A 1B, 9A 1C and 9A 1D to display amounts of cargo.
|
11 years ago |
|
frosch
|
3a1fcd76dd
|
(svn r26243) -Cleanup: Move TTDPStringIDToOTTDStringIDMapping to newgrf.cpp, it's only used there.
|
11 years ago |
|
frosch
|
00e7ceeca4
|
(svn r26243) -Cleanup: Move TTDPStringIDToOTTDStringIDMapping to newgrf.cpp, it's only used there.
|
11 years ago |
|
frosch
|
bc53bbb8b6
|
(svn r26242) -Codechange: Use GRFFile that filled the TextRefStack to translate StringIDs from the TextRefStack, instead of passing stuff via global vars.
|
11 years ago |
|
frosch
|
4f419b8f84
|
(svn r26242) -Codechange: Use GRFFile that filled the TextRefStack to translate StringIDs from the TextRefStack, instead of passing stuff via global vars.
|
11 years ago |
|
frosch
|
7b238142b8
|
(svn r26241) -Codechange: Remember the GRFFile which filled the TextRefStack in the TextRefStack.
|
11 years ago |
|
frosch
|
ba1779b978
|
(svn r26241) -Codechange: Remember the GRFFile which filled the TextRefStack in the TextRefStack.
|
11 years ago |
|
frosch
|
9215fd3c96
|
(svn r26239) -Fix: Check that there is space left in the string parameter array, before pushing NewGRF parameters to it.
|
11 years ago |
|
frosch
|
477c15383d
|
(svn r26239) -Fix: Check that there is space left in the string parameter array, before pushing NewGRF parameters to it.
|
11 years ago |
|
rubidium
|
49eaa397ab
|
(svn r26065) -Fix: possible dereference of NULL for texts from game scripts
|
11 years ago |