Duncan
8a427a2676
Merge pull request #3737 from marijnvdwerf/paint-setup/monorail
...
Paint setup/Monorail
2016-05-29 07:54:35 +01:00
OpenRCT2 git bot
f257c81e99
Merge Localisation/master into OpenRCT2/develop.
2016-05-29 04:00:20 +00:00
Ted John
8db0933ee2
fix loading of temperature from SV6
2016-05-28 23:11:57 +01:00
Ted John
76792723ba
fix saving of temperature to SV6
2016-05-28 23:08:01 +01:00
Ted John
f56b033e0c
remove VS filters
...
The project filters for VS is just becoming an inconvenience and always ends up going out of sync with the src folder structure. Developers should use 'Show All Files' instead which displays the source files by their actual folder structure and other files in the repository that aren't included in the vcxproj.
2016-05-28 13:57:09 +01:00
Michał Janiszewski
451379c8a3
Handle SDL builds which already have HAVE_MATH_H defined ( #3765 )
...
ArchLinux's SDL2 build for mingw already has HAVE_MATH_H define, this
fixes warnings I was getting, as they are now upgraded to errors.
2016-05-28 12:24:52 +01:00
Michael Steenbeek
1d14f21e25
Allow raising terrain to 64 in-game units, fixes #3568 , fixes #3455 ( #3764 )
2016-05-28 12:24:11 +01:00
Michał Janiszewski
1cdbd1e459
Take care not to overflow buffers in platform_resolve_user_data_path ( #3761 )
2016-05-28 09:31:02 +01:00
Duncan
c645d24c8d
Add console command for scenario initial cash. ( #3763 )
...
Add paint_segments to variable list as well
Fix #3748 .
2016-05-28 09:30:50 +01:00
Duncan
8e8474c400
Modify object selection to only research selected item when adding new objects during a game. ( #3762 )
2016-05-28 09:30:31 +01:00
Ted John
49756a6ee3
check for null map element in peep_update_falling
2016-05-28 09:29:23 +01:00
OpenRCT2 git bot
23d856162e
Merge Localisation/master into OpenRCT2/develop.
2016-05-28 04:00:22 +00:00
Michał Janiszewski
d29af84886
Make sure to hold string alive when using c_str() ( #3760 )
2016-05-27 22:32:11 +01:00
Ted John
6acbfa0248
sort multiplayer servers
2016-05-27 22:17:26 +01:00
Ted John
ccfb1c4f95
Merge pull request #3759 from janisozaur/develop
...
Don't allow null keys
2016-05-27 22:01:42 +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
duncanspumpkin
e1306afbf3
Fix #3717 . Tunnels correctly drawn when paths underneath
2016-05-27 21:17:55 +01:00
Ted John
ebb8eb749c
Merge pull request #3758 from janisozaur/fixes
...
Fixes
2016-05-27 20:57:14 +01:00
Michael Steenbeek
ce03de02f7
Update loan hash after RCT1 import, fixes #3734 ( #3757 )
2016-05-27 20:55:37 +01:00
Ted John
539e4011f9
Merge pull request #3699 from janisozaur/network
...
Key-based authentication system for multiplayer
2016-05-27 20:53:31 +01:00
Duncan
4dcf20dd60
Integrate peep pathfinding variables ( #3747 )
2016-05-27 20:50:54 +01:00
Michał Janiszewski
642bfeb44e
Ensure user directory exists when specifying custom path
...
This is done anyway in openrct2.c:openrct2_initialise(), but we will
have wrong custom user data path by then.
2016-05-27 21:43:52 +02:00
Michał Janiszewski
4ba1c17b0d
Don't let null password cause a crash on initial launch
2016-05-27 21:43:52 +02:00
Michał Janiszewski
d9062f1f07
Wrap overly long lines in posix.c
2016-05-27 21:43:52 +02:00
duncanspumpkin
e373eeafa8
Fix virginia reel tunnels.
2016-05-27 20:41:41 +01:00
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
