Broxzier
f7ae3065f9
Made pasting of map elements work in MP
2017-02-12 23:00:07 +01:00
Broxzier
ab62d3505a
Made rotate button work in MP
2017-02-12 23:00:06 +01:00
LRFLEW
7dc9ad6cb3
Update Xcode Project
2017-02-12 23:00:06 +01:00
Broxzier
87216cf8a6
Add moving of elements
...
This also simplifies the logic in map.c a little bit, as elements are not
important for modifying a tile.
2017-02-12 23:00:06 +01:00
Broxzier
3aff3a68bf
Add comment
...
[ci skip]
2017-02-12 23:00:06 +01:00
Broxzier
b774c1db2b
Check on clients if the same tile was selected
2017-02-12 23:00:06 +01:00
Broxzier
8a8e2c1cd6
Remove button works in MP
...
This moves the logic from the window file to the file in world/.
It updates the window on all clients correctly.
2017-02-12 23:00:06 +01:00
Broxzier
88a0bb4270
Add support for inserting corrupt elements in MP
...
This PR adds three new files, one to expose some of the funcitons for the
tile inspector window, and two completely new ones for the tile inspector
logic, which handles what happens.
This commit adds the logic for inserting corrupt elements, while keeping
the list on both server and client correct (e.g. client has the same tile
selected, and keeps the same element in focus when the tiles gets changed)
2017-02-12 23:00:06 +01:00
Ted John
6efb94bbe4
Prevent C++ exceptions when getting custom.wav info
2017-02-12 13:32:39 +00:00
Ted John
5e812d5315
Merge pull request #5209 from IntelOrca/refactor/remove-c-rwops
...
Refactor and remove RWops from C code
2017-02-12 10:48:51 +00:00
LRFLEW
6355ee6c4e
Update Xcode Project
2017-02-12 10:42:16 +00:00
Ted John
216dda634b
Remove unused sawyercoding functions
2017-02-12 10:40:32 +00:00
Ted John
7671b21682
Convert audio.c to C++ so RWops can be removed
2017-02-12 10:40:32 +00:00
Ted John
3474f2adff
Remove RWops from server_list.c
2017-02-12 10:40:31 +00:00
Ted John
4ea74ad526
Remove RWops from check_file_paths
2017-02-12 10:40:27 +00:00
OpenRCT2 git bot
bf0be4ca98
Merge Localisation/master into OpenRCT2/develop.
2017-02-12 04:00:23 +00:00
Ted John
5e483b3288
Merge pull request #5153 from wolfreak99/refactor_peep_spawns_park_entrances
...
Refactor park entrance to a struct
2017-02-11 21:14:59 +00:00
wolfreak99
e9726a8121
Include compatibility comment
2017-02-11 15:33:22 -05:00
wolfreak99
e41f8108b7
Remove tabs
2017-02-11 14:07:05 -05:00
Ted John
fbe0e2504a
Do not use RWops for saving track designs
2017-02-11 12:40:38 +00:00
Ted John
fb7f0a21d2
Remove game_load_sv6 that uses RWops
2017-02-11 12:03:03 +00:00
Ted John
1867ac2148
Make scenario_save just take a path
2017-02-11 12:03:03 +00:00
Ted John
4d16e3e1bd
Remove use of RWops from track design
2017-02-11 12:03:03 +00:00
Ted John
3a1331190b
Merge pull request #5203 from oli414/price-tooltips
...
Add tooltip for ride and entrance price when price is disabled for clarification
2017-02-11 11:57:05 +00:00
Aaron van Geffen
5feaab2f8e
Fix #5206 , #5207 : Do not draw all disabled tabs.
...
PR #5138 had the unintended side-effect of drawing all disabled tabs, stemming from the assumption that !widget_is_disabled would be identical to widget_is_enabled.
I have reverted commit 4b91d92
to follow the original logic more closely, adding an exception for disabled tabs made explicitly visible through a sprite.
The tab PR has been much more involved than I'd originally anticipated. Hopefully, a new widget system will eventually make these things easier.
2017-02-11 11:45:22 +00:00
OpenRCT2 git bot
5f3fc807af
Merge Localisation/master into OpenRCT2/develop.
2017-02-11 04:00:24 +00:00
Olivier Wervers
dcf0702f3c
Fix #4493 : - Fix tooltip order.\n - Add tooltip to price label.
2017-02-10 19:30:57 +01:00
Ted John
477de18c17
Merge pull request #5138 from AaronVanGeffen/bugfix/twitch-tab
...
Disable Twitch tab in versions without Twitch support
2017-02-10 18:19:15 +00:00
Ted John
591e81a0af
Merge pull request #5157 from IntelOrca/fix/windows-tests-assert
...
Allow control of assertion behaviour
2017-02-10 18:18:49 +00:00
Olivier Wervers
9c8232e735
Added tooltip to ride and entrance price when price is disabled
2017-02-10 15:03:32 +01:00
Ted John
e717c363eb
Merge pull request #5198 from IntelOrca/refactor/sprite-c-to-cpp
...
Refactor sprite c to cpp
2017-02-10 09:46:33 +00:00
LRFLEW
a15fd6c5f1
Update Xcode Project
2017-02-10 02:34:38 -06:00
Gymnasiast
6c21b469d4
Correctly save booster speed, fixes #5032
2017-02-10 00:32:41 +01:00
Marijn van der Werf
f45b8d6e63
Conditionally set Twitch tab colour
2017-02-09 22:28:53 +01:00
Aaron van Geffen
e60a92ecd8
Add disabled tab sprite.
2017-02-09 22:28:53 +01:00
Aaron van Geffen
eff15e9c9d
Simplify disabled sprite drawing.
2017-02-09 22:28:53 +01:00
Aaron van Geffen
4b91d92105
Simplify tab drawing logic.
2017-02-09 22:28:52 +01:00
Aaron van Geffen
9459ea8442
Revert change to MAIN_OPTIONS_ENABLED_WIDGETS
2017-02-09 22:28:52 +01:00
Aaron van Geffen
d7d7c6d1dc
Draw tab outline even if tab is disabled.
2017-02-09 22:28:52 +01:00
Aaron van Geffen
2e84410843
Draw sprite outline for disabled tabs.
2017-02-09 22:28:52 +01:00
Aaron van Geffen
1698d0d65a
Disable Twitch tab when compiling without Twitch support.
2017-02-09 22:28:52 +01:00
Michał Janiszewski
6eeac4b536
Simplify version number for Travis builds
2017-02-09 21:20:47 +01:00
Jacob W. Breen
b1b5fa9c5a
Fix #4972 : Map window not updated properly when shrinking map...
2017-02-09 18:54:03 +00:00
Christian Murphy
b3e079c7fa
Resolve #5140 : Headless server saves default user.json
2017-02-09 18:51:49 +00:00
Ted John
b79e714740
Fix compilation of sprite.cpp
2017-02-09 18:50:30 +00:00
Ted John
6a0f934a5f
Tabs to spaces for sprite.cpp
2017-02-09 17:59:17 +00:00
Ted John
6ea4e4987d
Turn sprite.c into sprite.cpp
2017-02-09 17:59:17 +00:00
danidoedel
e7b9500bb6
Update Xcode project
2017-02-09 17:58:19 +00:00
Ted John
e649e7ad4a
Move creation of version string to Version.cpp
2017-02-09 17:58:19 +00:00
Ted John
f59afb8c44
Use constant for assertion message
2017-02-09 17:57:39 +00:00