674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
5 years ago
f5747bf753
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/genworld_gui.cpp
# src/group_gui.cpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/widgets/dropdown.cpp
# src/widgets/dropdown_type.h
5 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
5 years ago
c7b9987d08
Codechange: Switch DropDownList to directly use std::vector, thus making AutoDeleteSmallVector obsolete.
...
DropDownListItem are strongly managed using std::unique_ptr to ensure leak-free handling. Appropriate use
of move-semantics make intent a lot clearer than parameter comments and allows the compiler to generate
copy-free code for most situations.
5 years ago
361758b516
Merge branches 'crashlog_improvements', 'save_ext' into jgrpp
...
# Conflicts:
# Makefile.src.in
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj
# projects/openttd_vs142.vcxproj.filters
# src/core/smallstack_type.hpp
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/linkgraphjob.h
# src/misc.cpp
# src/network/network_udp.cpp
# src/openttd.cpp
# src/saveload/saveload.cpp
5 years ago
05f4e73608
Codechange: Replace custom mutex code with C++11 mutex'es.
...
A conforming compiler with a valid <mutex>-header is expected.
Most parts of the code assume that locking a mutex will never fail unexpectedly,
which is generally true on all common platforms that don't just pretend to
be C++11. The use of condition variables in driver code is checked.
5 years ago
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
a0f36a50e6
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
5 years ago
317f69c152
Codechange: Use override specifier in Window-derived classes.
5 years ago
3a640af71d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/ground_vehicle.cpp
# src/viewport.cpp
6 years ago
e00908f5e9
Fix #6898 : Replace atoi() with strtoul()
...
Normalize type and parsing of generation_seed across all files
Add assert_compile() to ensure correct type
6 years ago
4d1bd8e4b4
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/genworld_gui.cpp
# src/gfx.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/music.cpp
# src/table/settings.ini
# src/town_cmd.cpp
# src/train_cmd.cpp
6 years ago
836d25e738
Codechange: Address some MSVC compiler warnings
6 years ago
5e67582a64
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/saveload/extended_ver_sl.cpp
# src/saveload/saveload.cpp
8 years ago
597380e099
(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.
8 years ago
a959c0c965
(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.
8 years ago
9135f7130e
(svn r27635) -Codechange: Move FileType and FileToSaveLoad structure definitions.
8 years ago
a35e970ab0
(svn r27635) -Codechange: Move FileType and FileToSaveLoad structure definitions.
8 years ago
761463d134
Merge branch 'template_train_replacement-sx' into jgrpp
...
# Conflicts:
# src/window.cpp
8 years ago
4d1843a95e
(svn r27627) -Codechange: Deduplicate some cursor magic into SetMouseCursorBusy.
8 years ago
2337d169e8
(svn r27627) -Codechange: Deduplicate some cursor magic into SetMouseCursorBusy.
8 years ago
5d222e4d5e
Merge branch 'extra_large_maps' into extra_large_maps-sx
...
Conflicts:
src/genworld_gui.cpp
src/map_type.h
src/newgrf_debug_gui.cpp
9 years ago
7d2b4bd3ea
Import extra large maps patch.
...
http://www.tt-forums.net/viewtopic.php?f=33&t=33137
9 years ago
56c9765f72
(svn r27285) -Codechange: Use LG_ORIGINAL instead of a magic 0 to indicate the original landscape generator.
9 years ago
b8414c2884
(svn r27285) -Codechange: Use LG_ORIGINAL instead of a magic 0 to indicate the original landscape generator.
9 years ago
6670d28cca
(svn r27140) -Codechange: Fix typo in GenenerateLandscapeWindowMode (chillcore)
10 years ago
4b2db6e649
(svn r27140) -Codechange: Fix typo in GenenerateLandscapeWindowMode (chillcore)
10 years ago
b6568912f1
(svn r27135) -Fix: Misalignment in generate world window in case of small fonts.
10 years ago
1c181fd460
(svn r27135) -Fix: Misalignment in generate world window in case of small fonts.
10 years ago
eb9da96a46
(svn r27085) -Fix: Always return a valid window to the world generation gui code.
10 years ago
78896895cf
(svn r27085) -Fix: Always return a valid window to the world generation gui code.
10 years ago
ed8f48a945
(svn r27043) -Fix: could not enter third digit of snow line height
10 years ago
dfd57f2616
(svn r27043) -Fix: could not enter third digit of snow line height
10 years ago
0efe811f74
(svn r27009) -Add: extra level of general map heightness (ChillCore)
10 years ago
8d90e86c2c
(svn r27009) -Add: extra level of general map heightness (ChillCore)
10 years ago
84920f721d
(svn r26926) -Change: limit flat world height to the maximum configured map height
10 years ago
550cd50382
(svn r26926) -Change: limit flat world height to the maximum configured map height
10 years ago
1477b365c1
(svn r26911) -Change: increase maximum possible flat land height in scenario editor to be entered directly (ic111)
10 years ago
ed0ee3ffb3
(svn r26911) -Change: increase maximum possible flat land height in scenario editor to be entered directly (ic111)
10 years ago
b0c7488f6d
(svn r26890) -Cleanup: remove unneeded obfuscation via IConsoleSetSetting
10 years ago
f56b8ba69e
(svn r26890) -Cleanup: remove unneeded obfuscation via IConsoleSetSetting
10 years ago
fa193ece85
(svn r26885) -Feature-ish: user interface for limiting the maximum height of a map
10 years ago
c72d362840
(svn r26885) -Feature-ish: user interface for limiting the maximum height of a map
10 years ago
c07aea8ab8
(svn r26862) -Codechange: Don't shrink widget size in new game window.
10 years ago
c4311903b7
(svn r26862) -Codechange: Don't shrink widget size in new game window.
10 years ago
f5545aa0b1
(svn r26526) -Remove: Ability to set map generation seed via GUI. If you really need it, use the console.
10 years ago
775c96a0d2
(svn r26526) -Remove: Ability to set map generation seed via GUI. If you really need it, use the console.
10 years ago
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
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
201b3d8aa2
(svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns
11 years ago
Jonathan G Rennison
Henry Wilson
Michael Lutz
peter1138
Miguel Horta
Niels Martin Hansen
alberth
frosch
patch-import
rubidium