ddf31702a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/group_gui.cpp
# src/lang/english.txt
# src/saveload/saveload.cpp
# src/widgets/group_widget.h
5 years ago
23960d0f2c
Feature: Group liveries, and livery window usability enhancements. ( #7108 )
...
* Change: Replace checkbox in livery selection window with Default option in drop down selection.
This reduces clutter in the UI and allows for primary/secondary colours to independently follow the default scheme if desired.
* Feature: Add vehicle group liveries.
5 years ago
46b1ea81e4
Add company rate limit for land area purchasing
6 years ago
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
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
38fb8c1b84
Zoning: Cache expensive zoning overlay values
7 years ago
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
7 years ago
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
3813b3ca09
Dump infrastructure totals when mismatch detected in CheckCaches.
7 years ago
4c6dc11c16
Merge branch 'infrastructure_sharing-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/signal.cpp
src/table/settings.ini
src/vehicle.cpp
9 years ago
a4ad4130a6
Merge branch 'master' into infrastructure_sharing
...
Conflicts:
src/aircraft_cmd.cpp
src/economy.cpp
src/lang/english.txt
src/order_gui.cpp
src/roadveh_cmd.cpp
src/saveload/saveload.cpp
src/settings.cpp
src/settings_gui.cpp
src/train_cmd.cpp
9 years ago
ee791055f9
Import infrastructure sharing patch
...
Strip trailing whitespace
Remove a leftover line form settings.ini
http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843
9 years ago
44ed3cb3bd
Merge branch 'town-rating-label' into jgrpp
...
Conflicts:
src/lang/english.txt
src/town_cmd.cpp
9 years ago
33d395ad59
Import town rating label patch
...
http://www.tt-forums.net/viewtopic.php?p=1118282#p1118282
9 years ago
44d2f6a988
(svn r26802) -Add: Command to set visibility of an engine for a company (based on patch by Juanjo).
10 years ago
f72ad87540
(svn r26802) -Add: Command to set visibility of an engine for a company (based on patch by Juanjo).
10 years ago
b6ffc92bb2
(svn r26578) -Fix (r26576): network compilation got broken
10 years ago
7215b6a3d3
(svn r26578) -Fix (r26576): network compilation got broken
10 years ago
492c6ed39b
(svn r26576) -Fix [FS#6003]: [Network] AIs would not reset certain network state information upon creation of their company
10 years ago
4a52300838
(svn r26576) -Fix [FS#6003]: [Network] AIs would not reset certain network state information upon creation of their company
10 years ago
034735a54c
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
10 years ago
9ed12b0f07
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
10 years ago
6ecc602050
(svn r26486) -Codechange: replace a number of snprintfs with seprintf
10 years ago
5b82822c12
(svn r26486) -Codechange: replace a number of snprintfs with seprintf
10 years ago
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
10 years ago
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
10 years ago
01af09b830
(svn r25761) -Change: Disable story/goal buttons when there is no content to show instead of when there is zero companies
11 years ago
4e74a4c5cc
(svn r25761) -Change: Disable story/goal buttons when there is no content to show instead of when there is zero companies
11 years ago
9bcad08a7f
(svn r25490) -Fix [FS#5610]: the face of the manager differed on clients when the company was started after the clients joined
11 years ago
11e6d5c8df
(svn r25490) -Fix [FS#5610]: the face of the manager differed on clients when the company was started after the clients joined
11 years ago
71ce89c1d0
(svn r25263) -Add: legend for linkgraph overlay (fonsinchen)
11 years ago
50ae992b47
(svn r25263) -Add: legend for linkgraph overlay (fonsinchen)
11 years ago
8539c04192
(svn r24995) -Codechange: Add flags to vehicle service interval for custom & ispercent (peter1138)
12 years ago
369a6f9d1b
(svn r24995) -Codechange: Add flags to vehicle service interval for custom & ispercent (peter1138)
12 years ago
336a93a9d8
(svn r24846) -Add: Advanced settings to disable certain sound effects.
12 years ago
3ce8d2ce70
(svn r24846) -Add: Advanced settings to disable certain sound effects.
12 years ago
2aa43d6c8b
(svn r24284) -Codechange: Remove NewsSubtypes and directly use NewsTypes and NewsFlag instead.
12 years ago
a8c88f43b6
(svn r24284) -Codechange: Remove NewsSubtypes and directly use NewsTypes and NewsFlag instead.
12 years ago
6f35cf016b
(svn r24281) -Cleanup: Merge all company news subtypes into a single one; they all behave the same.
12 years ago
c796801c4d
(svn r24281) -Cleanup: Merge all company news subtypes into a single one; they all behave the same.
12 years ago
07f32df363
(svn r24134) -Add: Configurable limits for tree planting.
12 years ago
f3e295b4ec
(svn r24134) -Add: Configurable limits for tree planting.
12 years ago
1d098d8ce2
(svn r23822) -Fix-ish: when replaying make sure companies get created even if their creating client doesn't exist during the replay
13 years ago
a66debfadd
(svn r23822) -Fix-ish: when replaying make sure companies get created even if their creating client doesn't exist during the replay
13 years ago
3481ca0f57
(svn r23741) -Revert (r23740): the few parts that the Windows / non-network compiles stumble on
13 years ago
d8d2f74559
(svn r23741) -Revert (r23740): the few parts that the Windows / non-network compiles stumble on
13 years ago
d5eeab43b7
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
6d6be50ae0
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
ff1db1a6c8
(svn r23728) -Fix [#FS4942-ish]: when cheating into another company, the SignList was not updated
13 years ago
Jonathan G Rennison
PeterN
Charles Pigott
frosch
patch-import
alberth
rubidium
zuu
michi_cc
truebrain