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
|
3813b3ca09
|
Dump infrastructure totals when mismatch detected in CheckCaches.
|
7 years ago |
Jonathan G Rennison
|
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 |
Jonathan G Rennison
|
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 |
patch-import
|
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 |
Jonathan G Rennison
|
44ed3cb3bd
|
Merge branch 'town-rating-label' into jgrpp
Conflicts:
src/lang/english.txt
src/town_cmd.cpp
|
9 years ago |
patch-import
|
33d395ad59
|
Import town rating label patch
http://www.tt-forums.net/viewtopic.php?p=1118282#p1118282
|
9 years ago |
alberth
|
44d2f6a988
|
(svn r26802) -Add: Command to set visibility of an engine for a company (based on patch by Juanjo).
|
10 years ago |
alberth
|
f72ad87540
|
(svn r26802) -Add: Command to set visibility of an engine for a company (based on patch by Juanjo).
|
10 years ago |
rubidium
|
b6ffc92bb2
|
(svn r26578) -Fix (r26576): network compilation got broken
|
10 years ago |
rubidium
|
7215b6a3d3
|
(svn r26578) -Fix (r26576): network compilation got broken
|
10 years ago |
rubidium
|
492c6ed39b
|
(svn r26576) -Fix [FS#6003]: [Network] AIs would not reset certain network state information upon creation of their company
|
10 years ago |
rubidium
|
4a52300838
|
(svn r26576) -Fix [FS#6003]: [Network] AIs would not reset certain network state information upon creation of their company
|
10 years ago |
rubidium
|
034735a54c
|
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
|
10 years ago |
rubidium
|
9ed12b0f07
|
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
|
10 years ago |
rubidium
|
6ecc602050
|
(svn r26486) -Codechange: replace a number of snprintfs with seprintf
|
10 years ago |
rubidium
|
5b82822c12
|
(svn r26486) -Codechange: replace a number of snprintfs with seprintf
|
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
|
10 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
|
10 years ago |
zuu
|
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 |
zuu
|
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 |
rubidium
|
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 |
rubidium
|
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 |
rubidium
|
71ce89c1d0
|
(svn r25263) -Add: legend for linkgraph overlay (fonsinchen)
|
11 years ago |
rubidium
|
50ae992b47
|
(svn r25263) -Add: legend for linkgraph overlay (fonsinchen)
|
11 years ago |
rubidium
|
8539c04192
|
(svn r24995) -Codechange: Add flags to vehicle service interval for custom & ispercent (peter1138)
|
11 years ago |
rubidium
|
369a6f9d1b
|
(svn r24995) -Codechange: Add flags to vehicle service interval for custom & ispercent (peter1138)
|
11 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.
|
12 years ago |
frosch
|
a8c88f43b6
|
(svn r24284) -Codechange: Remove NewsSubtypes and directly use NewsTypes and NewsFlag instead.
|
12 years ago |
frosch
|
6f35cf016b
|
(svn r24281) -Cleanup: Merge all company news subtypes into a single one; they all behave the same.
|
12 years ago |
frosch
|
c796801c4d
|
(svn r24281) -Cleanup: Merge all company news subtypes into a single one; they all behave the same.
|
12 years ago |
michi_cc
|
07f32df363
|
(svn r24134) -Add: Configurable limits for tree planting.
|
12 years ago |
michi_cc
|
f3e295b4ec
|
(svn r24134) -Add: Configurable limits for tree planting.
|
12 years ago |
rubidium
|
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 |
rubidium
|
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 |
rubidium
|
3481ca0f57
|
(svn r23741) -Revert (r23740): the few parts that the Windows / non-network compiles stumble on
|
13 years ago |
rubidium
|
d8d2f74559
|
(svn r23741) -Revert (r23740): the few parts that the Windows / non-network compiles stumble on
|
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 |
truebrain
|
ff1db1a6c8
|
(svn r23728) -Fix [#FS4942-ish]: when cheating into another company, the SignList was not updated
|
13 years ago |
truebrain
|
9a05d03e2c
|
(svn r23728) -Fix [#FS4942-ish]: when cheating into another company, the SignList was not updated
|
13 years ago |
truebrain
|
8faa8f2342
|
(svn r23648) -Revert (r23646): partial revert; nobody has to know about my local changes and attempts
|
13 years ago |
truebrain
|
e1f04b89c3
|
(svn r23648) -Revert (r23646): partial revert; nobody has to know about my local changes and attempts
|
13 years ago |
truebrain
|
190a68b350
|
(svn r23646) -Fix [FS#4901]: rescan the Game Scripts when done downloading one.
|
13 years ago |
truebrain
|
da8777d4e5
|
(svn r23646) -Fix [FS#4901]: rescan the Game Scripts when done downloading one.
|
13 years ago |
truebrain
|
bc78328918
|
(svn r23622) -Add: a set of events to trigger in a GameScript
|
13 years ago |
truebrain
|
77b7366c29
|
(svn r23622) -Add: a set of events to trigger in a GameScript
|
13 years ago |
truebrain
|
c74ccfff1b
|
(svn r23601) -Fix: fix the conflict in window number
|
13 years ago |
truebrain
|
561b25d031
|
(svn r23601) -Fix: fix the conflict in window number
|
13 years ago |
truebrain
|
a9531da713
|
(svn r23398) -Fix: the AIEvent.ET_COMPANY_NEW was only triggered if a company named itself, which seems like a very odd place to do so. Trigger it when the company is created instead
|
13 years ago |
truebrain
|
f259e6bf5d
|
(svn r23398) -Fix: the AIEvent.ET_COMPANY_NEW was only triggered if a company named itself, which seems like a very odd place to do so. Trigger it when the company is created instead
|
13 years ago |
truebrain
|
bf803e40cc
|
(svn r23384) -Remove: no longer allow a binary to be without AI support; the parts some compilers failed at, are integrated in other parts of the code now too
|
13 years ago |
truebrain
|
cc12942d70
|
(svn r23384) -Remove: no longer allow a binary to be without AI support; the parts some compilers failed at, are integrated in other parts of the code now too
|
13 years ago |
truebrain
|
af1b3cc070
|
(svn r23355) -Codechange: rename all AI* to Script* (Rubidium)
|
13 years ago |
truebrain
|
98103121d4
|
(svn r23355) -Codechange: rename all AI* to Script* (Rubidium)
|
13 years ago |
rubidium
|
7005bb694c
|
(svn r23031) -Fix [FS#4804]: for the admin "bots" there was no distinction between bankruptcy and manual removal of companies even though the API suggested that
|
13 years ago |
rubidium
|
de27205e6c
|
(svn r23031) -Fix [FS#4804]: for the admin "bots" there was no distinction between bankruptcy and manual removal of companies even though the API suggested that
|
13 years ago |
rubidium
|
91e2f44c22
|
(svn r23030) -Fix [FS#4796]: always show a chat message and send an admin packet when a new company is made
|
13 years ago |
rubidium
|
16e1314f58
|
(svn r23030) -Fix [FS#4796]: always show a chat message and send an admin packet when a new company is made
|
13 years ago |
frosch
|
a80d20fdb1
|
(svn r22982) -Cleanup: Remove CountCompanyVehicles() and use ALL_GROUP statistics instead.
|
13 years ago |
frosch
|
1a12008fcf
|
(svn r22982) -Cleanup: Remove CountCompanyVehicles() and use ALL_GROUP statistics instead.
|
13 years ago |
frosch
|
f406385319
|
(svn r22981) -Add: GroupStatistics for the ALL_GROUP.
|
13 years ago |
frosch
|
dd74536bef
|
(svn r22981) -Add: GroupStatistics for the ALL_GROUP.
|
13 years ago |
rubidium
|
3722a0bf98
|
(svn r22957) -Codechange: SPECSTR_PLAYERNAME is actually the company name, which is derived from the town name + ' Transport'. So make sure the last constant is in sync with the town name table
|
13 years ago |
rubidium
|
a6f9488ae4
|
(svn r22957) -Codechange: SPECSTR_PLAYERNAME is actually the company name, which is derived from the town name + ' Transport'. So make sure the last constant is in sync with the town name table
|
13 years ago |
rubidium
|
d946841eff
|
(svn r22413) -Document: even more stuff
|
13 years ago |
rubidium
|
ff143c6708
|
(svn r22413) -Document: even more stuff
|
13 years ago |
rubidium
|
0a7dcc9781
|
(svn r22362) -Codechange: NetworkFindClientInfoFromClientID -> NetworkClientInfo::GetByClientID
|
13 years ago |
rubidium
|
bc9a803ea9
|
(svn r22362) -Codechange: NetworkFindClientInfoFromClientID -> NetworkClientInfo::GetByClientID
|
13 years ago |
rubidium
|
c90e28d184
|
(svn r22361) -Codechange: delete the client list popup when the client got removed (instead of previously selecting some other client)
|
13 years ago |
rubidium
|
393fb8e46b
|
(svn r22361) -Codechange: delete the client list popup when the client got removed (instead of previously selecting some other client)
|
13 years ago |
rubidium
|
9a466d0e04
|
(svn r22358) -Codechange: WC_TOOLBAR_MENU isn't the right name when its only used for client list popups
|
13 years ago |
rubidium
|
835ae31f45
|
(svn r22358) -Codechange: WC_TOOLBAR_MENU isn't the right name when its only used for client list popups
|
13 years ago |
frosch
|
64a8bdca02
|
(svn r22253) -Change: Apply the same inflation to the initial loan as to the maximum loan. Note that this is no change to the economy; it only saves players some clicks when starting companies in later years. (Eddi)
|
13 years ago |
frosch
|
f81dd357e8
|
(svn r22253) -Change: Apply the same inflation to the initial loan as to the maximum loan. Note that this is no change to the economy; it only saves players some clicks when starting companies in later years. (Eddi)
|
13 years ago |
smatz
|
c85e1c3089
|
(svn r22116) -Codechange: use PoolBase::Clean() at more places
|
13 years ago |
smatz
|
756cc6cf65
|
(svn r22116) -Codechange: use PoolBase::Clean() at more places
|
13 years ago |
terkhen
|
7cfc01c41d
|
(svn r22079) -Fix: The owner view of the smallmap was not updated after a company colour change.
|
13 years ago |
terkhen
|
8e4b2c951d
|
(svn r22079) -Fix: The owner view of the smallmap was not updated after a company colour change.
|
13 years ago |
rubidium
|
f1e42dc23b
|
(svn r21854) -Codechange: refactor the password setting methods to make it possible to change the password of other companies (on the server)
|
14 years ago |
rubidium
|
795a528328
|
(svn r21854) -Codechange: refactor the password setting methods to make it possible to change the password of other companies (on the server)
|
14 years ago |
rubidium
|
ec4f688ca0
|
(svn r21845) -Codechange: move documentation towards the code to make it more likely to be updates [d-m].
|
14 years ago |
rubidium
|
7efd7e19ed
|
(svn r21845) -Codechange: move documentation towards the code to make it more likely to be updates [d-m].
|
14 years ago |
terkhen
|
b6148914b0
|
(svn r21803) -Cleanup: Remove unnecessary semicolons.
|
14 years ago |
terkhen
|
679cd3c21b
|
(svn r21803) -Cleanup: Remove unnecessary semicolons.
|
14 years ago |
terkhen
|
789da3ffa3
|
(svn r21733) -Codechange: Clarify the update owner legend code.
-Fix: Prevent crashes caused by deleted companies.
|
14 years ago |
terkhen
|
03088dadda
|
(svn r21733) -Codechange: Clarify the update owner legend code.
-Fix: Prevent crashes caused by deleted companies.
|
14 years ago |
rubidium
|
1850e6fd5c
|
(svn r21731) -Fix (r21728): don't forget to update the saveload version, or to check for MSVC warnings
|
14 years ago |
rubidium
|
4cc2d71d6d
|
(svn r21731) -Fix (r21728): don't forget to update the saveload version, or to check for MSVC warnings
|
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 |
terkhen
|
1af95597cf
|
(svn r21718) -Feature: Show a list of companies in the owner legend.
|
14 years ago |
terkhen
|
2103f7e91a
|
(svn r21718) -Feature: Show a list of companies in the owner legend.
|
14 years ago |
rubidium
|
8d9c6ecf7f
|
(svn r21700) -Codechange: GetDrawStringCompanyColour returns a TextColour
|
14 years ago |
rubidium
|
1c2d56d314
|
(svn r21700) -Codechange: GetDrawStringCompanyColour returns a TextColour
|
14 years ago |
yexo
|
b6680625d3
|
(svn r21696) -Feature [FS#4362]: allow changing the AI configuration in the scenario editor / in game
|
14 years ago |
yexo
|
b22945350f
|
(svn r21696) -Feature [FS#4362]: allow changing the AI configuration in the scenario editor / in game
|
14 years ago |
rubidium
|
de7a30cc2e
|
(svn r21637) -Codechange: make it more clear that IS_PALETTE_COLOUR belongs to TextColour
|
14 years ago |
rubidium
|
2c41b8ee97
|
(svn r21637) -Codechange: make it more clear that IS_PALETTE_COLOUR belongs to TextColour
|
14 years ago |
rubidium
|
dd618051a7
|
(svn r21412) -Codechange: limit company name by amount of characters, not bytes
|
14 years ago |
rubidium
|
cf61c2f11f
|
(svn r21412) -Codechange: limit company name by amount of characters, not bytes
|
14 years ago |
rubidium
|
83535a52ea
|
(svn r21408) -Codechange: limit president name by amount of characters, not bytes
|
14 years ago |
rubidium
|
9a18050646
|
(svn r21408) -Codechange: limit president name by amount of characters, not bytes
|
14 years ago |
rubidium
|
c7066d00af
|
(svn r21358) -Codechange: make some network function names conform to coding style
|
14 years ago |
rubidium
|
b6c2216749
|
(svn r21358) -Codechange: make some network function names conform to coding style
|
14 years ago |
rubidium
|
56a65270fc
|
(svn r20970) -Add: company change notification to remote admins (dihedral)
|
14 years ago |
rubidium
|
ae20cb4f3d
|
(svn r20970) -Add: company change notification to remote admins (dihedral)
|
14 years ago |
rubidium
|
ecb191b1ba
|
(svn r20919) -Fix [FS#4140]: objects didn't change colour when the company changed colour. Now they do, except when the "decide colour" callback is (defined to be) used
|
14 years ago |
rubidium
|
feece0b42c
|
(svn r20919) -Fix [FS#4140]: objects didn't change colour when the company changed colour. Now they do, except when the "decide colour" callback is (defined to be) used
|
14 years ago |
alberth
|
2b4da1d345
|
(svn r20689) -Codechange: Make some global functions used in 1 .cpp file static in that file.
|
14 years ago |
alberth
|
9f5a96ead2
|
(svn r20689) -Codechange: Make some global functions used in 1 .cpp file static in that file.
|
14 years ago |
rubidium
|
360d6daf34
|
(svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers
|
14 years ago |
rubidium
|
30f2afac9b
|
(svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers
|
14 years ago |
rubidium
|
ef7bffa360
|
(svn r20543) -Fix (r20542): compilation failed when networking was disabled
|
14 years ago |
rubidium
|
84de237507
|
(svn r20543) -Fix (r20542): compilation failed when networking was disabled
|
14 years ago |
rubidium
|
8a9929d702
|
(svn r20542) -Codechange: generalise the setting of "p2" to the ClientID.
|
14 years ago |
rubidium
|
69fa0b36d3
|
(svn r20542) -Codechange: generalise the setting of "p2" to the ClientID.
|
14 years ago |
alberth
|
3db5cfb95d
|
(svn r20392) -Fix [FS#3993]: Prevent buying bankrupt companies when you'd get too many vehicles.
|
14 years ago |
alberth
|
422a1ad242
|
(svn r20392) -Fix [FS#3993]: Prevent buying bankrupt companies when you'd get too many vehicles.
|
14 years ago |
alberth
|
ccbacfc298
|
(svn r20318) -Doc: Doxygen additions.
|
14 years ago |
alberth
|
5556955960
|
(svn r20318) -Doc: Doxygen additions.
|
14 years ago |
alberth
|
6c01a5833c
|
(svn r20317) -Codechange: Move variable declaration to their first use.
|
14 years ago |
alberth
|
73f45d16d1
|
(svn r20317) -Codechange: Move variable declaration to their first use.
|
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
|
e5b703ddf9
|
(svn r20279) -Doc: Doxygen additions/improvements.
|
14 years ago |
alberth
|
dc6ed2c2c0
|
(svn r20279) -Doc: Doxygen additions/improvements.
|
14 years ago |
alberth
|
2600624395
|
(svn r20277) -Codechange: Move CmdSetAutoReplace() from company_cmd.cpp to autoreplace_cmd.cpp.
|
14 years ago |
alberth
|
9f8d730cc4
|
(svn r20277) -Codechange: Move CmdSetAutoReplace() from company_cmd.cpp to autoreplace_cmd.cpp.
|
14 years ago |
alberth
|
603c33efc1
|
(svn r20269) -Codechange: Use IsLocalCompany() everywhere, document the function and two company globals.
|
14 years ago |
alberth
|
7aabb887d4
|
(svn r20269) -Codechange: Use IsLocalCompany() everywhere, document the function and two company globals.
|
14 years ago |
alberth
|
1743c86610
|
(svn r20266) -Doc: Mostly typo fixes, a few doxygen-related improvements.
|
14 years ago |
alberth
|
a825b4fa5f
|
(svn r20266) -Doc: Mostly typo fixes, a few doxygen-related improvements.
|
14 years ago |
frosch
|
c9628dd568
|
(svn r19979) -Codechange: Separate static loadable fields from Company into separate struct.
|
14 years ago |
frosch
|
e95518c8e9
|
(svn r19979) -Codechange: Separate static loadable fields from Company into separate struct.
|
14 years ago |
frosch
|
65d058723e
|
(svn r19933) -Fix [FS#3804]: Keep _current_company and _local_company in sync during GUI operation.
|
14 years ago |
frosch
|
9e53f1e004
|
(svn r19933) -Fix [FS#3804]: Keep _current_company and _local_company in sync during GUI operation.
|
14 years ago |
frosch
|
ed80045221
|
(svn r19654) -Codechange: Use Extract<> in more places.
|
14 years ago |
frosch
|
75d4bc947d
|
(svn r19654) -Codechange: Use Extract<> in more places.
|
14 years ago |
rubidium
|
ddef21cb53
|
(svn r19636) -Fix: desync when taking over companies
|
14 years ago |
rubidium
|
1177092da6
|
(svn r19636) -Fix: desync when taking over companies
|
14 years ago |
terkhen
|
542d5657fa
|
(svn r19615) -Fix [FS#3763]: Company related graphs weren't updated correctly after changing the company colour.
|
14 years ago |
terkhen
|
7ba4f98ce5
|
(svn r19615) -Fix [FS#3763]: Company related graphs weren't updated correctly after changing the company colour.
|
14 years ago |
alberth
|
19dff3a6b2
|
(svn r19414) -Doc: Several doxygen additions and corrections.
|
14 years ago |