1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 21:13:05 +01:00
Commit Graph

226 Commits

Author SHA1 Message Date
Marijn van der Werf
42ee299f65 Replace references to OS X 2016-06-13 19:49:06 +02:00
Yaroslav Tretyakov
379b85f94c send fix #3836 (#3850) 2016-06-09 23:04:02 +01:00
Ted John
1761907f57 handle bad map data and close connection 2016-06-09 18:37:12 +01:00
dVoCex
27b3c71588 Send the correct map size to the master server (#3821)
Signed-off-by: dVoCex <dVoCex@users.noreply.github.com>
2016-06-09 12:32:25 +01:00
Alexander Overvoorde
ca1590c086 Add parameter to utf8_remove_formatting to allow colour codes (fixes #3638) (#3831) 2016-06-09 12:30:32 +01:00
Michał Janiszewski
4b152bac88 Make sure data sent out over wire is advanced properly (#3844) 2016-06-09 12:29:44 +01:00
X123M3-256
706b3db99e Chain lift cheat (#3818)
* Fix conflict with disable plant aging cheat

* Allow chain lift on any piece

* Keep chain toggled while building

* Ignore current chain lift state when cheat enabled

* Update string ids to one not already used

* Implement command for toggling cheat

* Allow chain on steep tracks when cheat is enabled

* Add checkbox for chain cheat

* Fix spacing

* Send cheat over network

* Change label for checkbox

* Replaced tabs with spaces
2016-06-07 22:08:38 +01:00
Michał Janiszewski
e5cd157edc Fix memory leak in TcpSocket (#3815) 2016-06-03 23:29:25 +01:00
Michał Janiszewski
628e263094 Fix #3804: use-after-free in TcpSocket (#3810) 2016-06-03 14:30:00 +01:00
Ted John
82dd7601eb Merge pull request #3782 from janisozaur/desyncs
synchronise reset_0x69EBE4 over network
2016-06-03 10:47:01 +01:00
Michał Janiszewski
60630b9ad7 Drop PACKED attribute 2016-06-03 10:55:21 +02:00
Michał Janiszewski
3907fcd9d2 Explicitly pack structs 2016-06-03 10:55:21 +02:00
Michał Janiszewski
4955279b7b Synchronise reset_0x69EBE4 over network
Clients calling reset_0x69EBE4 not in sync is a major cause of desyncs,
this change tries to force sync across clients
2016-06-03 00:33:15 +02:00
Ted John
a153d07637 handle exceptions when setting up the TCP listener 2016-06-02 18:51:29 +01:00
Michał Janiszewski
e3d04ff96d Fix TcpSocket for Linux compilers (#13) 2016-06-02 09:13:25 +01:00
Ted John
8dfbabbd07 refactor network, create ITcpSocket
Abstracts all socket code into a new class TcpSocket which is only exposed by a light interface, ITcpSocket. This now means that platform specific headers like winsock2.h and sys/socket.h do not have to be included in OpenRCT2 header files reducing include load and other issues.
2016-06-01 23:01:20 +01:00
Ted John
27d846c2f4 fix #3786: Wrong server provider information 2016-05-31 19:24:07 +01:00
Ted John
c66a755ef7 request server gameinfo for window 2016-05-31 17:16:08 +01:00
Ted John
2264027afa change directory name to 'chatlogs' 2016-05-30 18:03:31 +01:00
Ted John
feb65ea93c add option to log chat history 2016-05-30 18:01:17 +01:00
Ted John
618d13a9a3 save chat logs 2016-05-30 16:25:06 +01:00
Ted John
8cf4a1f03f add default case to fix clang error 2016-05-30 11:28:41 +01:00
Ted John
00d4904ba9 make DISABLE_NETWORK compatible 2016-05-30 11:28:14 +01:00
Michał Janiszewski
3a697609a5 Fixes to network refactoring (#11) 2016-05-30 11:28:13 +01:00
Ted John
d69ca7f479 conform to name convention 2016-05-30 11:28:09 +01:00
Ted John
623318a35d refactor NetworkPlayer 2016-05-30 11:18:07 +01:00
Ted John
3591026078 refactor NetworkAction 2016-05-30 11:18:07 +01:00
Ted John
31ac6e7fdf refactor NetworkConnection and NetworkPacket 2016-05-30 11:18:07 +01:00
Ted John
46ecd53a99 refactor NetworkAddress 2016-05-30 11:18:07 +01:00
Ted John
91b7db31d1 fix #3771: Crash when kicking player
The game did not check if the user hash existed in the map before trying to remove it.
2016-05-29 10:56:36 +01:00
CraigCraig
c946d2fb06 Various Spelling Fixes - 5/29/16 (#3770) 2016-05-29 10:00:38 +01:00
Michał Janiszewski
d29af84886 Make sure to hold string alive when using c_str() (#3760) 2016-05-27 22:32:11 +01:00
Michał Janiszewski
8e26f2c0d1 Only check for PASSWORDLESS permission if successfully verified 2016-05-27 23:00:31 +02:00
Michał Janiszewski
4699635086 Don't allow null keys 2016-05-27 22:56:23 +02:00
Ted John
ebb8eb749c Merge pull request #3758 from janisozaur/fixes
Fixes
2016-05-27 20:57:14 +01:00
Michał Janiszewski
4ba1c17b0d Don't let null password cause a crash on initial launch 2016-05-27 21:43:52 +02:00
Ted John
1b3331f584 remove user from users.json when kicked (#11) 2016-05-27 20:28:35 +02:00
Ted John
3a1a474c7c refactor key map to User and UserManager classes 2016-05-27 20:28:35 +02:00
Michał Janiszewski
7a96856d01 Remove an unimplemented method that got in by mistake 2016-05-27 20:28:34 +02:00
Michał Janiszewski
80a90624b9 Add option to only allow known keys to login 2016-05-27 20:28:34 +02:00
Michał Janiszewski
b8661fb389 When removing group, reset all users assigned to it 2016-05-27 20:28:34 +02:00
Ted John
fe057c4470 handle null group ids 2016-05-27 20:28:34 +02:00
Ted John
ac17cdf955 improve unique name handling 2016-05-27 20:28:34 +02:00
Ted John
daaa1b3ed2 add helper method for getting the keymap path 2016-05-27 20:28:34 +02:00
Ted John
f7ee22048f save keys in a sub directory 2016-05-27 20:28:34 +02:00
Ted John
d62c94f14a use Console::WriteLine instead of log_info 2016-05-27 20:28:34 +02:00
Michał Janiszewski
2d3d889a08 Formatting, style fixes 2016-05-27 20:28:34 +02:00
Michał Janiszewski
165ec06690 Passwordless login permission 2016-05-27 20:28:34 +02:00
Michał Janiszewski
9b4d385ab5 Allow out-of-process edits to keymappings.json
Reloads keymappings.json on each client join. This allows for manual edits,
so host can add keys without having to restart server for them to go live.
2016-05-27 20:28:34 +02:00
Michał Janiszewski
65a1d0c70d Use UpdateKeyMappings to modify JSON in-place
This allows for non-destructive saving of group assigments, so user can
store their own entries.
2016-05-27 20:28:34 +02:00