Jonathan G Rennison
|
7960db35f2
|
Merge branch 'master' into jgrpp
# Conflicts:
# config.lib
# 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/aircraft_cmd.cpp
# src/base_station_base.h
# src/core/pool_type.hpp
# src/disaster_vehicle.cpp
# src/economy.cpp
# src/engine.cpp
# src/group.h
# src/group_cmd.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/network/network_command.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/order_cmd.cpp
# src/road_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/cargopacket_sl.cpp
# src/saveload/linkgraph_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/settings_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train.h
# src/train_cmd.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehiclelist.cpp
# src/window_type.h
|
2020-01-06 18:45:51 +00:00 |
|
glx
|
ddabfed1cd
|
Codechange: Replace station related FOR_ALL with range-based for loops
|
2019-12-21 20:13:03 +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
|
0246d59c8d
|
FlowStat: Replace btree_map with flat map which is inlined in small case
Inline storage for size <= 2
Size = 1 is ~90%
Size = 2 is ~9%
Size >=3 is ~1% and gets a separate allocation
|
2019-10-01 02:34:15 +01:00 |
|
Jonathan G Rennison
|
90550d9642
|
FlowStatMap: Replace RB-tree with btree-indexed vector
|
2019-10-01 02:13:33 +01:00 |
|
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
2019-04-10 23:22:20 +02:00 |
|
J0an Josep
|
cfb8092397
|
Fix b4b98e5165: Use FALLTHROUGH attribute with correct indentation.
|
2018-04-30 21:52:40 +02:00 |
|
rubidium
|
d534c80e94
|
(svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces)
|
2014-10-15 18:31:37 +00:00 |
|
fonsinchen
|
2128f1e929
|
(svn r26893) -Feature: ScriptStationList_Cargo for sorting cargo by from and via
|
2014-09-21 16:20:48 +00:00 |
|
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
|
2014-04-23 20:13:33 +00:00 |
|
truebrain
|
cc3f42794d
|
(svn r23632) -Add: GSCompanyMode, to change company in GameScripts
|
2011-12-19 21:05:25 +00:00 |
|
truebrain
|
9359c6fc47
|
(svn r23615) -Add: more API functions exposed to NoGo (part 2)
|
2011-12-19 20:57:34 +00:00 |
|
truebrain
|
98103121d4
|
(svn r23355) -Codechange: rename all AI* to Script* (Rubidium)
|
2011-11-29 23:15:35 +00:00 |
|
truebrain
|
afdb67a353
|
(svn r23354) -Codechange: move all src/ai/api/ai_*.[hc]pp files to src/script/api/script_* (Rubidium)
|
2011-11-29 23:07:38 +00:00 |
|