mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
7,669 Commits 7 Branches 39 Tags 356 MiB
Commit Graph

7669 Commits

Author SHA1 Message Date
Ted John 1b3331f584 remove user from users.json when kicked (#11) 2016-05-27 20:28:35 +02:00
Marijn van der Werf f08f2bef2c Add NetworkUser.cpp to Xcode project 2016-05-27 20:28:35 +02:00
Michał Janiszewski 4507ffdcb7 Fix clang builds 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
Ted John 62636f39b6 move allow known keys option to new tab... 
on multiplayer window
 2016-05-27 20:28:34 +02:00
Ted John 7b09b16255 use a different image for permissions tab 2016-05-27 20:28:34 +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
Marijn van der Werf 5bc99d2006 Fix OS X project to include OpenSSL libraries 2016-05-27 20:28:34 +02:00
Michał Janiszewski 8bef53598b Update changelog 
[ci skip]
 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
Michał Janiszewski a34b9c6785 Include common.h to resolve MSVC build issue 2016-05-27 20:28:34 +02:00
Michał Janiszewski 18d656e012 Ensure player names are unique 
Do this by cheating a little: create a map with count of clients using
given username and increment it each time such a username is
encountered. This yields very similar results to actually counting users
holding given name, but saves all the error-prone string parsing.
 2016-05-27 20:28:34 +02:00
Michał Janiszewski 2627ddc836 Update URL to libs zip for OS X 2016-05-27 20:28:34 +02:00
Marijn van der Werf 46d0ef71e9 Re-enable building of g2.dat 2016-05-27 20:28:33 +02:00
Marijn van der Werf 50699de9b4 Update library paths 2016-05-27 20:28:33 +02:00
LRFLEW 5d5c10f99f Fixed OS X Build 2016-05-27 20:28:33 +02:00
YJSoft 31e8c9bbf9 Update project file with suggested changes 2016-05-27 20:28:33 +02:00
YJSoft b08efe7bda Add NetworkKey file and openssl ref. 
Also changing library sha256
 2016-05-27 20:28:33 +02:00
Michał Janiszewski 4ffceafdbb Make sure the challenge token is random and handled properly 
This change also fixes passworded servers not working properly, as
strlen() was getting called on something that was not guaranteed to be
null-terminated string when signing the token.
 2016-05-27 20:28:33 +02:00
Michał Janiszewski 66abc31fee Handle malformed private keys gracefully 2016-05-27 20:28:33 +02:00
Michał Janiszewski 553e1bdf0f Minor fixes to authorisation system 2016-05-27 20:28:33 +02:00
Michał Janiszewski caa74acb1b Fixes for x86-64 2016-05-27 20:28:33 +02:00
Michał Janiszewski a83154832c Formatting 2016-05-27 20:28:33 +02:00
Michał Janiszewski 589b5a3b43 Use v8 libs 2016-05-27 20:28:33 +02:00
Michał Janiszewski 839fc3938f Add NetworkKey files to VS project 2016-05-27 20:28:33 +02:00
Michał Janiszewski 715ba561b1 Initial version of key-based auth 2016-05-27 20:28:33 +02:00
Michał Janiszewski 1c459c8186 Add NetworkKey class 2016-05-27 20:28:33 +02:00
Michał Janiszewski 40253a7add Prevent SIGPIPE-ing on Linux when clients drop (#3755) 
`send()` can only write to connected sockets [1]. In case where client
drops out, a socket may become closed by OS but we can still enqueue
packets for its connection and eventually call `send()`, which will
generate a SIGPIPE and shut the server down, because there was no
`MSG_NOSIGNAL` set.

This commit makes sure `MSG_NOSIGNAL` is used on Linux.

[1] http://linux.die.net/man/2/send
 2016-05-27 17:44:23 +01:00
Michał Janiszewski 91443d0e75 Update docker files (#3752) 
Updates to recent ArchLinux changes, simplifaction

It hopefully creates smaller images and thus improves build throughput
on travis.
 2016-05-27 14:46:25 +01:00
YJSoft e3ac505d10 Fix .travis.yml script error (#3751) 
This PR fixes script error introduced by #3750

- `else;` -> `else`
- `openrct2-linux.tar.gz.zip` -> `openrct2-linux.tar.gz`
 2016-05-27 07:04:24 +02:00
Michał Janiszewski 5602661a27 Publish travis artifacts to transfer.sh (#3750) 2016-05-27 00:03:31 +01:00
Yaroslav Tretyakov 8ee923f33d Fix #3735: Advertisement campaign window bug (#3745) 2016-05-26 19:43:53 +01:00
jensj12 f4690fb879 Remove duplicate check (#3743) 2016-05-26 15:56:57 +01:00
Ted John 871c6c2c90 Fix build.ps1 (#3742) 
Fixes building on PowerShell 5, for some reason this wasn't a problem in 4.
 2016-05-26 13:32:08 +01:00
CraigCraig 3f9afb9744 Various Spellchecks (#3741) 2016-05-26 09:49:19 +02:00
OpenRCT2 git bot 95249cf1df Merge Localisation/master into OpenRCT2/develop. 2016-05-26 04:00:47 +00:00
Michael Steenbeek 712d97da79 Remove Intamin and Phoenix easter eggs (#3732) 2016-05-25 20:01:24 +01:00
Ted John 4afde28be3 Merge pull request #3724 from marijnvdwerf/paint-setup/ghost-train 
Paint setup/ghost train
 2016-05-25 14:30:48 +01:00
Marijn van der Werf 30e82ba82c Fix car ride station drawing 2016-05-25 14:59:52 +02:00
Marijn van der Werf b276604277 Draw station 2016-05-25 14:59:33 +02:00