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

5026 Commits

Author SHA1 Message Date
Duncan bcc7e2f5a1 Merge pull request #2147 from Overv/develop 
Fix confusing errors appearing when building a flat ride partially outside the park #2129
 2015-11-09 12:39:41 +00:00
Ted John 03cbb37d8a Merge Localisation/master into OpenRCT2/develop. 2015-11-09 04:00:16 +00:00
IntelOrca bbd5e6dbe3 Merge branch 'master-server-improvements' into develop 2015-11-08 23:50:59 +00:00
IntelOrca 09cd007f3f add dedicated flag to gameInfo 2015-11-08 23:50:38 +00:00
IntelOrca da6d382c47 make server heartbeat PUT 2015-11-08 23:29:52 +00:00
Alexander Overvoorde 3f00ec42f1 Replace trackPlaceZ RCT2_GLOBALs with define for clarity 2015-11-08 23:44:41 +01:00
IntelOrca 2e55495470 improve master server to POST json 2015-11-08 22:03:35 +00:00
Alexander Overvoorde 6114aa5dac Rename hmm variable to something more descriptive 2015-11-08 22:30:51 +01:00
Alexander Overvoorde b20a844982 Fix "land not owned" errors being overridden by "can't construct here" 
I'm not entirely sure what the "hmm" check is about, but it caused
track_place() to return early when called from
window_ride_construction_construct(), so I moved up the owned land check
to give it a higher priority.
 2015-11-08 21:47:18 +01:00
Alexander Overvoorde d1a6b65049 Fix supports error appearing when building outside of owned land 
This was caused by ride_construction_toolupdate_construct() pointlessly
trying to fix the "building outside owned land" error by increasing the Z.
 2015-11-08 21:47:17 +01:00
Ted John c70880c0a5 Merge pull request #2251 from Broxzier/fix_filename 
Fixed filenames being cut off when there's a dot in them
 2015-11-08 19:04:45 +00:00
Ted John 20f21c6bf6 Delete colour.c 2015-11-08 18:57:55 +00:00
Ted John a24844a6ee Merge pull request #2247 from Gymnasiast/ride-entry-flag-15-and-17 
Identify RIDE_ENTRY_FLAG_15 and 17, fix 'Show all operating modes' cheat
 2015-11-08 18:57:03 +00:00
IntelOrca 48e3d70e57 refactor colour maps 2015-11-08 18:55:32 +00:00
IntelOrca 442cfef887 fix #2230, scroll bar colour issues 2015-11-08 17:31:46 +00:00
Hielke Morsink b929a27595 Fixed filenames with dots not being displayed completely. 2015-11-08 18:21:55 +01:00
IntelOrca 141705fe6b disable peep watching thought for multiplayer as its client specific 2015-11-08 15:15:10 +00:00
IntelOrca 12a6ec2fef stop desynchronisation when placing scenery, fixes #2111 2015-11-08 15:01:30 +00:00
IntelOrca 6fe2340dfe stop clients from pausing multiplayer games 2015-11-08 14:32:22 +00:00
Ted John c557a54fdc Merge pull request #2248 from Gymnasiast/changelog 
Update changelog
 2015-11-08 14:10:12 +00:00
Michael Steenbeek ab8edaca16 Update changelog 2015-11-08 15:08:43 +01:00
Gymnasiast 4ba83b0418 Rename RIDE_ENTRY_HIDE_LAST_OPERATING_MODE to RIDE_ENTRY_DISABLE_LAST_OPERATING_MODE 2015-11-08 15:01:40 +01:00
Gymnasiast e749c1a82c Identify RIDE_ENTRY_FLAG_15 and 17, fix 'Show all operating modes' cheat 2015-11-08 14:55:01 +01:00
Ted John 40268878a0 Merge pull request #2245 from Gymnasiast/american-spelling 
Correct two instances of American spelling
 2015-11-08 12:49:49 +00:00
IntelOrca e1b67eeda0 improve command line version information and add headless check 2015-11-08 12:49:19 +00:00
Michael Steenbeek 4855a53c22 Correct two instances of American spelling 2015-11-08 13:11:36 +01:00
Ted John 7d51eb55e1 Merge pull request #2243 from Gymnasiast/rossija 
Add support for Russian
 2015-11-08 11:59:41 +00:00
Ted John 91edd322ae Merge pull request #2242 from Gymnasiast/more-currencies 
Add South Korean Won and Russian Rouble as currencies, closes #2222, also fix #2232
 2015-11-08 11:58:41 +00:00
Ted John 6e6637922a Merge pull request #2240 from Gymnasiast/fix-2125 
Only play message sound in normal playing mode, fixes #2125
 2015-11-08 11:57:20 +00:00
Gymnasiast 6413052cbb Use language codes for Korean and Russian 2015-11-08 12:49:25 +01:00
Gymnasiast eed070bde0 Use string IDs for all currencies 2015-11-08 12:41:55 +01:00
Gymnasiast b7a09cca0c Adjust Arial placement and sizes 2015-11-08 12:26:49 +01:00
Gymnasiast ea5282f508 Add support for Russian 2015-11-08 11:52:47 +01:00
Gymnasiast 4e5b8a1a19 Add South Korean Won and Russian Rouble as currencies, closes #2222, also fix #2232 2015-11-08 11:46:11 +01:00
Gymnasiast 7a510f76e2 Only play message sound in normal playing mode, fixes #2125 2015-11-08 11:07:35 +01:00
duncanspumpkin 251ee91bf6 Fix #2235 anti clockwise no longer crashes 
Issue cause by %4 not handling negative numbers.
 2015-11-08 09:22:29 +00:00
Duncan d1c597aaa0 Merge pull request #2237 from Gymnasiast/water-colours 
Fix #2231
 2015-11-08 09:09:17 +00:00
Michael Steenbeek a1aa08b209 Fix #2231 2015-11-08 10:06:20 +01:00
IntelOrca 15f6f9b66a remove git merge seperator 2015-11-08 04:10:40 +00:00
IntelOrca 40a885f2c4 Merge branch 'zsilencer-network' into develop 2015-11-08 04:08:53 +00:00
IntelOrca d2aa736492 fix master server communication 2015-11-08 04:02:23 +00:00
Ted John 301c7f53c1 Merge Localisation/master into OpenRCT2/develop. 2015-11-08 04:00:17 +00:00
IntelOrca 0b9882b96f fix master server poll times 2015-11-08 02:22:49 +00:00
IntelOrca 782d3e63b2 add new master server functionality 2015-11-08 02:12:12 +00:00
IntelOrca 9bad4183a7 add default master server url and refactor 2015-11-07 23:56:16 +00:00
IntelOrca 74fe482a62 improve game info json 2015-11-07 23:47:50 +00:00
zsilencer 1e9381ef97 master server list 2015-11-07 22:27:51 +00:00
zsilencer 9acfd27735 password prompt for client 2015-11-07 22:26:46 +00:00
zsilencer 3b639ced47 allow host to specify password #2072 2015-11-07 22:25:47 +00:00
zsilencer d66eb70f56 fix potential overflow 2015-11-07 22:23:41 +00:00