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

11056 Commits

Author SHA1 Message Date
Broxzier 9400b292cf Add toggling footpath slope to MP 2017-02-12 23:01:51 +01:00
Broxzier 7ffcc61bf2 Add toggling footpath slope to the tile inspector. 2017-02-12 23:01:49 +01:00
Broxzier 1a611bc5be Add setting slope for fences to MP 2017-02-12 23:00:07 +01:00
Broxzier 31aa7f045a Add path edges and corner toggle to MP 2017-02-12 23:00:07 +01:00
Broxzier 577d1d1128 Add diagonal toggle to MP 2017-02-12 23:00:07 +01:00
Broxzier 7349177c2d Add toggle surface corner to MP 2017-02-12 23:00:07 +01:00
Broxzier c38f4b7171 Add show/restore park fences to MP 2017-02-12 23:00:07 +01:00
Broxzier 044f9c60a9 Better code for readiblity and consistency 2017-02-12 23:00:07 +01:00
Broxzier 813317deed Move map.h include to header, as rct_map_element is used there 2017-02-12 23:00:07 +01:00
Broxzier efd9fce064 Change base height 2017-02-12 23:00:07 +01:00
Broxzier d57f73673a prefix new functions taking x and y with '_at' 2017-02-12 23:00:07 +01:00
Broxzier 83dbb52976 Sorting tile 2017-02-12 23:00:07 +01:00
Michał Janiszewski fc42dce87e Use our own assert_struct_size macro for static assert 2017-02-12 23:00:07 +01:00
Broxzier be97031bb9 Add compiletime asserts to verify size hasn't changed. 2017-02-12 23:00:07 +01:00
Broxzier ff1e5c7675 Use memcpy instead of copying data manually 2017-02-12 23:00:07 +01:00
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