Sergii Pylypenko
6dc675ac3c
Merge remote-tracking branch 'release/1.9' into 1.9
2019-04-23 18:25:14 +03:00
Sergii Pylypenko
3ba683874b
Merge remote-tracking branch 'origin/master' into HEAD
2019-04-23 18:16:24 +03:00
glx22
abc0325ef1
Fix #7439 : don't overwrite CompanyRemoveReason with ClientID ( #7465 )
2019-04-08 20:06:02 +01:00
SamuXarick
948de16255
Cleanup: Remove repeated network error message on connection timeout. ( #7327 )
2019-03-10 13:44:45 +01:00
Niels Martin Hansen
c61acc7fc1
Fix #7280 : Save in the right location on desync and server timeout
2019-03-03 12:12:32 +01:00
glx
7c31a32c2b
Fix: colour of network specific strings in company dropdown menus
2019-02-16 22:19:16 +01:00
Niels Martin Hansen
830ed6be61
Fix: Do not mangle tagged revision strings for network revision strings
2019-02-12 21:32:43 +00:00
Thomas den Hollander
412e6132b6
Fix: CompanyEconomy documentation
...
Company income was described as an unsigned integer, but it should be signed.
2019-02-12 19:26:21 +00:00
Niels Martin Hansen
db2c0ccae0
Fix fdc2e85: Double close of file handles
...
When unpacking downloaded content, the downloaded .gz file was being opened with `fopen`, the OS file handle given to zlib, and then afterwards zlib told to close the file.
But the `FILE *` object was never closed with `fclose`, meaning the stdio library would have a hanging file object, whose file handle was now invalid or referred to a different file. This caused asserts during shutdown with Microsoft's C library in debug mode.
Fix this by properly duplicating the OS handle and `fclose`ing the `FILE *` object, before giving the handle to zlib.
2019-02-06 21:09:02 +01:00
glx
8e7fe3973f
Add: CompanyCtrlAction enum for CMD_COMPANY_CTRL actions
2019-02-04 21:08:36 +01:00
Niels Martin Hansen
5f8354f358
Change: Make a shortened network revision string for use in server queries
2019-02-03 18:00:16 +01:00
Niels Martin Hansen
c511b0e801
Change: Increase NETWORK_REVISION_LENGTH to 33 bytes
2019-02-03 18:00:16 +01:00
glx
b22fbfbe3d
Add: allow opening of one TextfileWindow per type
2019-01-28 23:43:18 +00:00
Charles Pigott
fe8c24e081
Codechange: Remove unnecessarily defined functions under MinGW
2019-01-17 21:55:15 +00:00
PeterN
5ff0c24993
Fix #6780 : Some windows didn't get updated from OnTick() ( #7048 )
2019-01-12 23:23:23 +00:00
glx
c540d72445
Fix: [Win32] WIN32 may not be defined, always prefer the compiler predefined macro _WIN32
2018-12-27 18:09:16 +01:00
Charles Pigott
f5b1115039
Doc: Lots and lots of doxymentation fixes
2018-10-31 12:35:54 +01:00
Niels Martin Hansen
4fb76db42f
Feature #986 : Automatic save when losing connection to a network game
2018-06-23 15:22:31 +02:00
Sergii Pylypenko
66e3334f0e
Merge upstream branch 1.8
2018-05-31 22:59:50 +03:00
frosch
8f58cc6dac
(svn r27863) [1.7] -Backport from trunk:
...
- Fix: Black remap did nothing in 8bpp-simple blitter (r27837)
- Fix: Misaligned resize icon due to widget bounds being inclusive (r27831)
- Fix: Update viewport sign dimensions when changing GUI zoom level (r27827, r27819)
- Fix: Vehicle viewport is not user scrollable so flag window as such (r27823)
- Fix: Allow dropdown to be drawn above origin widget even with scrollbar (r27820)
- Fix: 32bpp-anim blitters assumed that pitch and width of the screen were equal [FS#6545] (r27796)
- Fix: Chat text background overflowed due to missing padding [FS#6526] (r27794)
2018-05-31 22:05:29 +03:00
pelya
796c6b7b72
Improvements to network chat
2018-05-31 21:55:28 +03:00
pelya
93256d2f2a
Fixed compiation with clang
2018-05-31 21:55:27 +03:00
J0an Josep
cfb8092397
Fix b4b98e5165: Use FALLTHROUGH attribute with correct indentation.
2018-04-30 21:52:40 +02:00
Matthijs Kooijman
fa87212a76
Fix: Some spelling errors in printed messages
2018-04-30 13:38:58 +02:00
Patric Stout
85adde7485
Remove: PSP support
2018-04-29 15:32:16 +02:00
frosch
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
2017-08-13 18:38:42 +00:00
Sergii Pylypenko
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
pelya
3b79284608
Fixed multiplayer client list not drawn when it's too narrow
2017-03-17 22:40:04 +02:00
pelya
1f95adba77
Fixed multiplayer client list
2017-03-17 22:40:04 +02:00
peter1138
ed01e81c42
(svn r27794) -Fix [FS#6526]: Chat text background overflowed due to missing padding.
2017-03-14 00:57:52 +00:00
frosch
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
frosch
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
frosch
3f75b8bca2
(svn r27670) -Add: [FS#6471] Assign descriptive names to (GNU pthread) threads. (JGR)
2016-10-30 17:29:33 +00:00
frosch
31f046bd9b
(svn r27670) -Add: [FS#6471] Assign descriptive names to (GNU pthread) threads. (JGR)
2016-10-30 17:29:33 +00:00
alberth
f286ba8db2
(svn r27653) -Fix(r27647): Rename FileOperation enum and values to SaveLoadOperation to avoid nameclash with windows compiler toolkit.
2016-09-04 16:06:50 +00:00
alberth
0adfb1ac6f
(svn r27653) -Fix(r27647): Rename FileOperation enum and values to SaveLoadOperation to avoid nameclash with windows compiler toolkit.
2016-09-04 16:06:50 +00:00
alberth
a959c0c965
(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.
2016-09-04 12:57:43 +00:00
alberth
597380e099
(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.
2016-09-04 12:57:43 +00:00
alberth
3b84827773
(svn r27648) -Codechange: Remove remaining _saveload_mode usage.
2016-09-04 12:56:56 +00:00
alberth
88bdf482c0
(svn r27648) -Codechange: Remove remaining _saveload_mode usage.
2016-09-04 12:56:56 +00:00
frosch
b1272ee714
(svn r27577) -Fix [FS#6386]: Dock and roadstop picker, client list and town authority window did not auto-resize according to their content when they were positioned at the bottom of the screen. (Eearslya)
2016-05-22 10:52:02 +00:00
frosch
8084f39bf3
(svn r27577) -Fix [FS#6386]: Dock and roadstop picker, client list and town authority window did not auto-resize according to their content when they were positioned at the bottom of the screen. (Eearslya)
2016-05-22 10:52:02 +00:00
frosch
9aa9d7e898
(svn r27576) -Fix (r27570): Compilation failure with all compilers but mine.
2016-05-22 10:45:46 +00:00
frosch
4fc43b510d
(svn r27576) -Fix (r27570): Compilation failure with all compilers but mine.
2016-05-22 10:45:46 +00:00
frosch
14c1a7ad0b
(svn r27571) -Codechange: Consistent naming for command callbacks which play a sound effect.
2016-05-22 10:07:48 +00:00
frosch
9aa33862a7
(svn r27571) -Codechange: Consistent naming for command callbacks which play a sound effect.
2016-05-22 10:07:48 +00:00
frosch
998a6c1302
(svn r27570) -Fix [FS#6449]: Various incorrect but uncritical size computations in the content client.
2016-05-22 10:04:41 +00:00
frosch
97e6981e39
(svn r27570) -Fix [FS#6449]: Various incorrect but uncritical size computations in the content client.
2016-05-22 10:04:41 +00:00
Sergii Pylypenko
d03b27e1f6
Fixed multiplayer chat
...
Conflicts:
src/network/network_gui.cpp
2016-03-27 22:56:50 +03:00
pelya
2365e94acb
Fixed 'check online content' dialog
...
Conflicts:
src/network/network_content_gui.cpp
2016-03-27 22:49:07 +03:00