Jonathan G Rennison
|
c4e2175cc9
|
Merge branch 'master' into jgrpp
|
2022-04-29 18:00:33 +01:00 |
|
Joan Josep
|
bcf26f8ec0
|
Doc: Fix some spelling mistakes (to->two, tileindex->TileIndex). (#9857)
|
2022-04-17 19:00:00 +02:00 |
|
Michael Lutz
|
c6d7b98808
|
Codechange: Un-bitstuff landscape commands.
|
2021-12-16 22:28:32 +01:00 |
|
Jonathan G Rennison
|
6c3e5642f8
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/fileio.cpp
# src/fileio_func.h
# src/fios_gui.cpp
# src/ini_load.cpp
# src/ini_type.h
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/network/network_client.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/os/windows/win32.cpp
# src/road_cmd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/table/settings.ini
# src/tree_cmd.cpp
# src/tree_gui.cpp
# src/vehicle_base.h
# src/video/cocoa/cocoa_v.mm
# src/video/cocoa/event.mm
# src/video/cocoa/wnd_quartz.mm
# src/viewport.cpp
# src/widgets/tree_widget.h
|
2021-01-31 01:08:35 +00:00 |
|
Charles Pigott
|
860c270c73
|
Codechange: Replace assert_compile macro with static_assert
|
2020-12-27 10:55:42 +00: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
|
e735c1a51a
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
|
2018-11-05 12:53:36 +00:00 |
|
Charles Pigott
|
f5b1115039
|
Doc: Lots and lots of doxymentation fixes
|
2018-10-31 12:35:54 +01:00 |
|
Jonathan G Rennison
|
ae15c96c1a
|
Merge branch 'master' into jgrpp
# Conflicts:
# docs/landscape.html
# docs/landscape_grid.html
# src/bridge_gui.cpp
# src/bridge_map.h
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/rail_map.h
# src/rail_type.h
# src/road_map.h
# src/saveload/afterload.cpp
# src/saveload/map_sl.cpp
# src/saveload/saveload.cpp
# src/script/api/script_rail.cpp
# src/station_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
|
2018-07-26 20:54:13 +01:00 |
|
Peter Nelson
|
65548c37a8
|
Change: Extend map array by 2 bytes with a uint16.
|
2018-07-26 13:27:40 +01:00 |
|
Jonathan G Rennison
|
1891e7dfc8
|
Bump max map size to 28 bits.
Prevent opening NewGRF debug window on tile indexes > 27 bits,
to avoid overflowing field.
|
2015-09-11 22:39:41 +01:00 |
|
Jonathan G Rennison
|
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
|
2015-09-11 22:39:01 +01:00 |
|
patch-import
|
7d2b4bd3ea
|
Import extra large maps patch.
http://www.tt-forums.net/viewtopic.php?f=33&t=33137
|
2015-09-11 19:53:08 +01:00 |
|
frosch
|
a0c42f25a4
|
(svn r27132) -Codechange: Add an assertion about the size of the Tile struct to ensure alignment assumptions.
|
2015-02-01 12:25:51 +00:00 |
|
frosch
|
6fceaeee40
|
(svn r27132) -Codechange: Add an assertion about the size of the Tile struct to ensure alignment assumptions.
|
2015-02-01 12:25:51 +00:00 |
|
planetmaker
|
19bf264433
|
(svn r27126) -Fix [FS#6218] (r26873): Reduce memory footprint of map array by shuffling its variables
|
2015-01-26 10:27:51 +00:00 |
|
planetmaker
|
e3b53fb67d
|
(svn r27126) -Fix [FS#6218] (r26873): Reduce memory footprint of map array by shuffling its variables
|
2015-01-26 10:27:51 +00: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 |
|
rubidium
|
337af973b0
|
(svn r26873) -Change: split type_height into a type and height array (ic111)
|
2014-09-21 11:14:58 +00:00 |
|
rubidium
|
04e2324b8f
|
(svn r26873) -Change: split type_height into a type and height array (ic111)
|
2014-09-21 11:14:58 +00:00 |
|
fonsinchen
|
2835f076e6
|
(svn r26319) -Change: Allow map sizes up to 4096x4096.
|
2014-02-09 12:56:36 +00:00 |
|
fonsinchen
|
4cbab4f744
|
(svn r26319) -Change: Allow map sizes up to 4096x4096.
|
2014-02-09 12:56:36 +00:00 |
|
alberth
|
19adc87262
|
(svn r24776) -Doc: Typo fixes, additions, and additional dots collected from various sources (including Eagle_rainbow, MinchinWeb)
|
2012-12-01 13:12:39 +00:00 |
|
alberth
|
732e073261
|
(svn r24776) -Doc: Typo fixes, additions, and additional dots collected from various sources (including Eagle_rainbow, MinchinWeb)
|
2012-12-01 13:12:39 +00:00 |
|
rubidium
|
4f6c97ed0b
|
(svn r21493) -Codechange: don't use the full 32 bits of the level land command to tell whether to raise, lower or keep the level of the first selected tile
|
2010-12-13 11:21:53 +00:00 |
|
rubidium
|
b448b7c98d
|
(svn r21493) -Codechange: don't use the full 32 bits of the level land command to tell whether to raise, lower or keep the level of the first selected tile
|
2010-12-13 11:21:53 +00:00 |
|
rubidium
|
f09a74a996
|
(svn r19812) -Codechange: give some unnamed enums a name or, in case they consisted of unrelated values use static const (u)int
|
2010-05-13 09:44:44 +00:00 |
|
rubidium
|
398418b8fa
|
(svn r19812) -Codechange: give some unnamed enums a name or, in case they consisted of unrelated values use static const (u)int
|
2010-05-13 09:44:44 +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
|
d65963a48f
|
(svn r16603) -Codechange: enumify map size limits (based on a patch by Bilbo)
|
2009-06-20 11:25:39 +00:00 |
|
smatz
|
4419366f94
|
(svn r16603) -Codechange: enumify map size limits (based on a patch by Bilbo)
|
2009-06-20 11:25:39 +00:00 |
|
rubidium
|
f82aeb82c5
|
(svn r11701) -Codechange: removal unnecessary inclusions of map.h (and split map.h).
|
2007-12-26 11:45:43 +00:00 |
|
rubidium
|
2786d789a1
|
(svn r11701) -Codechange: removal unnecessary inclusions of map.h (and split map.h).
|
2007-12-26 11:45:43 +00:00 |
|