66e3334f0e
Merge upstream branch 1.8
2018-05-31 22:59:50 +03:00
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
2017-08-13 18:38:42 +00:00
b4cc822085
Merge svn r27779
...
Conflicts:
src/autoreplace_gui.cpp
src/economy.cpp
src/fios_gui.cpp
src/lang/spanish_MX.txt
src/network/network_gui.cpp
src/rev.cpp.in
src/road_gui.cpp
src/toolbar_gui.cpp
src/window.cpp
2017-03-17 23:14:41 +02:00
8bd3a8a991
(svn r27729) -Codechange: Do not count static NewGRF when checking for the maximum number of NewGRFs in a game.
...
-Codechange: Remove LAST_GRF_SLOT and MAX_NEWGRFS. Now NETWORK_MAX_GRF_COUNT is the only constant to specify the maximum number of non-static NewGRF.
-Codechange: Increase the number of file slots, effectively increasing the maximum number of static NewGRF and baseset GRFs.
2017-01-14 13:12:49 +00:00
ec9a920aab
(svn r27729) -Codechange: Do not count static NewGRF when checking for the maximum number of NewGRFs in a game.
...
-Codechange: Remove LAST_GRF_SLOT and MAX_NEWGRFS. Now NETWORK_MAX_GRF_COUNT is the only constant to specify the maximum number of non-static NewGRF.
-Codechange: Increase the number of file slots, effectively increasing the maximum number of static NewGRF and baseset GRFs.
2017-01-14 13:12:49 +00:00
3f75b8bca2
(svn r27670) -Add: [FS#6471] Assign descriptive names to (GNU pthread) threads. (JGR)
2016-10-30 17:29:33 +00:00
31f046bd9b
(svn r27670) -Add: [FS#6471] Assign descriptive names to (GNU pthread) threads. (JGR)
2016-10-30 17:29:33 +00:00
3ef1c1baff
Merge commit 'a8b575671894ffe1329ef37dca4989c0e60d70f5'
...
These merges are becoming more awful every time
Conflicts:
src/ai/ai_gui.cpp
src/build_vehicle_gui.cpp
src/cheat_gui.cpp
src/company_gui.cpp
src/depot_gui.cpp
src/dock_gui.cpp
src/error_gui.cpp
src/genworld_gui.cpp
src/misc_gui.cpp
src/network/network_content_gui.cpp
src/network/network_gui.cpp
src/newgrf_gui.cpp
src/news_gui.cpp
src/rail_gui.cpp
src/rev.cpp.in
src/road_gui.cpp
src/settings_gui.cpp
src/settings_gui.h
src/signs_gui.cpp
src/station_gui.cpp
src/table/settings.ini
src/terraform_gui.cpp
src/toolbar_gui.cpp
src/toolbar_gui.h
src/vehicle_gui.cpp
src/video/sdl_v.cpp
src/viewport.cpp
src/widget.cpp
src/widgets/settings_widget.h
2016-03-27 22:33:11 +03:00
93fb724f87
(svn r27092) -Fix/Add [FS#6186]: Compilation on OS/2 (smedles)
2014-12-24 17:17:18 +00:00
396dde1636
(svn r27092) -Fix/Add [FS#6186]: Compilation on OS/2 (smedles)
2014-12-24 17:17:18 +00:00
91ebce1a9c
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
src/console_gui.cpp
src/genworld_gui.cpp
src/group_gui.cpp
src/misc_gui.cpp
src/settings_gui.cpp
src/widgets/settings_widget.h
2014-06-04 17:09:23 +03:00
034735a54c
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
2014-04-25 15:40:32 +00:00
9ed12b0f07
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
2014-04-25 15:40:32 +00:00
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
2014-04-23 20:13:33 +00:00
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
2014-04-23 20:13:33 +00:00
6dc8be0332
Android patches
2014-03-15 19:44:27 +02:00
73474728e3
(svn r26057) -Fix: a number of possibly uninitialised variables
2013-11-23 13:12:19 +00:00
b3e93d6520
(svn r26057) -Fix: a number of possibly uninitialised variables
2013-11-23 13:12:19 +00:00
bebf2291db
(svn r26056) -Fix: a number of possibly uninitialised variables
2013-11-22 21:50:43 +00:00
2e54c8fdfa
(svn r26056) -Fix: a number of possibly uninitialised variables
2013-11-22 21:50:43 +00:00
32e52df99f
(svn r26046) -Fix: handle a number of failure conditions from methods called in the network code
2013-11-22 21:41:19 +00:00
fad4fa09ba
(svn r26046) -Fix: handle a number of failure conditions from methods called in the network code
2013-11-22 21:41:19 +00:00
bb9022c7c1
(svn r25597) -Fix [FS#5635]: [Content] When the server closed the connection, the client would for eternity try to read a packet and never timeout making it impossible to reconnect
2013-07-13 09:26:11 +00:00
5eac3a77d2
(svn r25597) -Fix [FS#5635]: [Content] When the server closed the connection, the client would for eternity try to read a packet and never timeout making it impossible to reconnect
2013-07-13 09:26:11 +00:00
4c552bd367
(svn r25593) -Cleanup: remove a few stale #defines
2013-07-13 06:18:16 +00:00
e6ae8cf420
(svn r25593) -Cleanup: remove a few stale #defines
2013-07-13 06:18:16 +00:00
2d3a8cbdc0
(svn r25590) -Codechange: Align doxygen comments again
2013-07-12 17:15:13 +00:00
bb7f08f8db
(svn r25590) -Codechange: Align doxygen comments again
2013-07-12 17:15:13 +00:00
2ecbbce498
(svn r25589) -Fix [FS#5646]: Ensure that sent and received length of json strings are the same (based on patch by Xaroth)
2013-07-12 17:11:16 +00:00
2e390613a6
(svn r25589) -Fix [FS#5646]: Ensure that sent and received length of json strings are the same (based on patch by Xaroth)
2013-07-12 17:11:16 +00:00
5bd83befbe
(svn r25588) -Feature [FS#5643]: PING and PONG packets for admin port (Xaroth)
2013-07-11 20:31:39 +00:00
7686587f02
(svn r25588) -Feature [FS#5643]: PING and PONG packets for admin port (Xaroth)
2013-07-11 20:31:39 +00:00
fdcebd3f2f
(svn r25587) -Add FS#5643: Conclude rcon output sent to admin clients with an RCON_END packet (Xaroth)
2013-07-11 19:57:40 +00:00
4a1bf704ee
(svn r25587) -Add FS#5643: Conclude rcon output sent to admin clients with an RCON_END packet (Xaroth)
2013-07-11 19:57:40 +00:00
534d41ad98
(svn r25573) -Change: make content list appear faster by allowing some window redraws in between
2013-07-07 10:37:16 +00:00
51f0d11ee3
(svn r25573) -Change: make content list appear faster by allowing some window redraws in between
2013-07-07 10:37:16 +00:00
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
2013-01-08 22:46:42 +00:00
c24374f99c
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
2013-01-08 22:46:42 +00:00
19adc87262
(svn r24776) -Doc: Typo fixes, additions, and additional dots collected from various sources (including Eagle_rainbow, MinchinWeb)
2012-12-01 13:12:39 +00:00
732e073261
(svn r24776) -Doc: Typo fixes, additions, and additional dots collected from various sources (including Eagle_rainbow, MinchinWeb)
2012-12-01 13:12:39 +00:00
bdb2c229a3
(svn r24674) -Fix (r24466, r23234) [FS#5358]: Downloaded heightmaps could not be used anymore. (sbr)
2012-11-08 21:41:00 +00:00
a443375d44
(svn r24674) -Fix (r24466, r23234) [FS#5358]: Downloaded heightmaps could not be used anymore. (sbr)
2012-11-08 21:41:00 +00:00
e725709d8a
(svn r24642) -Codechange: add helper function to see if there is anything in the send queue
2012-10-28 21:26:57 +00:00
6247bdbdb4
(svn r24642) -Codechange: add helper function to see if there is anything in the send queue
2012-10-28 21:26:57 +00:00
2b4c2119d7
(svn r24638) -Codechange: add some #ifndefs so MSU code doesn't need to compile it, and doesn't need all the required dependencies
2012-10-28 19:16:58 +00:00
9db98f3b14
(svn r24638) -Codechange: add some #ifndefs so MSU code doesn't need to compile it, and doesn't need all the required dependencies
2012-10-28 19:16:58 +00:00
a92f7ec90e
(svn r24571) -Fix: do not cast away const
2012-10-04 15:25:57 +00:00
0856668f44
(svn r24571) -Fix: do not cast away const
2012-10-04 15:25:57 +00:00
2ba8526532
(svn r24532) -Change: try to read more UDP packets per game loop
2012-09-19 15:15:49 +00:00
7251fbb514
(svn r24532) -Change: try to read more UDP packets per game loop
2012-09-19 15:15:49 +00:00
Sergii Pylypenko