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
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
2019-04-11 18:14:13 +01:00 |
|
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
2019-04-10 23:22:20 +02:00 |
|
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
|
2019-01-29 02:28:14 +00:00 |
|
Peter Nelson
|
b6de8c0930
|
Fix #7098, Fix #7061: Inverted test led to invalid iterator access.
|
2019-01-26 00:25:18 +00:00 |
|
Johannes E. Krause
|
05da5a177c
|
Codechange: Simplify marking tiles dirty when terraforming (Patch by adf88, #6583)
|
2019-01-24 21:17:17 +01:00 |
|
Jonathan G Rennison
|
93a43da809
|
Chunnel: Prevent chunnels from intersecting with each other.
|
2017-03-05 19:13:42 +00:00 |
|
Jonathan G Rennison
|
21bbb42d7e
|
Chunnel: Adjust arguments of IsTunnelInWay
|
2017-03-04 12:23:52 +00:00 |
|
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
|
2017-03-04 11:48:12 +00:00 |
|
Jonathan G Rennison
|
9d5f34fea6
|
Replace various uses of std::set/map with btree containers.
|
2017-02-08 00:18:09 +00:00 |
|
michi_cc
|
2b8bb12d62
|
(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.
|
2015-08-10 20:24:13 +00:00 |
|
michi_cc
|
44918010df
|
(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.
|
2015-08-10 20:24:13 +00:00 |
|
rubidium
|
4db8afce64
|
(svn r26902) -Fix (r26900): erroneous spaces instead of tabs
|
2014-09-21 17:37:30 +00:00 |
|
rubidium
|
58f1e15bce
|
(svn r26902) -Fix (r26900): erroneous spaces instead of tabs
|
2014-09-21 17:37:30 +00:00 |
|
rubidium
|
073aa05da5
|
(svn r26900) -Fix-ish: dirty the appropriate area around map edges when terraforming there to prevent any artefacts from occuring (ic111)
|
2014-09-21 17:29:48 +00:00 |
|
rubidium
|
dfd472f4a4
|
(svn r26900) -Fix-ish: dirty the appropriate area around map edges when terraforming there to prevent any artefacts from occuring (ic111)
|
2014-09-21 17:29:48 +00:00 |
|
rubidium
|
c72d362840
|
(svn r26885) -Feature-ish: user interface for limiting the maximum height of a map
|
2014-09-21 12:25:04 +00:00 |
|
rubidium
|
fa193ece85
|
(svn r26885) -Feature-ish: user interface for limiting the maximum height of a map
|
2014-09-21 12:25:04 +00:00 |
|
rubidium
|
ce04c49e3d
|
(svn r26882) -Feature: allow limiting the height of bridges (ic111)
|
2014-09-21 11:40:11 +00:00 |
|
rubidium
|
647a3c8e5f
|
(svn r26882) -Feature: allow limiting the height of bridges (ic111)
|
2014-09-21 11:40:11 +00:00 |
|
rubidium
|
9daf7e749c
|
(svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible
|
2014-09-21 11:24:51 +00:00 |
|
rubidium
|
dc2b4f2498
|
(svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible
|
2014-09-21 11:24:51 +00:00 |
|
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)
|
2014-09-20 12:11:15 +00:00 |
|
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)
|
2014-09-20 12:11:15 +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 |
|
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
|
2014-04-23 20:13:33 +00:00 |
|
fonsinchen
|
dda4ffab5e
|
(svn r26290) -Codechange: Use nicer orthogonal tile iterator constructor and simplify calculation of explosion points when clearing.
|
2014-02-02 14:53:52 +00:00 |
|
fonsinchen
|
8726ade3fa
|
(svn r26290) -Codechange: Use nicer orthogonal tile iterator constructor and simplify calculation of explosion points when clearing.
|
2014-02-02 14:53:52 +00:00 |
|
planetmaker
|
c24374f99c
|
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
|
2013-01-08 22:46:42 +00:00 |
|
planetmaker
|
f00d9976f9
|
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
|
2013-01-08 22:46:42 +00:00 |
|
rubidium
|
6d6be50ae0
|
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
|
2012-01-03 21:32:51 +00:00 |
|
rubidium
|
d5eeab43b7
|
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
|
2012-01-03 21:32:51 +00:00 |
|
rubidium
|
19eabdba2c
|
(svn r23106) -Codechange: pass int* to GetTileSlope and friends
|
2011-11-04 11:30:37 +00:00 |
|
rubidium
|
70faeeaba9
|
(svn r23106) -Codechange: pass int* to GetTileSlope and friends
|
2011-11-04 11:30:37 +00:00 |
|
rubidium
|
1dc685aeea
|
(svn r23100) -Codechange: remove pointless multiplications by TILE_HEIGHT for the terraform code
|
2011-11-04 10:30:10 +00:00 |
|
rubidium
|
5d7acba5d3
|
(svn r23100) -Codechange: remove pointless multiplications by TILE_HEIGHT for the terraform code
|
2011-11-04 10:30:10 +00:00 |
|
rubidium
|
f0f17a77ba
|
(svn r23098) -Codechange: remove pointless multiplications by TILE_HEIGHT from the tunnel code
|
2011-11-04 10:28:31 +00:00 |
|
rubidium
|
f923ede158
|
(svn r23098) -Codechange: remove pointless multiplications by TILE_HEIGHT from the tunnel code
|
2011-11-04 10:28:31 +00:00 |
|
rubidium
|
d0689c2924
|
(svn r23097) -Codechange: remove pointless multiplications by TILE_HEIGHT from the bridge code
|
2011-11-04 10:28:20 +00:00 |
|
rubidium
|
fd992c9fd8
|
(svn r23097) -Codechange: remove pointless multiplications by TILE_HEIGHT from the bridge code
|
2011-11-04 10:28:20 +00:00 |
|
rubidium
|
7757a2ed40
|
(svn r23091) -Codechange: rename some Get*Z functions to Get*PixelZ functions if they return the Z in pixels (like TilePixelHeight)
|
2011-11-04 10:18:13 +00:00 |
|
rubidium
|
de980ef0f9
|
(svn r23091) -Codechange: rename some Get*Z functions to Get*PixelZ functions if they return the Z in pixels (like TilePixelHeight)
|
2011-11-04 10:18:13 +00:00 |
|
alberth
|
a63b22991d
|
(svn r22451) -Codechange: Test for bridges and tunnels during the first pass only while terraforming (HackaLittleBit)
|
2011-05-14 09:26:16 +00:00 |
|
alberth
|
5e736fe77c
|
(svn r22451) -Codechange: Test for bridges and tunnels during the first pass only while terraforming (HackaLittleBit)
|
2011-05-14 09:26:16 +00:00 |
|
rubidium
|
faf5d899f7
|
(svn r22017) -Codechange: move MarkTileDirtyByTile to viewport_func.h
|
2011-02-07 22:29:47 +00:00 |
|
rubidium
|
701bd8848a
|
(svn r22017) -Codechange: move MarkTileDirtyByTile to viewport_func.h
|
2011-02-07 22:29:47 +00:00 |
|
rubidium
|
7eba2bf4d3
|
(svn r21890) -Cleanup: remove some unneeded includes
|
2011-01-22 14:52:20 +00:00 |
|
rubidium
|
05199a641a
|
(svn r21890) -Cleanup: remove some unneeded includes
|
2011-01-22 14:52:20 +00:00 |
|
rubidium
|
c6b46725db
|
(svn r21791) -Fix [FS#4407]: off-by-one-ish for the terraforming limit
|
2011-01-14 18:45:14 +00:00 |
|