Jonathan G Rennison
faa77e2605
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/script/api/script_company.cpp
# src/script/api/script_date.cpp
# src/script/api/script_date.hpp
# src/script/api/script_gamesettings.cpp
# src/script/api/script_order.hpp
# src/script/api/script_town.cpp
# src/script/api/script_window.cpp
2 years ago
Rubidium
8fa61533f0
Fix 30ae072: when a road type is hidden, towns may not build them even when that flag is set
2 years ago
Jonathan G Rennison
3c5ae5563d
Fix missing include
2 years ago
Jonathan G Rennison
f7d62a1767
Add road/tram type flag to disallow collisions with trains
2 years ago
Jonathan G Rennison
663a3969a0
Add road/tram type flag to disallow tunnels
2 years ago
Jonathan G Rennison
3497d0dcdb
Add road/tram type properties to set road vehicle collision mode
2 years ago
Jonathan G Rennison
64c210f770
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/build_vehicle_gui.cpp
# src/engine.cpp
# src/engine_func.h
# src/group_gui.cpp
# src/lang/english.txt
# src/newgrf.cpp
# src/saveload/oldloader_sl.cpp
# src/timetable_cmd.cpp
# src/timetable_cmd.h
# src/timetable_gui.cpp
2 years ago
Francis Herne
6caed5f15e
Add: Slope-aware and roadtype-specific one-way sprites. ( #10282 )
2 years ago
Jonathan G Rennison
3435e74c0c
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/release.yml
# CMakeLists.txt
# os/macosx/Info.plist.in
# src/fileio.cpp
# src/landscape.cpp
# src/league_cmd.h
# src/saveload/ai_sl.cpp
# src/saveload/game_sl.cpp
# src/saveload/league_sl.cpp
# src/saveload/saveload.cpp
2 years ago
Loïc Guilloux
c50fabb574
Fix #10208 : allow to use specific underlay for road/tram tunnels ( #10233 )
2 years ago
glx22
8333323090
Codechange: Replace FOR_ALL_ROADTRAMTYPES with range-based for loops
...
(cherry picked from commit 2feb801e56
)
3 years ago
Peter Nelson
5e1b4e1844
Cleanup: Replace FOR_ALL_SORTED_ROADTYPES macro with range iterator.
...
(cherry picked from commit de81afdf4b
)
3 years ago
glx22
2feb801e56
Codechange: Replace FOR_ALL_ROADTRAMTYPES with range-based for loops
3 years ago
Peter Nelson
de81afdf4b
Cleanup: Replace FOR_ALL_SORTED_ROADTYPES macro with range iterator.
3 years ago
Jonathan G Rennison
946442ab6b
GRF: Add extra road/tram type flag: towns cannot modify tiles
4 years ago
Jonathan G Rennison
75a964acb0
GRF: Add extra road/tram type flag: not available to AI/GS
4 years ago
S. D. Cloudt
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
peter1138
c02ef3e456
Feature: Add NotRoadTypes (NRT)
5 years ago
rubidium
e4ef359f47
(svn r11663) -Codechange: moving of the road related types and functions.
17 years ago
skidd13
71c4325c50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
17 years ago
rubidium
01edaeec57
(svn r11172) -Codechange: rewrite of town road building and addition of the possibility to clean up unconnected road bits during the local road reconstructions. Based on a patch by skidd13.
17 years ago
belugas
1e4f8d7a23
(svn r11091) -Codechange: Partial rewrite of the road management code of towns, in order to make it more readable and with improved performance. (FS#1161 by skidd13)
17 years ago
rubidium
e9f9980e8f
(svn r10764) -Documentation: [FS#1099]: of road.h. Based on a patch by Progman.
17 years ago
rubidium
17390241e6
(svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0.
18 years ago
rubidium
d86b5e5e93
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
18 years ago
belugas
386e298acd
(svn r9523) -Cleanup: doxygen changes. Time to take care of "R"
18 years ago
rubidium
24c4d5b06d
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
18 years ago
rubidium
202702c007
(svn r8852) -Fix (r8735): make the dynamite tool for drive through road stops as if it were removing a normal road tile (consider the local authority and such).
...
-Fix (r8735): remove drive through road stops on town owned roads when going bankrupt/being removed.
18 years ago
rubidium
447b16930e
(svn r8730) -Codechange: more replacements of magic numbers by enums and removal of some (by now) redundant comments.
18 years ago
rubidium
f35ed4bbc2
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
18 years ago
rubidium
66bbf336c6
(svn r7759) -Merge: makefile rewrite. This merge features:
...
- A proper ./configure, so everything needs to be configured only once, not for every make.
- Usage of makedepend when available. This greatly reduces the time needed for generating the dependencies.
- A generator for all project files. There is a single file with sources, which is used to generate Makefiles and the project files for MSVC.
- Proper support for OSX universal binaries.
- Object files for non-MSVC compiles are also placed in separate directories, making is faster to switch between debug and release compiles and it does not touch the directory with the source files.
- Functionality to make a bundle of all needed files for for example a nightly or distribution of a binary with all needed GRFs and language files.
Note: as this merge moves almost all files, it is recommended to make a backup of your working copy before updating your working copy.
18 years ago