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

6836 Commits

Author SHA1 Message Date
OpenRCT2 git bot f6bfbb0186 Merge Localisation/master into OpenRCT2/develop. 2016-04-21 04:00:15 +00:00
janisozaur 7eb3a90cea Fixes for values being shifted (#3362) 2016-04-20 23:57:54 +01:00
Ted John 60ac228c51 Merge pull request #3277 from IntelOrca/refactor-twitch 
Refactor and clean up twitch.cpp
 2016-04-20 22:12:57 +01:00
Ted John 4e53fc4c40 Merge pull request #3359 from Gymnasiast/runemute 
Add shortcut to mute sound
 2016-04-20 22:02:04 +01:00
LRFLEW e71a918f65 Remanaged Xcode Project (#6) 
Fixes OS X compilation error
 2016-04-20 22:00:50 +01:00
Gymnasiast 548bee8325 Fix formatting and rebase 2016-04-20 20:14:07 +02:00
Ted John ce06346c8d update contributors.md 
[ci skip]
 2016-04-20 19:03:57 +01:00
Rune Laenen e0c103031e Add shortcut to mute sound 2016-04-20 19:56:57 +02:00
IntelOrca f10d79c63c refactor and clean up twitch.cpp 2016-04-20 18:11:07 +01:00
IntelOrca 770a37dd10 update VS filters 2016-04-20 18:11:07 +01:00
IntelOrca 4b2776f266 move code from Diagnostics and Guard to cpp 2016-04-20 18:11:06 +01:00
janisozaur e9bf2a742f widget_index is sint16, make sure the check is valid (#3335) 2016-04-20 18:08:05 +01:00
Ted John 0286efc546 update changelog 2016-04-20 17:51:39 +01:00
Ted John 3a38bac1b6 Merge pull request #3283 from IntelOrca/fix-3282 
fix #3282: improve launched freefall ratings
 2016-04-20 17:42:22 +01:00
Ted John 234f3ae7f1 update changelog 2016-04-20 17:41:38 +01:00
IntelOrca 94ecc1da40 fix #3282: improve launched freefall ratings 
When the ride mode is in downward launch mode, the intensity and nausea were fixed regardless of how high the ride is. To improve the rating calculations, alter the ratings in a similar fashion to roto-drop which is a similar mechanic.
 2016-04-20 17:33:55 +01:00
janisozaur 54316a50dc Drop quotes preventing regex match from travis script (#3356) 
Original implementation was only tested in zsh, bash requires the regex
to be without quotes.
 2016-04-20 17:19:43 +01:00
Ted John 039ab08747 update readme.md with improved badges 2016-04-20 13:17:13 +01:00
janisozaur 44717cfe2a Add console command to set ride type (#3273) 2016-04-20 12:37:31 +01:00
Marijn van der Werf 8fc897522b Clean up paint setup rotation (#3343) 
* Use passed rotation
* Replace fixed 0 rotations
 2016-04-20 12:33:42 +01:00
Ted John 3dc2651742 Merge pull request #3354 from zsilencer/bugfixes 
Various bug fixes to multiplayer / network.
 2016-04-20 12:26:55 +01:00
zsilencer 3ba7d54247 Fix reconnect issue caused by inboundpacket not being cleared 2016-04-20 01:49:16 -06:00
zsilencer 0ceff7fd90 More efficient map transfers 2016-04-20 01:49:15 -06:00
zsilencer 82e02e7cf8 String ids got switched around from the language files. 2016-04-20 01:49:15 -06:00
zsilencer e742e96461 Fix bug that gave error when trying to join saved server 2016-04-20 01:49:15 -06:00
zsilencer e582a8f47f Stop constantly resizing vector 2016-04-20 01:49:15 -06:00
zsilencer b257e431d9 Get rid of using user_strings for interface 2016-04-20 01:49:15 -06:00
LRFLEW ddedcf1d3b Removed Warnings present in Xcode (#3342) 2016-04-20 08:01:07 +01:00
OpenRCT2 git bot 11bf9111c3 Merge Localisation/master into OpenRCT2/develop. 2016-04-20 04:00:15 +00:00
Ted John 3405fd5bad fix #3352: assertion trigger while fixing tiles 
Remove assertion and add warning message instead.
 2016-04-19 23:14:02 +01:00
Ted John 9fd6c9df5f update VS filters 2016-04-19 22:52:41 +01:00
Ted John 6c6662a3ee Merge pull request #3350 from janisozaur/network-version 
Network version
 2016-04-19 21:08:30 +01:00
Michał Janiszewski fb8646e66f Fix typo in variable name 2016-04-19 21:15:48 +02:00
Michał Janiszewski b2a3b82d08 Show network version to client if mismatched 
This will let players know which version should they be using to connect
to server. Also prevents users from even trying to join servers running
versions we already know are incompatible.
 2016-04-19 21:15:23 +02:00
Michael Steenbeek 423844c2fb Don't open the New Ride window when in the Scenario Editor, fixes #3344 (#3349) 2016-04-19 19:37:35 +01:00
Ted John cec7e54dd8 Merge pull request #3325 from Broxzier/rotate_map_elements 
Rotate map elements
 2016-04-19 19:37:19 +01:00
Michael Steenbeek b13d0aa2d3 Fix ride window height definition, fixes #3347 (#3348) 2016-04-19 19:08:24 +01:00
Hielke Morsink 2713c999c5 Cleaning up and updated changelog 2016-04-19 19:25:31 +02:00
Hielke Morsink d08dd70406 Static functions. 2016-04-19 19:25:29 +02:00
Hielke Morsink fd7fe4ed5a Fix redraw issue when clicking on a list item. 2016-04-19 19:25:28 +02:00
Hielke Morsink 6fbdb46d37 Enabling and disabling the rotation button based on selected element type. 2016-04-19 19:25:27 +02:00
Hielke Morsink 992a830622 Fix: Invalidating tiles correctly from the tile inspector. 2016-04-19 19:25:25 +02:00
Hielke Morsink 048b7ff30c Added button to reotate map elements in tile inspector - closes #3106 2016-04-19 19:25:24 +02:00
Ted John cf628ea7cf Merge pull request #3152 from dlee13/cheat-disable-littering 
Add cheat to disable littering and refactor peep thought code.
 2016-04-19 17:31:58 +01:00
Derek Lee 4d1153669e Refactor peep code 
Use constants rather than magic numbers and make identifiers consistent
 2016-04-18 23:34:11 -07:00
Derek Lee c4226235e3 Add cheat to disable littering 
Add cheat and increment NETWORK_STREAM_VERSION
 2016-04-18 23:34:10 -07:00
Duncan 385b03ec79 Merge pull request #3170 from marijnvdwerf/maze-paint-setup 
Maze paint setup
 2016-04-19 06:27:08 +01:00
OpenRCT2 git bot 6c505025f5 Merge Localisation/master into OpenRCT2/develop. 2016-04-19 04:00:18 +00:00
janisozaur 0b9b976dd6 Cast peep's arguments properly (#3341) 
Left-hand side of shift operator determines what's the resultant size of
whole expression. Consider this:

    uint16 p = 65535;
    uint32 q = p << 16;

`q` will be an undefined result, as it will not fit in `uint16` type
anymore, and compiler can optimise it away, unless you cast `p` to be
something which can hold such value, in this case `uint32`.
 2016-04-18 23:02:08 +01:00
Ted John ec50198fa4 Merge pull request #2535 from Gymnasiast/allow-ownership-map-edges 
Allow setting ownership of map edges
 2016-04-18 22:59:58 +01:00