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

6916 Commits

Author SHA1 Message Date
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
Duncan 1187b0c534 Merge pull request #3334 from marijnvdwerf/fix-3326 
Fix #3326
 2016-04-18 22:08:49 +01:00
Marijn van der Werf 6e3375a3d4 Small fixes 2016-04-18 21:18:48 +02:00
Hielke Morsink 1dbd313fb4 Moved logic from window to map, inside loops that already existed. 2016-04-18 20:28:34 +02:00
Hielke Morsink 15727b68a9 Recalculating the fences when resizing the map 2016-04-18 20:28:34 +02:00
Gymnasiast ed9334f944 Rename sub_68AE2A to clear_elements_at 2016-04-18 20:28:34 +02:00
Gymnasiast 01c4c0adc5 Allow setting ownership of map edges 2016-04-18 20:28:34 +02:00
Marijn van der Werf c1572f4f58 Update method signature 2016-04-18 20:20:41 +02:00
Marijn van der Werf d8c952d503 Clean up code 2016-04-18 20:20:41 +02:00
Marijn van der Werf db302b89a1 Fix wrong value 2016-04-18 20:20:40 +02:00
Marijn van der Werf 85087f8a86 Draw maze tracks 2016-04-18 20:20:40 +02:00
Duncan 0860cf4540 Merge pull request #3299 from marijnvdwerf/paint-setup/cleanup 
WIP Paint setup/cleanup
 2016-04-18 18:48:53 +01:00
Marijn van der Werf e49abad3ff Rename local variables 2016-04-18 15:36:15 +02:00
Marijn van der Werf a610b372fd Name addresses 2016-04-18 15:35:33 +02:00
Marijn van der Werf d78077ce22 Convert method call to sub_98197C 2016-04-18 15:34:06 +02:00
janisozaur e7eae9aff2 Fix clang optimized builds (#3336) 
This apparently applies to non-Apple clang only.

When passed any optimization level other than 0, clang took liberty and
re-organised arguments passed to `RCT2_CALL*`, even in presence of
attributes put in place to prevent that: optnone,noinline.

This change allows easier project setup. It was previously possible to
produce a clang optimized build by manually recompiling and relinking
addresses.c.o.
 2016-04-18 14:31:38 +01:00
Marijn van der Werf 6b951400a5 Fix #3326: Match original implementation of sub_67933B 2016-04-18 12:59:53 +02:00
janisozaur 24eaa0a56d Show units used when streaming the map over network. Fix #3328 (#3331) 2016-04-17 21:27:23 +01:00
Yaroslav Tretyakov c3ba519a6e Integrate audio related variables (#3322) 2016-04-17 14:20:26 +01:00
Marijn van der Werf eabbdb7e30 Identify structure members 2016-04-17 10:31:50 +02:00
Marijn van der Werf 18a36298b4 Update method signature 2016-04-17 09:42:34 +02:00