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

233 Commits

Author SHA1 Message Date
wolfreak99 9ae00d92a0 Sync "Set forbid landscape changes" 2017-04-11 14:26:35 +02:00
wolfreak99 bc8cf81ff1 Sync "Set forbid tree removal" 2017-04-11 14:26:34 +02:00
wolfreak99 44c4328b36 Sync "Set pay for park or rides" 2017-04-11 14:26:34 +02:00
wolfreak99 527cce062f Sync "Raise / lower park entry fee" 2017-04-11 14:26:34 +02:00
wolfreak99 e5fac3c765 Sync "Raise / lower cost to buy construction rights" 2017-04-11 14:26:33 +02:00
wolfreak99 5616b1f260 Sync "Raise / lower cost to buy land" 2017-04-11 14:26:33 +02:00
wolfreak99 8b3f0a4df8 Sync "Set guests prefer less/more intense rides" 2017-04-11 14:26:33 +02:00
wolfreak99 33bc414bab Sync "Raise / lower initial guest thirst" 2017-04-11 14:26:33 +02:00
wolfreak99 6baf971eba Sync "Raise / lower guest initial hunger" 2017-04-11 14:26:32 +02:00
wolfreak99 48ad60308e Sync "Raise / lower guest initial happiness" 2017-04-11 14:26:32 +02:00
wolfreak99 c0dc1718a4 Sync "Raise / lower guest initial happiness" 2017-04-11 14:26:32 +02:00
wolfreak99 d21d500b4a Sync "Set forbid marketing campaigns" 2017-04-11 14:26:32 +02:00
wolfreak99 2a8481bd48 Sync "Raise / lower interest rate" 2017-04-11 14:26:31 +02:00
wolfreak99 8c07613eed Sync "Raise / lower maximum loan size" 2017-04-11 14:26:31 +02:00
wolfreak99 e096314f89 Sync "Raise / lower initial loan size" 2017-04-11 14:26:31 +02:00
wolfreak99 0932854f7c Sync "Raise / lower initial cash" 2017-04-11 14:26:30 +02:00
wolfreak99 a3b1175ed6 Sync "Set no money" 2017-04-11 14:26:30 +02:00
wolfreak99 28c61e7068 Prepare scenario options sync 2017-04-11 14:26:25 +02:00
wolfreak99 fb62ed8ae2 Add "Quick demolish mode" to the Rides List 
Taken from the "Quick fire mode" on the Staff List
 2017-04-11 10:16:44 +02:00
Martin Müller ae0c85f009 Add tooltip to the label and warn that restart is required 2017-04-10 14:10:54 +02:00
Martin Müller b1bd899fb8 Add menu option for path to RCT 1 2017-04-10 14:08:58 +02:00
Tom Delebo e9c4365aa2 Add description and greeting textbox to server start menu 2017-04-06 14:31:36 +02:00
Richard Jenkins 1cfc1b003b Fix scenery eyedropper not picking up selected item's rotation (referenced in #5339) (#5344) 2017-04-05 12:33:59 +01:00
Ted John 9c4c7e7b23 Merge pull request #5319 from IntelOrca/refactor/fountain-cpp 
Refactor fountain to C++
 2017-04-03 21:53:33 +01:00
Michael Steenbeek c9c3025e2e Merge pull request #5305 from IntelOrca/feature/scenery-eyedropper-tool 
Add scenery eyedropper tool
 2017-04-02 22:45:28 +02:00
Gymnasiast 9efbf9c60e Only show 'Force breakdown' when not in network mode, fixes #5199 2017-04-02 19:35:25 +02:00
Richard Jenkins ccce7b0432 Pass selected colour to the create banner command, fixes #5316 2017-03-26 15:31:21 +02:00
Ted John 7fb653d1a7 Remove platform include from game.h 2017-03-23 18:34:32 +00:00
Michał Janiszewski 0471d4ccf6 Guard access to ride_type field in ride.c 2017-03-18 23:23:23 +01:00
Michał Janiszewski ddc2a708d4 Don't test unsigned value for being negative 2017-03-18 23:23:23 +01:00
Michael Steenbeek 2bafea9551 Merge pull request #5303 from Broxzier/use-widget-defines 
Replace hardcoded values in window files
 2017-03-13 23:01:47 +01:00
Ted John 6429ccd9df Implement scenery eye dropper 2017-03-13 19:27:20 +00:00
Ted John 6e7c5b7031 Add scenery eyedropper button 2017-03-13 18:05:13 +00:00
duncanspumpkin 60fb821675 More refactoring 2017-03-13 17:33:50 +00:00
duncanspumpkin 652cf510e5 Continue refactor. Fix bug with provisional tracks. 
Note this might bring back #4728.
 2017-03-13 17:33:48 +00:00
duncanspumpkin 9725e6b647 Apply the cpp style guide 2017-03-13 17:33:47 +00:00
duncanspumpkin ffeb1fa527 Initial refactor of entrance 2017-03-13 17:33:46 +00:00
Ted John bcc0bfa485 Rename climate.h to Climate.h 2017-03-11 22:59:33 +00:00
Ted John 04a3c73c59 Refactor climate.h structs 2017-03-11 22:59:32 +00:00
Ted John 0d722d55e1 Refactor climate to C++ 2017-03-11 22:59:32 +00:00
Broxzier 06c195dd3c Fix error in setting pressed tab 2017-03-11 23:49:39 +01:00
Broxzier c0962a56a8 Use widget index in new ride window 2017-03-11 23:49:38 +01:00
Broxzier f688a2c9db Add and use widget index for exit and option button 2017-03-11 23:49:37 +01:00
Broxzier 4cd39babbb Replace hardcoded value in various windows 2017-03-11 23:49:32 +01:00
Broxzier f9e2a74c4d Replace hardcode value and better readibility in ride.c 2017-03-11 23:42:33 +01:00
wolfreak99 56a1dbb54c Replace magic values for enabled widgets in Ride window (#5278) 2017-03-11 22:29:39 +01:00
wolfreak99 2fe134fd5f Make shortcut keys window bigger and resizable 2017-03-11 22:09:24 +01:00
Michał Janiszewski 00b6fb53c6 Fix #5299: Scenario editor crash when placing peep spawn 2017-03-10 23:02:04 +01:00
Michał Janiszewski 7341f4aadd Remove trailing whitespace 
[ci skip]
 2017-03-07 20:38:11 +01:00
Joël Troch 8167ff9678 Fix #1730: Add keyboard shortcuts for track construction (#5200) 2017-03-03 09:35:42 +01:00
wolfreak99 38f264cce8 Allow for more peep spawns in the future 2017-03-02 23:02:54 +01:00
Duncan 1654ba4fe4 Merge pull request #5236 from duncanspumpkin/refactor 
Refactor fence to wall
 2017-02-28 06:56:06 +00:00
Michał Janiszewski 7f48df20ec Refactor input 2017-02-27 20:20:41 +01:00
Hielke Morsink 4ea29bbf80 Close conflicting windows in main menu 
* The main buttons close the other main windows in the main menu

* Only close other windows if the next is not open already
 2017-02-26 13:24:35 +01:00
duncanspumpkin 7691dc3c10 Use functions to set and get secondary colour 2017-02-25 09:19:31 +00:00
duncanspumpkin 69af723972 Remove more fences 2017-02-21 20:22:03 +00:00
duncanspumpkin 810bf301f3 Rename map element fence to wall 2017-02-20 21:10:49 +00:00
duncanspumpkin f54c71b61c Rename functions to wall. Refactor game commands 2017-02-20 21:02:19 +00:00
duncanspumpkin 133266deb0 Label fence offsets 2017-02-19 11:03:05 +00:00
Ted John fb2c835d52 Include new config header 2017-02-18 15:45:10 +00:00
wolfreak99 6e8e2038f5 Prevent signed addition overflows in multiple places 2017-02-17 23:46:23 +01:00
Michał Janiszewski 7d62c70c59 Initialise variables to default values 2017-02-17 08:50:58 +01:00
duncanspumpkin 260a6200b9 Fix dropdown custom height code. Use flags for filters. 
Note dropdown custom height code is not used in any function at present.
 2017-02-16 18:35:59 +00:00
Michał Janiszewski a78e922a14 Fix edge conditions 2017-02-14 22:34:13 +01:00
wolfreak99 bee43fc78d Disable unsupported debug options in multiplayer 2017-02-12 23:02:19 +01:00
Broxzier 2fb49013bc Apply coding style to tile inspector source files 2017-02-12 23:02:19 +01:00
Broxzier 22cfb3da2c Fix Travis warning 2017-02-12 23:02:19 +01:00
Broxzier bc93ecaf30 Add banner toggle for blocking paths to MP 2017-02-12 23:02:19 +01:00
Broxzier f44a78ff8a Add clamp corrupt element to MP 2017-02-12 23:02:18 +01:00
Broxzier cc2fae2f6a Add setting quadrant collision for small scenery to MP 2017-02-12 23:02:18 +01:00
Broxzier 2682639393 Add setting small scenery quadrant location to MP 2017-02-12 23:02:18 +01:00
Broxzier 1cbf2e6589 Remove no longer needed definitions 2017-02-12 23:01:51 +01:00
Broxzier d5291cfd0a Add raising and setting chain for track blocks to MP 2017-02-12 23:01:51 +01:00
Broxzier 96a1192445 Replaced asserts with openrct2_asserts 2017-02-12 23:01:51 +01:00
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 efd9fce064 Change base height 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
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 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 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
Ted John 3474f2adff Remove RWops from server_list.c 2017-02-12 10:40:31 +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
Ted John 1867ac2148 Make scenario_save just take a path 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
Olivier Wervers dcf0702f3c Fix #4493: - Fix tooltip order.\n - Add tooltip to price label. 2017-02-10 19:30:57 +01:00
Olivier Wervers 9c8232e735 Added tooltip to ride and entrance price when price is disabled 2017-02-10 15:03:32 +01:00