Jonathan G Rennison
1c7b454a57
Merge branch 'pr-7490' into jgrpp
...
# Conflicts:
# src/dock_gui.cpp
# src/water_cmd.cpp
6 years ago
Jonathan G Rennison
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
6 years ago
Henry Wilson
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
6 years ago
peter1138
72b72dbec3
Add: Press ctrl to build diagonal rivers in scenario editor.
6 years ago
Jonathan G Rennison
7ff252c58d
Merge branch 'master' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/aircraft_cmd.cpp
# src/lang/dutch.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/order_cmd.cpp
# src/settings_gui.cpp
# src/smallmap_gui.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/water_map.h
6 years ago
SamuXarick
4adb91202d
Fix: Remove desert around lakes upon generation
6 years ago
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
6 years ago
Charles Pigott
52ed3bcbaa
Remove: A few bits of dead code
6 years ago
Jonathan G Rennison
9e1e074c2b
Update existing assertions to log tile information where suitable
6 years ago
Jonathan G Rennison
ad1c402ad8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/settings_type.h
# src/town_cmd.cpp
# src/window.cpp
7 years ago
J0anJosep
79a551a83c
Codechange: Use TileAddBy(Diag)Dir when possible.
7 years ago
Jonathan G Rennison
1fe0bb76b9
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
7 years ago
Michael Lutz
f240274b7e
Codechange: Replace magic numbers with the proper enum.
7 years ago
Jonathan G Rennison
385a2552e9
Merge branch 'enhanced_viewport_overlay' into jgrpp
7 years ago
Jonathan G Rennison
864d94d2c5
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/industry_cmd.cpp
# src/vehicle.cpp
7 years ago
peter1138
50fb460203
(svn r27973) -Fix: [FS#6662] Avoid tile operations outside map border when building lock.
7 years ago
peter1138
c46e470f07
(svn r27973) -Fix: [FS#6662] Avoid tile operations outside map border when building lock.
7 years ago
Jonathan G Rennison
f03de4bcc1
Fix not being allowed to build docks, ship depots, when removing water is disabled
7 years ago
Jonathan G Rennison
2574e46df8
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/smallmap_gui.cpp
7 years ago
Jonathan G Rennison
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
7 years ago
frosch
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
frosch
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
Jonathan G Rennison
4db69283c1
Add setting to disable removing sea/rivers
7 years ago
Jonathan G Rennison
591d2ee8b9
Merge branch 'ingame_rivers' into jgrpp
...
Conflicts:
src/settings_gui.cpp
src/settings_type.h
9 years ago
Jonathan G Rennison
9c75a3c477
Enable building rivers in-game.
...
Controlled by setting, default off.
9 years ago
Jonathan G Rennison
e24839ed65
Merge branch 'master' into enhanced_viewport_overlay
...
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw
Conflicts:
src/clear_cmd.cpp
src/pbs.cpp
src/rail_cmd.cpp
src/toolbar_gui.cpp
src/train_cmd.cpp
src/vehicle.cpp
src/viewport.cpp
src/viewport_func.h
9 years ago
patch-import
536a95dfd0
Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
...
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
frosch
9c75b61e5f
(svn r27254) -Fix [FS#6264]: When building a lock on DC_AUTO-removable water-based objects, the water class was always set to canal.
10 years ago
frosch
7e12a1a985
(svn r27254) -Fix [FS#6264]: When building a lock on DC_AUTO-removable water-based objects, the water class was always set to canal.
10 years ago
rubidium
dc2b4f2498
(svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible
10 years ago
rubidium
9daf7e749c
(svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible
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
11 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
11 years ago
planetmaker
0f44dfe473
(svn r26344) -Change [FS#5907]: Do not flood shores of type MP_TREE needlessly (MJP)
11 years ago
planetmaker
40f61eaf15
(svn r26344) -Change [FS#5907]: Do not flood shores of type MP_TREE needlessly (MJP)
11 years ago
zuu
e124838db5
(svn r25849) -Codechange: Introduce IsTileFlat to not compute full slope information for situations when we only want to know if a tile is flat or not (cirdan, LordAro)
11 years ago
zuu
dfb5663313
(svn r25849) -Codechange: Introduce IsTileFlat to not compute full slope information for situations when we only want to know if a tile is flat or not (cirdan, LordAro)
11 years ago
planetmaker
83c2c96b74
(svn r25229) -Feature: [NewGRF] Variable 0x82 for canals and rivers (dike map)
12 years ago
planetmaker
a8ba748434
(svn r25229) -Feature: [NewGRF] Variable 0x82 for canals and rivers (dike map)
12 years ago
frosch
0278d192c6
(svn r25220) -Change [FS#Eddi]: Consider map border as water wrt. river/canal continuation.
12 years ago
frosch
02924a1d3e
(svn r25220) -Change [FS#Eddi]: Consider map border as water wrt. river/canal continuation.
12 years ago
rubidium
5f6e789e1f
(svn r24972) -Fix [FS#5258]: do not make overbuilding rivers with canals insanely expensive; there is no real need to fill the river with dirt first, just excavate it a bit and build borders
12 years ago
rubidium
00530f4ccf
(svn r24972) -Fix [FS#5258]: do not make overbuilding rivers with canals insanely expensive; there is no real need to fill the river with dirt first, just excavate it a bit and build borders
12 years ago
planetmaker
c84ca4d500
(svn r24924) -Fix (r24923): Make sure that autoslope on steep coast tiles cannot not leave invalid canals
12 years ago
planetmaker
9823fac63b
(svn r24924) -Fix (r24923): Make sure that autoslope on steep coast tiles cannot not leave invalid canals
12 years ago
planetmaker
e264ab19f9
(svn r24923) -Fix [FS#5441]: When an object built on a river is removed, restore the river, if possible also on slopes (based on patch by Supercheese)
12 years ago
planetmaker
42883b9543
(svn r24923) -Fix [FS#5441]: When an object built on a river is removed, restore the river, if possible also on slopes (based on patch by Supercheese)
12 years ago
frosch
336a93a9d8
(svn r24846) -Add: Advanced settings to disable certain sound effects.
12 years ago
frosch
3ce8d2ce70
(svn r24846) -Add: Advanced settings to disable certain sound effects.
12 years ago
frosch
2aa43d6c8b
(svn r24284) -Codechange: Remove NewsSubtypes and directly use NewsTypes and NewsFlag instead.
13 years ago