Jonathan G Rennison
|
b7ddd486cf
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/cargopacket.cpp
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/core/pool_func.hpp
# src/date.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/ground_vehicle.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/french.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/mcf.cpp
# src/network/network_content.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/newgrf_engine.cpp
# src/newgrf_station.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/station_cmd.cpp
# src/station_kdtree.h
# src/string_func.h
# src/table/settings.ini
# src/tgp.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/train_gui.cpp
# src/tree_gui.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
# src/viewport.cpp
# src/viewport_sprite_sorter_sse4.cpp
# src/window.cpp
|
3 years ago |
Charles Pigott
|
9b800a96ed
|
Codechange: Remove min/max functions in favour of STL variants (#8502)
|
4 years ago |
Jonathan G Rennison
|
352b361e1b
|
Viewport: Replace viewport mark dirty if zoom level below with flags param
Fix missing flags for tracerestrict and effect vehicles
|
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
|
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
|
281d346fe2
|
Merge branch 'master' into jgrpp
# Conflicts:
# bin/baseset/no_sound.obs
# bin/baseset/orig_dos.obg
# bin/baseset/orig_dos.obs
# bin/baseset/orig_dos_de.obg
# bin/baseset/orig_win.obg
# bin/baseset/orig_win.obm
# bin/baseset/orig_win.obs
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.cpp
# src/blitter/8bpp_base.hpp
# src/blitter/common.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/saveload/saveload.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/viewport_func.h
|
5 years ago |
Peter Nelson
|
b6de8c0930
|
Fix #7098, Fix #7061: Inverted test led to invalid iterator access.
|
6 years ago |
Johannes E. Krause
|
05da5a177c
|
Codechange: Simplify marking tiles dirty when terraforming (Patch by adf88, #6583)
|
6 years ago |
Jonathan G Rennison
|
93a43da809
|
Chunnel: Prevent chunnels from intersecting with each other.
|
7 years ago |
Jonathan G Rennison
|
21bbb42d7e
|
Chunnel: Adjust arguments of IsTunnelInWay
|
7 years ago |
HackaLittleBit
|
dfce9cc4c0
|
Chunnel patch 28396: Codechange: Chunnel portal must have minimal length of 4 tiles.
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
|
7 years ago |
Jonathan G Rennison
|
9d5f34fea6
|
Replace various uses of std::set/map with btree containers.
|
7 years ago |
michi_cc
|
2b8bb12d62
|
(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.
|
9 years ago |
michi_cc
|
44918010df
|
(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.
|
9 years ago |
rubidium
|
4db8afce64
|
(svn r26902) -Fix (r26900): erroneous spaces instead of tabs
|
10 years ago |
rubidium
|
58f1e15bce
|
(svn r26902) -Fix (r26900): erroneous spaces instead of tabs
|
10 years ago |
rubidium
|
073aa05da5
|
(svn r26900) -Fix-ish: dirty the appropriate area around map edges when terraforming there to prevent any artefacts from occuring (ic111)
|
10 years ago |
rubidium
|
dfd472f4a4
|
(svn r26900) -Fix-ish: dirty the appropriate area around map edges when terraforming there to prevent any artefacts from occuring (ic111)
|
10 years ago |
rubidium
|
c72d362840
|
(svn r26885) -Feature-ish: user interface for limiting the maximum height of a map
|
10 years ago |
rubidium
|
fa193ece85
|
(svn r26885) -Feature-ish: user interface for limiting the maximum height of a map
|
10 years ago |
rubidium
|
ce04c49e3d
|
(svn r26882) -Feature: allow limiting the height of bridges (ic111)
|
10 years ago |
rubidium
|
647a3c8e5f
|
(svn r26882) -Feature: allow limiting the height of bridges (ic111)
|
10 years ago |
rubidium
|
9daf7e749c
|
(svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible
|
10 years ago |
rubidium
|
dc2b4f2498
|
(svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible
|
10 years ago |
rubidium
|
4c45db295e
|
(svn r26860) -Codechange: improve worst case performance of terraforming (O(n^2) -> O(n log n)) and let memory usage scale to the amount of tiles affected instead of allocating memory for the worst case scenario (patch by ic111)
|
10 years ago |
rubidium
|
890c61d596
|
(svn r26860) -Codechange: improve worst case performance of terraforming (O(n^2) -> O(n log n)) and let memory usage scale to the amount of tiles affected instead of allocating memory for the worst case scenario (patch by ic111)
|
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 |
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 |
fonsinchen
|
dda4ffab5e
|
(svn r26290) -Codechange: Use nicer orthogonal tile iterator constructor and simplify calculation of explosion points when clearing.
|
11 years ago |
fonsinchen
|
8726ade3fa
|
(svn r26290) -Codechange: Use nicer orthogonal tile iterator constructor and simplify calculation of explosion points when clearing.
|
11 years ago |
planetmaker
|
c24374f99c
|
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
|
12 years ago |
planetmaker
|
f00d9976f9
|
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
|
12 years ago |
rubidium
|
6d6be50ae0
|
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
|
13 years ago |
rubidium
|
d5eeab43b7
|
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
|
13 years ago |
rubidium
|
19eabdba2c
|
(svn r23106) -Codechange: pass int* to GetTileSlope and friends
|
13 years ago |
rubidium
|
70faeeaba9
|
(svn r23106) -Codechange: pass int* to GetTileSlope and friends
|
13 years ago |
rubidium
|
1dc685aeea
|
(svn r23100) -Codechange: remove pointless multiplications by TILE_HEIGHT for the terraform code
|
13 years ago |
rubidium
|
5d7acba5d3
|
(svn r23100) -Codechange: remove pointless multiplications by TILE_HEIGHT for the terraform code
|
13 years ago |
rubidium
|
f0f17a77ba
|
(svn r23098) -Codechange: remove pointless multiplications by TILE_HEIGHT from the tunnel code
|
13 years ago |
rubidium
|
f923ede158
|
(svn r23098) -Codechange: remove pointless multiplications by TILE_HEIGHT from the tunnel code
|
13 years ago |
rubidium
|
d0689c2924
|
(svn r23097) -Codechange: remove pointless multiplications by TILE_HEIGHT from the bridge code
|
13 years ago |
rubidium
|
fd992c9fd8
|
(svn r23097) -Codechange: remove pointless multiplications by TILE_HEIGHT from the bridge code
|
13 years ago |
rubidium
|
7757a2ed40
|
(svn r23091) -Codechange: rename some Get*Z functions to Get*PixelZ functions if they return the Z in pixels (like TilePixelHeight)
|
13 years ago |
rubidium
|
de980ef0f9
|
(svn r23091) -Codechange: rename some Get*Z functions to Get*PixelZ functions if they return the Z in pixels (like TilePixelHeight)
|
13 years ago |
alberth
|
a63b22991d
|
(svn r22451) -Codechange: Test for bridges and tunnels during the first pass only while terraforming (HackaLittleBit)
|
13 years ago |
alberth
|
5e736fe77c
|
(svn r22451) -Codechange: Test for bridges and tunnels during the first pass only while terraforming (HackaLittleBit)
|
13 years ago |
rubidium
|
faf5d899f7
|
(svn r22017) -Codechange: move MarkTileDirtyByTile to viewport_func.h
|
14 years ago |
rubidium
|
701bd8848a
|
(svn r22017) -Codechange: move MarkTileDirtyByTile to viewport_func.h
|
14 years ago |