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

7742 Commits

Author SHA1 Message Date
Goddesen fe3ed939a1 Added Goddesen to list of translators 2016-06-02 00:56:00 +02:00
Goddesen 9aa5958484 Added support for Norwegian (nb-NO) 2016-06-02 00:55:49 +02:00
Michał Janiszewski ad372a5aef Merge pull request #3795 from janisozaur/openssl 
Explicitly require OpenSSL>=1.0.0
 2016-06-01 22:49:11 +02:00
LRFLEW 859d861f14 Fix CMake OS X Build (#12) 2016-06-01 22:35:58 +02:00
Michał Janiszewski 778de4e285 Explicitly require OpenSSL>=1.0.0 
This is to make sure CMake won't try using OS X's stale version of SSL
 2016-06-01 22:23:20 +02:00
Michał Janiszewski 14de1cd5eb Restrict for MSVC (#3794) 2016-06-01 17:44:06 +01:00
Michał Janiszewski 268baa62f7 Add `restrict` for drawing function (#3793) 2016-06-01 15:40:31 +01:00
OpenRCT2 git bot 67f11318cd Merge Localisation/master into OpenRCT2/develop. 2016-06-01 04:00:20 +00:00
Michał Janiszewski 9d5827520a Replace shifting with multiplication when dragging (#3789) 
`dx`, `dy` can be signed negative values, shifting them left is
undefined.
 2016-05-31 22:03:31 +01:00
Ted John 27d846c2f4 fix #3786: Wrong server provider information 2016-05-31 19:24:07 +01:00
Ted John 7f3998d3ca Merge pull request #3777 from IntelOrca/feature/mpinfo 
Add information tab to multiplayer window
 2016-05-31 17:16:23 +01:00
Ted John c66a755ef7 request server gameinfo for window 2016-05-31 17:16:08 +01:00
Ted John 7157199b45 add information tab to multiplayer 2016-05-31 17:16:08 +01:00
Ted John b68da1189b Merge pull request #3776 from IntelOrca/feature/chatlogs 
Save chat logs
 2016-05-31 11:39:00 +01:00
OpenRCT2 git bot 649ea9c705 Merge Localisation/master into OpenRCT2/develop. 2016-05-31 04:00:17 +00:00
Ted John 2a614ec4d9 rename path bits (var_06) to (flags) 2016-05-30 23:39:43 +01:00
Ted John 3e307b8e2a name path addition flags 2016-05-30 23:31:36 +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 fbcc68dff1 fix #3575: Construction Redirection Bug 
Was probably only caused when a player did not have 'Allow unfinished tracks to be tested' enabled. The function was too embeded to work into a callback function, so a new flag is added to say whether the current game command is network sourced or not. This now means the host has to have the unfinished tracks option enabled, otherwise nothing will happen on the client machine. Unfortunately if the host has it enabled and the client doesn't, the command will run on the host game but not the client game and desync. The option, like some of the cheats is game session fixed.
 2016-05-30 12:39:17 +01:00
Ted John 8226c29d6c Merge pull request #3766 from IntelOrca/refactor/network 
Refactor network
 2016-05-30 12:04:02 +01:00
YJSoft 736b8787cf Add files to xcode project 
For OpenRCT2/OpenRCT2#3766
 2016-05-30 11:51:25 +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
Ted John c0ad5aadd8 revert unintentional changes to vcxproj 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
OpenRCT2 git bot b624d284aa Merge Localisation/master into OpenRCT2/develop. 2016-05-30 04:00:21 +00:00
Ted John 2334e701e4 fix infinite loop 2016-05-30 02:15:45 +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
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