Commit Graph

54 Commits

Author SHA1 Message Date
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
J0an Josep
a53f13cff6 Fix #6805: Clear some m8 bits when making some tiles. 2018-08-04 08:59:22 +02:00
Jonathan G Rennison
912ddc85d4 Merge remote-tracking branch 'J0anJosep/MapArrayGrid-m8' into jgrpp
# Conflicts:
#	docs/landscape_grid.html
2018-07-30 02:05:52 +01:00
J0an Josep
9cabab03b1 Fix #6805: Clear some m8 bits when making some tiles. 2018-07-28 16:00:33 +02:00
Jonathan G Rennison
9e1e074c2b Update existing assertions to log tile information where suitable 2018-07-26 19:13:35 +01:00
rubidium
988b387f14 (svn r27037) -Fix [FS#6150] (r26878): m6 was moved from Tile To TileExtended, but it wasn't properly removed from Tile (patch by Juanjo) 2014-10-23 17:13:44 +00:00
rubidium
8739a7b7d0 (svn r27037) -Fix [FS#6150] (r26878): m6 was moved from Tile To TileExtended, but it wasn't properly removed from Tile (patch by Juanjo) 2014-10-23 17:13:44 +00:00
rubidium
f3b79480ed (svn r26878) -Change: move m6 to TileExtended to keep Tile 8 bytes and thus better alignable 2014-09-21 11:23:33 +00:00
rubidium
982f5a6aa2 (svn r26878) -Change: move m6 to TileExtended to keep Tile 8 bytes and thus better alignable 2014-09-21 11:23:33 +00:00
rubidium
173a234951 (svn r26876) -Codechange: move 'has bride above' data from m6 to type 2014-09-21 11:20:11 +00:00
rubidium
0ac2d3b324 (svn r26876) -Codechange: move 'has bride above' data from m6 to type 2014-09-21 11:20:11 +00:00
zuu
27b153d16a (svn r25852) -Codechange: Merge GetFenceXX/SetFenceXX into one common GetFonce/SetFence for all directions that take an extra direction parameter (cirdan, LordAro) 2013-10-12 22:23:43 +00:00
zuu
fb5dc7762b (svn r25852) -Codechange: Merge GetFenceXX/SetFenceXX into one common GetFonce/SetFence for all directions that take an extra direction parameter (cirdan, LordAro) 2013-10-12 22:23:43 +00:00
rubidium
3d605f6488 (svn r23595) -Codechange: add comma after last enum to get a more uniform coding style 2011-12-19 17:48:04 +00:00
rubidium
df16ebd730 (svn r23595) -Codechange: add comma after last enum to get a more uniform coding style 2011-12-19 17:48:04 +00:00
yexo
0566a6cfda (svn r23168) -Feature [FS#1824]: always draw fences around field tiles 2011-11-08 19:48:47 +00:00
yexo
5c838ff1c3 (svn r23168) -Feature [FS#1824]: always draw fences around field tiles 2011-11-08 19:48:47 +00:00
rubidium
d946841eff (svn r22413) -Document: even more stuff 2011-05-02 20:59:54 +00:00
rubidium
ff143c6708 (svn r22413) -Document: even more stuff 2011-05-02 20:59:54 +00:00
frosch
9ecaa47953 (svn r21367) -Fix (r18719)[FS#4283]: Fields were not cleared under snow though they were intended to be. 2010-12-01 21:35:18 +00:00
frosch
6d962a3e35 (svn r21367) -Fix (r18719)[FS#4283]: Fields were not cleared under snow though they were intended to be. 2010-12-01 21:35:18 +00:00
rubidium
8975ef1f7b (svn r20446) -Codechange: unify the location of the water class 2010-08-11 14:14:06 +00:00
rubidium
ab5b0ceff2 (svn r20446) -Codechange: unify the location of the water class 2010-08-11 14:14:06 +00:00
smatz
258b128a56 (svn r19614) -Codechange: "it's" => "its" where appropriate 2010-04-12 14:12:47 +00:00
smatz
0ef33548c2 (svn r19614) -Codechange: "it's" => "its" where appropriate 2010-04-12 14:12:47 +00:00
yexo
f666760a72 (svn r18738) -Fix (r18719): when a tree died while there was snow the amount of snow on the tile changed 2010-01-05 22:32:47 +00:00
yexo
06842771a8 (svn r18738) -Fix (r18719): when a tree died while there was snow the amount of snow on the tile changed 2010-01-05 22:32:47 +00:00
yexo
2a6fc142de (svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline 2010-01-04 18:33:43 +00:00
yexo
b378e82676 (svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline 2010-01-04 18:33:43 +00:00
rubidium
99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
rubidium
7fbc33dae1 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
smatz
e57699d8c0 (svn r15643) -Fix [FS#2711]: be more strict with zeroing unused map array bits 2009-03-08 16:10:39 +00:00
smatz
e124aa8fd6 (svn r15643) -Fix [FS#2711]: be more strict with zeroing unused map array bits 2009-03-08 16:10:39 +00:00
rubidium
71d4004a85 (svn r11776) -Codechange: more header splittings to reduce the dependencies. 2008-01-07 14:02:26 +00:00
rubidium
38115acf5a (svn r11776) -Codechange: more header splittings to reduce the dependencies. 2008-01-07 14:02:26 +00:00
rubidium
8ebdfb258f (svn r11674) -Codechange: refactor some functions out of macros.h into more logical locations. 2007-12-21 19:21:21 +00:00
rubidium
01e20c9140 (svn r11674) -Codechange: refactor some functions out of macros.h into more logical locations. 2007-12-21 19:21:21 +00:00
rubidium
be923601bf (svn r11669) -Codechange: refactor tile.h -> tile_type.h and tile_map.h 2007-12-19 23:26:02 +00:00
rubidium
5b49e75453 (svn r11669) -Codechange: refactor tile.h -> tile_type.h and tile_map.h 2007-12-19 23:26:02 +00:00
rubidium
82a1d0f2e4 (svn r9554) -Documentation: add documentation to some map accessors. 2007-04-03 21:51:40 +00:00
rubidium
a403f32e59 (svn r9554) -Documentation: add documentation to some map accessors. 2007-04-03 21:51:40 +00:00
rubidium
979ccd45ba (svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {}; 2007-03-07 12:11:48 +00:00
rubidium
24c4d5b06d (svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {}; 2007-03-07 12:11:48 +00:00
belugas
4160d85cd2 (svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style. 2007-02-23 11:50:43 +00:00
belugas
6d199fcdb7 (svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style. 2007-02-23 11:50:43 +00:00
belugas
04694afabb (svn r8050) -Codechange: Rename map member extra to m6, since its usage has been widden.
Only doc landscape_grid.html has been updated, landscape.html will be done latter.
-CodeChange: Replace a direct access to m6 with SetTropicZone in InitializeLandscape, as it is the only part of m6 still untouched without the brute-forced m6=0
2007-01-11 02:05:13 +00:00
belugas
5f9c891734 (svn r8050) -Codechange: Rename map member extra to m6, since its usage has been widden.
Only doc landscape_grid.html has been updated, landscape.html will be done latter.
-CodeChange: Replace a direct access to m6 with SetTropicZone in InitializeLandscape, as it is the only part of m6 still untouched without the brute-forced m6=0
2007-01-11 02:05:13 +00:00
rubidium
a7d0cdf95f (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. 2007-01-10 18:56:51 +00:00
rubidium
f35ed4bbc2 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. 2007-01-10 18:56:51 +00:00