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
2fdcc52321
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/lang/dutch.txt
# src/lang/korean.txt
# src/network/network.cpp
# src/network/network_client.cpp
# src/rail.cpp
# src/rail_cmd.cpp
# src/saveload/afterload.cpp
# src/ship_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle.cpp
6 years ago
Gabda
37bb2c9308
Codechange: Make the style of MakeVoid calls uniform ( #7192 )
6 years ago
Jonathan G Rennison
9d3b77c5a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fios_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
6 years ago
J0an Josep
19be1f4ace
Codechange: [NPF] Add some consts.
6 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
6 years ago
Johannes E. Krause
c33596fe4a
Codechange: Unify tile height model in all functions (Patch by adf88, #6583 )
6 years ago
Johannes E. Krause
f744dea0ff
Fix: jumping effect when scrolling viewport over bottom edge of the map (Patch by adf88, #6583 )
6 years ago
Johannes E. Krause
f0290d5de7
Codechange: Add InverseRemapCoords2 function for remapping viewport coordinates to underlying tile coordinates (Patch by adf88, #6583 )
6 years ago
Jonathan G Rennison
035f5622b9
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_cmds.cpp
# src/landscape.cpp
# src/linkgraph/linkgraphschedule.cpp
# src/openttd.cpp
# src/roadveh_cmd.cpp
# src/toolbar_gui.cpp
# src/train_cmd.cpp
# src/vehicle.cpp
# src/viewport.cpp
# src/window_type.h
6 years ago
Niels Martin Hansen
2a868b9f3b
Feature: Framerate display window ( #6822 )
...
Frame rate and various game loop/graphics timing measurements and graphs. Accessible via the Help menu, and can print some stats in the console via the fps command.
6 years ago
Jonathan G Rennison
6740a9a470
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# docs/landscape.html
# src/bridge_map.h
# src/pbs.cpp
# src/saveload/company_sl.cpp
# src/saveload/extended_ver_sl.cpp
# src/settings_type.h
# src/signal.cpp
# src/train_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
# src/tunnelbridge_map.h
# src/vehicle.cpp
# src/viewport.cpp
6 years ago
Jonathan G Rennison
77362b829a
Initial support for rail custom bridge heads
6 years ago
Jonathan G Rennison
3330e4cef8
Merge branch 'cargo_type_order' into jgrpp
...
# Conflicts:
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/track_func.h
6 years ago
Charles Pigott
5f86e1a390
Codechange: Silence -Wclass-memaccess warnings with GCC8
6 years ago
keldorkatarn
4955996b35
Remove costly recalculation of a date format we already have.
...
(cherry picked from commit 6aca18d18252f1c2f6d4a215999b7d7afb7df813)
See #36
7 years ago
Jonathan G Rennison
2e7380bc72
Add scope info logging to tile loop
7 years ago
Jonathan G Rennison
4db69283c1
Add setting to disable removing sea/rivers
7 years ago
Jonathan G Rennison
9d5f34fea6
Replace various uses of std::set/map with btree containers.
8 years ago
Jonathan G Rennison
072915f2c7
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# docs/landscape_grid.html
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/extended_ver_sl.h
# src/settings_gui.cpp
# src/settings_type.h
# src/tunnelbridge_cmd.cpp
# src/tunnelbridge_map.h
8 years ago
Jonathan G Rennison
da177d063f
Custom bridge heads: Initial implementation
8 years ago
Jonathan G Rennison
95aad35774
Instead of list use deque in FlowRiver, vector in StationViewWindow.
8 years ago
Jonathan G Rennison
5e67582a64
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/saveload/extended_ver_sl.cpp
# src/saveload/saveload.cpp
8 years ago
alberth
597380e099
(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.
8 years ago
alberth
a959c0c965
(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.
8 years ago
alberth
9135f7130e
(svn r27635) -Codechange: Move FileType and FileToSaveLoad structure definitions.
8 years ago
alberth
a35e970ab0
(svn r27635) -Codechange: Move FileType and FileToSaveLoad structure definitions.
8 years ago
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.
9 years ago
Jonathan G Rennison
5934cc4995
Fix compile and landscape creation for large maps.
9 years ago
rubidium
0efe811f74
(svn r27009) -Add: extra level of general map heightness (ChillCore)
10 years ago
rubidium
8d90e86c2c
(svn r27009) -Add: extra level of general map heightness (ChillCore)
10 years ago
rubidium
0daf8085c0
(svn r26883) -Change: make maximum desert height scale with the maximum configured height
10 years ago
rubidium
cfe08b86c9
(svn r26883) -Change: make maximum desert height scale with the maximum configured height
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
fonsinchen
193a20d260
(svn r26323) -Fix: update some constants related to map size.
11 years ago
fonsinchen
e4c7c8876b
(svn r26323) -Fix: update some constants related to map size.
11 years ago
rubidium
452056df8f
(svn r26309) -Codechange: instead of memsetting a byte array with zero, use a set for marking the flow area of a river
11 years ago
rubidium
f99d380583
(svn r26309) -Codechange: instead of memsetting a byte array with zero, use a set for marking the flow area of a river
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
fonsinchen
dda4ffab5e
(svn r26290) -Codechange: Use nicer orthogonal tile iterator constructor and simplify calculation of explosion points when clearing.
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
zuu
026a83e4cf
(svn r25847) -Fix: Comment for GetFoundationSlope was wrong (cirdan, LordAro)
11 years ago
zuu
d908897918
(svn r25847) -Fix: Comment for GetFoundationSlope was wrong (cirdan, LordAro)
11 years ago
fonsinchen
97a9908b0e
(svn r25354) -Add: link graph schedule and typedefs for LinkGraph and related classes
11 years ago
fonsinchen
c32eea02dd
(svn r25354) -Add: link graph schedule and typedefs for LinkGraph and related classes
11 years ago
michi_cc
2eae02db59
(svn r24132) -Change [FS#4713]: Improve randomness of tile order in the tile loop. (monoid)
13 years ago
michi_cc
6f9668330e
(svn r24132) -Change [FS#4713]: Improve randomness of tile order in the tile loop. (monoid)
13 years ago
michi_cc
59d0702a6a
(svn r23885) -Codechange: Use the GRF sprite loader for then mapgen sprites as well.
13 years ago
michi_cc
02d07e68d8
(svn r23885) -Codechange: Use the GRF sprite loader for then mapgen sprites as well.
13 years ago
rubidium
d5eeab43b7
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
rubidium
6d6be50ae0
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
rubidium
70faeeaba9
(svn r23106) -Codechange: pass int* to GetTileSlope and friends
13 years ago
rubidium
19eabdba2c
(svn r23106) -Codechange: pass int* to GetTileSlope and friends
13 years ago
rubidium
1138abad35
(svn r23104) -Codechange: prepare the vehicle/sign z for some further changes to reduce casting
13 years ago
rubidium
f01b3e2721
(svn r23104) -Codechange: prepare the vehicle/sign z for some further changes to reduce casting
13 years ago
rubidium
db14361d28
(svn r23099) -Codechange: remove pointless multiplications by TILE_HEIGHT for the water/river code
13 years ago
rubidium
0b6dbaf664
(svn r23099) -Codechange: remove pointless multiplications by TILE_HEIGHT for the water/river code
13 years ago
rubidium
a70fdbcf2f
(svn r23096) -Codechange: remove useless divisions and multiplications by TILE_HEIGHT for the snow line code
13 years ago
rubidium
69162621d8
(svn r23096) -Codechange: remove useless divisions and multiplications by TILE_HEIGHT for the snow line code
13 years ago
rubidium
bcb93b3b75
(svn r23093) -Codechange: add a default NULL for the Z of GetTileSlope and use it
13 years ago
rubidium
2ed0f93bfb
(svn r23093) -Codechange: add a default NULL for the Z of GetTileSlope and use it
13 years ago
rubidium
5bc8a72377
(svn r23092) -Codechange: create a non-pixel version of some of the Get*PixelZ functions, and let Get*PixelZ wrap around the new function (multiplying the Z by TILE_HEIGHT) just like TileHeight and TilePixelHeight
13 years ago
rubidium
a36551dbb4
(svn r23092) -Codechange: create a non-pixel version of some of the Get*PixelZ functions, and let Get*PixelZ wrap around the new function (multiplying the Z by TILE_HEIGHT) just like TileHeight and 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
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
ba1ee9304d
(svn r23090) -Codechange: use map accessors instead of directly accessing the map (mhl)
13 years ago
rubidium
47203dbeb5
(svn r23090) -Codechange: use map accessors instead of directly accessing the map (mhl)
13 years ago
rubidium
41223c8bc9
(svn r23084) -Codechange: get rid of a redundant variable
13 years ago
rubidium
47c5d30b5d
(svn r23084) -Codechange: get rid of a redundant variable
13 years ago
rubidium
7f039ee8da
(svn r22808) -Change [FS#4740]: make it less likely that a one tile wide lake is created
13 years ago
rubidium
9023de2c1f
(svn r22808) -Change [FS#4740]: make it less likely that a one tile wide lake is created
13 years ago
michi_cc
5477ac3eb1
(svn r22773) -Add: Some grass around rivers in desert areas.
13 years ago
michi_cc
4261e8fdfd
(svn r22773) -Add: Some grass around rivers in desert areas.
13 years ago
rubidium
21b1026ca0
(svn r22768) -Add: progress bar updates for river building
13 years ago
rubidium
11a4e402c6
(svn r22768) -Add: progress bar updates for river building
13 years ago
rubidium
56fedc4db9
(svn r22767) -Add: river generation
13 years ago
rubidium
0041408e4f
(svn r22767) -Add: river generation
13 years ago
frosch
53931bccc9
(svn r22670) -Change: Do not spawn explosion effects when bulldozing in paused mode. They block the view.
13 years ago
frosch
718e0090b2
(svn r22670) -Change: Do not spawn explosion effects when bulldozing in paused mode. They block the view.
13 years ago
rubidium
cb2c7f871f
(svn r22018) -Cleanup: remove some (now) unneeded includes of functions.h
14 years ago
rubidium
bc3ce1e53b
(svn r22018) -Cleanup: remove some (now) unneeded includes of functions.h
14 years ago
rubidium
f412ce2b44
(svn r21767) -Fix [FS#4397]: don't limit tile clearing during bankruptcy
14 years ago
rubidium
7e6ccf3a0a
(svn r21767) -Fix [FS#4397]: don't limit tile clearing during bankruptcy
14 years ago
rubidium
be077e030e
(svn r21728) -Fix/Feature [FS#4331]: (configurably) limit amount of tiles that can be cleared/terraformed by a company
14 years ago
rubidium
eab47d2227
(svn r21728) -Fix/Feature [FS#4331]: (configurably) limit amount of tiles that can be cleared/terraformed by a company
14 years ago
rubidium
e634652517
(svn r21714) -Codechange: unduplicate a bit of code path
14 years ago
rubidium
73d26d3831
(svn r21714) -Codechange: unduplicate a bit of code path
14 years ago
rubidium
d3bd44a9bc
(svn r21500) -Feature [FS#730]: diagonal tile clearing and terraforming. Based on patch by fonsinchen
14 years ago
rubidium
6892cc8a60
(svn r21500) -Feature [FS#730]: diagonal tile clearing and terraforming. Based on patch by fonsinchen
14 years ago
rubidium
95e34cba7e
(svn r21482) -Codechange: make landscape clearing make use of TILE_AREA_LOOP as well
14 years ago
rubidium
67e6ad2a4b
(svn r21482) -Codechange: make landscape clearing make use of TILE_AREA_LOOP as well
14 years ago
frosch
9e6f0ab484
(svn r21476) -Fix [FS#4299]: DC_FORCE_CLEAR_TILE should only add extra cost for clearing water for stuff which results in water after clearing.
14 years ago
frosch
5910bde583
(svn r21476) -Fix [FS#4299]: DC_FORCE_CLEAR_TILE should only add extra cost for clearing water for stuff which results in water after clearing.
14 years ago
frosch
061021cbc5
(svn r21288) -Codechange: Add helper function to find entries in _cleared_object_areas.
14 years ago
frosch
d5360390d0
(svn r21288) -Codechange: Add helper function to find entries in _cleared_object_areas.
14 years ago
terkhen
4059acb2cc
(svn r21080) -Fix: Do not allow to use a custom water level with the original map generator.
14 years ago
terkhen
725cf7d8bb
(svn r21080) -Fix: Do not allow to use a custom water level with the original map generator.
14 years ago
alberth
063931d435
(svn r21060) -Doc: Improved wording of comments (mostly by __ln__)
14 years ago
alberth
7e48d85104
(svn r21060) -Doc: Improved wording of comments (mostly by __ln__)
14 years ago
yexo
f27ba44f45
(svn r20821) -Fix [FS#4129]: terraforming the land under objects could leave sloped or elevated sea tiles
14 years ago
yexo
6b4d2f5ae6
(svn r20821) -Fix [FS#4129]: terraforming the land under objects could leave sloped or elevated sea tiles
14 years ago
yexo
66d57b96a8
(svn r20748) -Fix: overbuilding an object tile with sea under it with a canal didn't take the cost for clearing the sea into account
14 years ago
yexo
0e250f2bdf
(svn r20748) -Fix: overbuilding an object tile with sea under it with a canal didn't take the cost for clearing the sea into account
14 years ago
frosch
4a4dd45193
(svn r20743) -Fix: Make testruns of clearing an object tile not influence repeated testruns resp. the exec run.
14 years ago
frosch
42a996ec23
(svn r20743) -Fix: Make testruns of clearing an object tile not influence repeated testruns resp. the exec run.
14 years ago
yexo
ddd16c592b
(svn r20731) -Fix (r20739): SmallVector did not have an assignment operator, causing invalid memory reads / double free
14 years ago
yexo
0decc3e094
(svn r20731) -Fix (r20739): SmallVector did not have an assignment operator, causing invalid memory reads / double free
14 years ago
yexo
0d040f03e6
(svn r20729) -Fix [FS#4107]: assert when overbuilding object
14 years ago
yexo
a45b598bfc
(svn r20729) -Fix [FS#4107]: assert when overbuilding object
14 years ago
rubidium
c3c8f67cef
(svn r20669) -Codechange: trigger the whole object every 256 ticks instead of every 250 ticks
14 years ago
rubidium
2d10b0f11d
(svn r20669) -Codechange: trigger the whole object every 256 ticks instead of every 250 ticks
14 years ago
rubidium
b06ad652c9
(svn r20662) -Codechange: implement object animation
14 years ago
rubidium
60fe27db50
(svn r20662) -Codechange: implement object animation
14 years ago
frosch
811c7f6c25
(svn r20419) -Codechange: Rename dummy_land.cpp to void_cmd.cpp
14 years ago
frosch
67c21f7e01
(svn r20419) -Codechange: Rename dummy_land.cpp to void_cmd.cpp
14 years ago
rubidium
1f2276b785
(svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable.
14 years ago
rubidium
3da3d131c6
(svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable.
14 years ago
frosch
c18839704b
(svn r20286) -Codechange: Unify end of doxygen comments.
14 years ago
frosch
4bd32799f1
(svn r20286) -Codechange: Unify end of doxygen comments.
14 years ago
frosch
5b86c79fce
(svn r20283) -Codechange: Unify start of doygen comments.
14 years ago
frosch
ed4f806f1d
(svn r20283) -Codechange: Unify start of doygen comments.
14 years ago
rubidium
8c85b4ce3d
(svn r20281) -Codechange: unify case scope closure + break coding style
14 years ago
rubidium
e356cb9405
(svn r20281) -Codechange: unify case scope closure + break coding style
14 years ago
alberth
137e2b64c9
(svn r20211) -Codechange: Indented code should have curly braces around it.
14 years ago
alberth
be6c058424
(svn r20211) -Codechange: Indented code should have curly braces around it.
14 years ago
rubidium
9fd2afb147
(svn r20192) -Cleanup: bye bye variables.h, bye bye VARDEF... you won't be missed :)
14 years ago
rubidium
b8487afe54
(svn r20192) -Cleanup: bye bye variables.h, bye bye VARDEF... you won't be missed :)
14 years ago
rubidium
035d0ef16b
(svn r20187) -Codechange: move _tileh_to_sprite into a function in a more logical place and with a more descriptive name
14 years ago
rubidium
5a836cdec7
(svn r20187) -Codechange: move _tileh_to_sprite into a function in a more logical place and with a more descriptive name
14 years ago
frosch
aeb5a099ce
(svn r19769) -Fix [FS#3820]: MV_VOID tiles shall have no tropic zone.
15 years ago
frosch
5b77a63ecf
(svn r19769) -Fix [FS#3820]: MV_VOID tiles shall have no tropic zone.
15 years ago
frosch
5b481e6f4a
(svn r19658) -Fix: One could turn transport companies into credit banks.
15 years ago
frosch
77486ee8d2
(svn r19658) -Fix: One could turn transport companies into credit banks.
15 years ago
smatz
258b128a56
(svn r19614) -Codechange: "it's" => "its" where appropriate
15 years ago
smatz
0ef33548c2
(svn r19614) -Codechange: "it's" => "its" where appropriate
15 years ago
alberth
2cb5c0591f
(svn r19492) -Codechange: Keep track of last error in CmdClearArea().
15 years ago
alberth
66a2a84035
(svn r19492) -Codechange: Keep track of last error in CmdClearArea().
15 years ago
rubidium
f618acfb7d
(svn r18866) -Codechange: remove the CmdFailed(ret)/CmdSucceeded(ret) wrapper functions
15 years ago
rubidium
4d93b704d9
(svn r18866) -Codechange: remove the CmdFailed(ret)/CmdSucceeded(ret) wrapper functions
15 years ago
smatz
1ecb257422
(svn r18853) -Codechange: apply coding style to GenWorld's enums, structs and typedefs
15 years ago
smatz
11e3a00a23
(svn r18853) -Codechange: apply coding style to GenWorld's enums, structs and typedefs
15 years ago
smatz
665a1143a5
(svn r18851) -Codechange: enumify number of steps needed to generate landscape
15 years ago
smatz
2469752559
(svn r18851) -Codechange: enumify number of steps needed to generate landscape
15 years ago
smatz
1a4eb4e4a4
(svn r18850) -Fix [FS#3540]: don't allow screen redraw when the landscape contains broken slopes
15 years ago
smatz
3850b5912f
(svn r18850) -Fix [FS#3540]: don't allow screen redraw when the landscape contains broken slopes
15 years ago
rubidium
9467b7c6d6
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
15 years ago
rubidium
82fc28f77f
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
15 years ago