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

673 Commits

Author SHA1 Message Date
Gymnasiast 77481847ca Refactor Giga and Junior booster speed factor 2017-06-20 19:12:49 +02:00
Gymnasiast 8b6ecc76d2 Clean up boosters 2017-06-20 14:24:10 +02:00
Gymnasiast f2f8cec944 Clean up dropdowns 2017-06-20 13:38:51 +02:00
Gymnasiast 5db6e5afa1 Use constants for number of marketing campaigns and expenditure table 2017-06-19 22:17:05 +02:00
Gymnasiast 65806a55db Create and use defines for the amount of surface and edge textures 2017-06-19 22:16:34 +02:00
Gymnasiast 595e73e2d9 Name GAME_COMMAND_FLAG_7 2017-06-18 18:25:49 +02:00
Richard Jenkins 312adaf8e7 Merge pull request #5644 from Gymnasiast/max-stations 
Add define for number of colour schemes, correct several cases of max stations per ride
 2017-06-17 14:32:36 +01:00
Gymnasiast 631f4d8907 Add a constant for RIDE_ENTRY_INDEX_NULL 2017-06-17 14:32:15 +02:00
Gymnasiast ed905f3c68 Add define for number of colour schemes, correct several cases of max stations per ride 2017-06-17 14:31:48 +02:00
Gymnasiast 26cd0da5be Check the first non-null ride type in object selection 2017-06-17 13:52:17 +02:00
Michał Janiszewski 9903c15e2a Remove various trailing whitespaces 
[ci skip]
 2017-06-17 13:41:40 +02:00
Gymnasiast d782018a8f Fix trailing whitespace and RIDE_TYPE_NULL in new_ride.c 2017-06-17 13:33:25 +02:00
ZehM4tt f05e94c1c6 Fixed a desync that would happen when having the guests list open. (#5632) 
* Fixed a desync that would happen when having the guests list open.
* Refactored the flashing state of peeps to not affect the flags.
* Added deprecation info for SPRITE_FLAGS_PEEP_FLASHING.
* Removed unused line that used the old flag.
* Update network version
 2017-06-17 12:55:41 +02:00
wolfreak99 67160d2f70 Rename sint32 gFirstTimeSave to bool gFirstTimeSaving 2017-06-14 16:28:11 +02:00
Christian F. Coors c506c4be2d Add defines for scenery IDs 2017-06-14 16:06:43 +02:00
Gymnasiast 4059d9e8a7 Clean up boosters, ride_type_null, max rides per entry, formatting 2017-06-14 16:06:43 +02:00
Michael Steenbeek 96a7a8ab50 Sort rides into ride groups when in select-by-track-type mode 
* Add ride groups

* Convert ride groups to C++

* Fix linking and crashes in Xcode

* Comment out .field syntax to make Visual Studio happy

* Fix alignment, fix changelog, cleanup

* Properly save ride group index in the ride object repository and bump its version

* Fix fallback behaviour when the ride entry is not available or not invented

* Fix include

* Rename RideGroup to RideGroupManager, add const, cleanup

* Break after finding matching ride group
 2017-06-14 13:31:27 +02:00
Ted John 7e9f7df7d1 Use standard platform defines 2017-06-12 18:01:51 +01:00
Ted John 25b6c613b9 Merge pull request #5597 from IntelOrca/refactor/nosdl/remaining-platform 
Remove remaining SDL from platform code
 2017-06-12 17:52:11 +01:00
Richard Jenkins 4c67ef1d6a Implement persistent 'real names of guests' setting 2017-06-12 14:05:19 +02:00
Richard Jenkins 5db340743f Merge pull request #5599 from Gymnasiast/fix/5596 
Fix #5596: Incorrect colours in the Map window
 2017-06-12 11:26:11 +01:00
Gymnasiast a586a6e15d Fix #5596: Incorrect colours in the Map window 2017-06-12 11:59:53 +02:00
Michał Janiszewski 0757582c93 Add missing include 2017-06-12 11:53:26 +02:00
Michał Janiszewski 4547dfab95 Prevent a crash in headless mode when showing error 2017-06-12 11:52:04 +02:00
Ted John 902bba6906 Fix compiler errors, add ctype.h in required source files 2017-06-11 23:43:28 +01:00
Ted John ee7c97b7be Move scancode to key to openrct2ui 2017-06-11 23:22:32 +01:00
Ted John cbd53f920c Create IWindowManager to open window from libopenrct2 2017-06-11 17:23:51 +01:00
Ted John dfa1b47a4f Move keyboard shortcut code to libopenrct2ui. 2017-06-11 16:52:15 +01:00
Ted John b32f0b276d Merge pull request #5574 from IntelOrca/fix/screenshot 
Fix screenshot command and refactor drawing engine
 2017-06-10 20:06:26 +01:00
Ted John a52190ae44 Create C version of FULLSCREEN_MODE enum 2017-06-10 17:14:07 +01:00
Ted John 97d68957f0 Fix segfault in screenshot command 2017-06-10 15:48:05 +01:00
Jeremy Herbert ac99683955 Add cheat to disable ride value ageing 2017-06-07 21:52:47 +01:00
Michał Janiszewski 61d38511bc Expand tabs to spaces 
This commit expands tabs to spaces (ts=4) in all the files under src/
and test/.

Until now we had two wildly different code styles with C using tabs and
new C++ using spaces. It is painful to maintain as none of the commonly
used tools support this kind of setup and in reality is needless, as we
can simply convert all the sources to spaces and have opened PRs do the
same, where needed.

Additionally, trailing whitespace has been removed.
 2017-06-06 23:46:14 +02:00
delebota f69e7ac89e Setup server action logging for server admins in multiplayer 
Squash commit containing:
- 398d978 Setup server action logging for server admins in multiplayer
- 13330ae Added server action logging for using cheats in multiplayer
- b619019 Added server action logging for demolishing rides in multiplayer
- 93de752 Added server action logging for editing ride properties in multiplayer
- 8a3d932 Added server action logging for editing park properties in multiplayer
- c78b6e7 Moved duplicate chat and server logging code into new network methods
- c8f66bf Changed logging variable types to avoid deprecated conversion errors in CI builds
- 454e527 Added improved server action logging for using cheats in multiplayer
- 1194305 Moved server action logging code in game.c into a separate method to reduce clutter
- d59cd42 Added server action logging for add/edit/remove scenery in multiplayer
- c41ae0e Added server action logging for clients in multiplayer
- c383341 Removed unused variable to fix CI build error
- 2d1d8e3 Added server action logging for ride creation in multiplayer
 2017-06-06 23:07:54 +02:00
wolfreak99 07d1ba4f8c Create "Own all land" cheat functionality (#5056) 
Implement "Own all land" cheat into cheat window

Restore only valid peep spawn points

Code improvements

Update to use PEEP_SPAWN / PARK_ENTRANCE defines
 2017-06-06 21:50:42 +01:00
rwjuk ea96ab0225 Name sub_6CA162() 2017-06-06 01:02:34 +01:00
rwjuk ee637b8a33 Name sub_6B2FA9() 2017-06-06 00:51:34 +01:00
rwjuk a03699839c Name sub_666EEF() 2017-06-06 00:51:34 +01:00
Richard Jenkins b492aa544f Name sub_684AC3() 2017-06-06 00:47:08 +01:00
Richard Jenkins d2fa8bab14 Name sub_6C96C0() 2017-06-06 00:47:08 +01:00
Richard Jenkins 1d2ced2ad7 Name sub_6CC3FB() 2017-06-06 00:47:07 +01:00
Richard Jenkins 5c28e66aa2 Name sub_6D01B3() 2017-06-06 00:47:07 +01:00
Richard Jenkins d191aaa1ef Name sub_6C9627() 2017-06-06 00:47:07 +01:00
Richard Jenkins 4893521bea Name sub_6C84CE() 2017-06-06 00:47:07 +01:00
Ted John cd330ede53 Merge pull request #5133 from samhorlbeck/develop 
Add enhancement to show money effect when peeps make purchases
 2017-06-05 22:39:29 +01:00
Ted John 1d5c12d2ae Merge branch 'fix/rating-overflow' into develop 2017-06-05 22:31:44 +01:00
wolfreak99 8006bbb9d5 Select previous element after removing in tile inspector 2017-06-05 22:59:15 +02:00
Sam Olsen b9e9b8320f Add enhancement to show money effect when peeps make purchases 2017-06-05 21:02:05 +01:00
Ted John 463fadbcf6 Protect ride rating names from extreme numbers 2017-06-05 20:16:28 +01:00
wolfreak99 36ca5b30ac Mark selected save file in load/save window 2017-06-05 15:45:36 +02:00
Ted John eb0b29bcfe Merge pull request #5531 from Gymnasiast/fix/837 
Create define for top toolbar clearance and fix #837
 2017-06-04 00:51:13 +01:00
Leurak 112f7b7a0d Add address parameter in network_begin_server 2017-06-04 00:42:13 +01:00
Richard Jenkins acd3b09c80 Name sub_6DFED0(), remove magic numbers, minor refactor to research 2017-06-03 23:21:47 +02:00
Michał Janiszewski c136dc85d2 Provide define for maximum map edge size 2017-06-03 12:52:34 +02:00
Gymnasiast dd8a0847e1 Replace TOP_TOOLBAR_CLEARANCE with TOP_TOOLBAR_HEIGHT 2017-06-02 16:34:30 +02:00
Marijn van der Werf 2e40d90f5f Replace more occurences of 28 2017-06-01 22:38:35 +02:00
Michael Steenbeek 7d9acca1e0 Create define for max ride types per ride entry, closes #5524 2017-06-01 22:00:11 +02:00
Michał Janiszewski 79d76759bb Fix #5516: Update copyrights for 2017 
Not all files were necessarily _changed_, but all were touched, see
https://github.com/OpenRCT2/OpenRCT2/pull/4932
 2017-06-01 21:55:10 +02:00
Richard Jenkins 3761104ee2 Fix #5511: Backspace behaves inconsistently in track manager 2017-06-01 20:23:23 +02:00
Gymnasiast a43ee2b987 Fix copyright year and comment 2017-05-29 22:39:19 +02:00
Ted John 61228fc4e8 Add all files filter 2017-05-29 22:39:19 +02:00
Ted John f998172674 Fix IME text input 2017-05-29 22:38:46 +02:00
Richard Jenkins e8ec7ee58f Implement building of libopenrct2 and OpenRCT-UI for macOS 
Initial setup of xcode for multiple targets

libopenrct2 partially working

Restore macOS mach_info init

Get macOS OpenRCT2-ui working if hackish

Implement UiContext for macOS properly

Put tabbing cancellation code back
 2017-05-29 22:38:45 +02:00
Michał Janiszewski 423028dac9 Fix some warnings with clang and GCC 2017-05-29 22:38:44 +02:00
Ted John fc19b57c09 Fix build after rebase 2017-05-29 22:38:44 +02:00
Ted John 3fcd42fe2b Move more window code to UiContext 2017-05-29 22:38:43 +02:00
Ted John 0440c3deea Clean up audio.cpp 2017-05-29 22:38:43 +02:00
Ted John bd9839ff50 Get the game working 
Mostly just needed to resolve screen size which is now retrieved via ui context.
 2017-05-29 22:38:43 +02:00
Ted John 9d24e47e6f Fix build 2017-05-29 22:38:42 +02:00
wolfreak99 3d50ab56c8 Support mouse dragging when selecting ride design scenery 
Define nearby scenery distance, support mouse dragging when selecting/deselecting ride design scenery
 2017-05-29 22:34:33 +02:00
Marijn van der Werf eaf93430d5 Remove some string additions 2017-05-28 19:49:32 +02:00
Daniel Kamil Kozar a64e08f997 Don't flash the white frame around network status windows 
This commit turns off the white border for all network status windows. This is
mostly evident when downloading a map from the server before starting a
multiplayer game, as the window is repeatedly brought to the front with a white
border. This results in needlessly flashing the border, since
window_network_status_open is called for every chunk of data received from the
network socket.
 2017-05-26 15:58:54 +02:00
Marijn van der Werf 53b023612d Show uses of raw palette indices 2017-05-21 00:01:45 +02:00
Hielke Morsink bfa03583fa Apply window themes only when created or when the selected theme is changed 2017-05-17 13:19:42 +02:00
Michael Steenbeek 6bd34c1e55 Clean up sub_69101A, use constants for undefined excitement ratings, fixes #5481 2017-05-16 22:36:48 +02:00
Michael Steenbeek e725672d23 Clean up alternative track pieces and types, remove remnants of researched track pieces 2017-05-16 19:11:51 +02:00
Gymnasiast d5f1e22a56 Name RIDE_TYPE_FLAG4 flags 2017-05-16 16:37:23 +02:00
wolfreak99 471f0c3230 Allow loading bmp files as heightmap using the native file browser 
Upon playing with the heightmap tool, i realized that the feature actually supports bmp files as well, and they are even listed in the in-game load/save dialog, but they are not shown when using a native file browser. This fixes that.
 2017-05-15 16:02:15 +02:00
CraigCraig 26287f5a3e More readability, grammar, spelling fixes 2017-05-15 09:28:43 +02:00
Richard Jenkins eb868089c8 Fix #5470: Available construction rights only displays once (#5476) 2017-05-14 23:45:44 +01:00
CraigCraig 58deb3a54a Grammar, readability, and spelling fixes 
[ci skip]
 2017-05-11 11:45:59 +02:00
Richard Jenkins 86d8863496 Fix #5456: Paths with non-ASCII characters mishandled on macOS (#5463) 2017-05-11 09:43:53 +02:00
Michael Steenbeek a53b01d5b9 Remove magic numbers and Americanisms 2017-05-08 23:54:38 +02:00
Ted John f9acdcb02d Use callback mechanism in case server rejects command 2017-05-08 23:46:50 +02:00
Gymnasiast 2bb3a297b4 Do not close new campaign window when starting a campaign results in an error, fixes #4810 2017-05-08 23:46:50 +02:00
Craig Craig 9dd820e2e7 Spelling fixes 2017-05-08 08:30:50 +02:00
Richard Jenkins fc873f2ce0 Fix #4748: No way to see owned rights after #4701 
This partially reverts #4701 - the land rights button in the park window will always be visible, and if no construction rights are available to buy, all owned rights will be displayed.
 2017-05-06 19:14:04 +01:00
Ted John b8931bd503 Use C++ mutex instead of SDL for server_list.cpp 2017-05-04 17:29:05 +01:00
Ted John ec3652152a Quick port of server_list window to C++ 
So that C++ mutex can be used.
 2017-05-04 17:29:04 +01:00
Marijn van der Werf a0259b79d4 Use rct_widgetindex type 2017-05-03 22:43:33 +02:00
Marijn van der Werf 31e8b510ec Use constants for maze construction 2017-05-03 16:09:21 +02:00
Marijn van der Werf 927190103b Use enum for tools 2017-05-03 16:09:21 +02:00
Marijn van der Werf 2b54032b8e Replace magic numbers in windows with constants 2017-05-02 14:41:53 +02:00
Marijn van der Werf 3cf725745d Add compile-time checked constants for widget ids 2017-05-02 09:58:25 +02:00
Ted John 4288e13947 Change mute widget index to its more logical position 2017-04-30 22:35:47 +01:00
Ted John ae8aa2d466 Fix top toolbar tool switching 
Moved tool active checks to top toolbar so that it can use constants.
 2017-04-30 22:33:19 +01:00
Ted John 75e0c94082 Fix mute / unmute logic 2017-04-30 18:03:25 +01:00
Ted John 21bf897bda Adjust group box on interface options page 2017-04-30 17:46:23 +01:00
Pulkit 970614bd51 WIDX_MUTE Improvements 2017-04-30 17:36:38 +01:00
Pulkit 89baa54633 Fixed the whitespaces 2017-04-30 17:33:26 +01:00
Pulkit dff1d724a0 Updated the location of the mute button 2017-04-30 17:33:26 +01:00
Pulkit daf968161e Added the mute option in the toolbar 2017-04-30 17:33:26 +01:00
Pulkit f7d01e3983 Modified the Mute button Like the Cheat 
I implemented the Mute button but for some reason I am unable to enable
the checkbox. Could someone kindly look into it
 2017-04-30 17:33:26 +01:00
Pulkit 0ca023a459 Few Corrections, in the code. 2017-04-30 17:33:26 +01:00
Pulkit a0f6a3b61b Updated Position of the Mute Button 2017-04-30 17:33:25 +01:00
Pulkit ffa3896b24 Mute Button Implemented like in RCT1 
Added the Mute button, like requested in the Issue #1421.
 2017-04-30 17:33:21 +01:00
CraigCraig e0b875398b Tons of spelling fixes (#5413) 
[ci skip]
 2017-04-30 06:39:24 +02:00
Michael Steenbeek 92e110195e Define native file dialog strings when loading heightmap, to avoid crashes 
Thanks to @wolfreak99 for the fix.
 2017-04-27 16:02:35 +02:00
Michał Janiszewski dcb1b8651b Fix scenery eye dropper checks 2017-04-24 23:25:21 +02:00
Broxzier b456fe2a4d Copy argument to buffer since it may be freed, add missing break 2017-04-24 23:19:51 +02:00
Broxzier 52ef6c8e34 Pass arguments with correct type for {COMMA16} 2017-04-24 23:19:51 +02:00
Broxzier 2cd4a686f6 Disable page widgets until a map is loaded 
A few strings have their {WINDOW_COLOUR_2} setting removed, since this
prevented strings from being market as inset. All uses of these strings
have been checked.
 2017-04-24 23:19:51 +02:00
Broxzier 03bfc68250 Loading height map into memory 2017-04-24 23:19:51 +02:00
Broxzier 0d07ea69f8 Add support for loading PNG files 
This needs to be refactored
 2017-04-24 23:19:51 +02:00
Broxzier 624f3e3298 Fix smooth-tiles checkbox not being invalidated; updated default height values 2017-04-24 23:19:51 +02:00
Broxzier 810103b90f Use loadsave window for selecting the heightmap 2017-04-24 23:19:51 +02:00
Broxzier 6edea503b2 Refactored mapgen window file 
- Removed duplicated code
- Moved shared widgets to define
- Moved shared widget handling code to function
 2017-04-24 23:19:51 +02:00
Broxzier c6e3ecd5ed Better widget behaviour and fixes 
- Inset text for disabled labels and values
- Spinners can be held down

Other fixes:

- Use correct types for widget indices
- Use WINDOW_MAPGEN_PAGE_COUNT for arrays (when a new page is added in the
  future, the compiler will warn about all the arrays having an invalid
  size)
- Sort code so that related arrays are placed near each other
 2017-04-24 23:19:51 +02:00
Broxzier 55c1787a13 Add heightmap smoothing 
Fixed underflow error that was visible for non-tilable maps.
Reordered widgets to reflect the same order of the algorithm.
Always regenerate the map when a setting is changed.
 2017-04-24 23:19:51 +02:00
Broxzier 26989ea8f6 Add smoothing height map option 2017-04-24 23:19:51 +02:00
Broxzier edfe997e78 Add option to normalize height map 2017-04-24 23:19:51 +02:00
Broxzier fda415cd44 Add settings to heightmap tab 2017-04-24 23:19:51 +02:00
Broxzier 702d99e1e3 Initial prototype of loading heightmaps 
Adds new strings and string ids for some future commits too.
 2017-04-24 23:19:51 +02:00
Michał Janiszewski f4b1c010e1 Fix uninitialised variable 2017-04-24 21:59:01 +02:00
Michał Janiszewski ea26ae9866 Explicitly initialise globals in entrance.cpp 2017-04-24 21:47:33 +02:00
Hielke Morsink 9314b8b793 Fix #5375: Use mask for fetching large scenery id, fix picking banner elements 2017-04-19 07:56:46 +02:00
Michał Janiszewski d53f276207 Fix scenery eye dropper interaction with footpaths 2017-04-18 22:49:33 +02:00
siomy11 7cf64d0bfe Display "No mechanics are hired!" instead of "Calling mechanic..." when no mechanics are hired (#5368) 2017-04-16 22:38:02 +02:00
Ted John d06208a521 Fix scenery window height and list calculation 2017-04-14 18:59:21 +01:00
Michał Janiszewski b87a8095d1 Make input buffers' sizes consistent 2017-04-14 19:17:38 +02:00
Michael Steenbeek 400a2cc9c7 Merge pull request #5354 from rwjuk/fix5350 
Make boosters on Twister and Giga Coaster more practical (#5350)
 2017-04-13 22:19:25 +02:00
Richard Jenkins 194afc7b49 Halve Junior RC booster values, and update construction window to match 2017-04-13 21:05:52 +01:00
Gymnasiast 18aa462f9a Fix booster speed when right-clicking a part 2017-04-13 21:37:14 +02:00
Richard Jenkins 2ca500ad1e Adjust track build window for Giga Coaster to reflect doubled boost speed 2017-04-13 20:16:36 +01:00
Ted John ff350f3769 Fix #5338: Scenery eyedropper hides the third colour picker 2017-04-13 17:01:44 +01:00
Gymnasiast c8ecd98737 Check for both csg1.1 and csg1.dat when looking for RCT1 graphics 2017-04-12 20:08:31 +02:00
wolfreak99 fcafd9576a Replace FALSE/TRUE with 0/1 2017-04-11 14:26:36 +02:00
wolfreak99 d22ad8abb5 Sync "Set guest generation higher difficult level" 2017-04-11 14:26:35 +02:00
wolfreak99 d6dfb3e079 Sync "Set park rating higher difficult level" 2017-04-11 14:26:35 +02:00
wolfreak99 8f56f60841 Sync "Set forbid high construction" 2017-04-11 14:26:35 +02:00
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
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 9459ea8442 Revert change to MAIN_OPTIONS_ENABLED_WIDGETS 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
Jacob W. Breen b1b5fa9c5a Fix #4972: Map window not updated properly when shrinking map... 2017-02-09 18:54:03 +00:00
wolfreak99 f85dc8ced0 Code fixups 2017-02-08 21:46:54 -05:00
Ted John b3b5631f07 Merge pull request #5163 from Broxzier/tile_inspector_fixes 
Minor tile inspector improvements
 2017-02-08 22:26:42 +00:00
wolfreak99 b0cc772990 Replace gParkEntranceX/Y/Z/Direction with rct_xyzd16 gParkEntrance 2017-02-08 09:39:04 -05:00
Ted John b21378b7f5 Fix #4689: Object selection tabs sometimes flicker 
8466de7cbf only reset w->frame on object type tabs. This also does it does it for the ride type filter tabs.
 2017-02-04 11:31:07 +00:00
duncanspumpkin fef7445f0c Use flags where known. Refactor large 3d signs slightly 2017-02-04 08:12:44 +00:00
Broxzier 5fef1a5d0b fix paste button becomes active after sorting tile 
Remove unneeded call to window_tileinspector_set_page
 2017-02-03 21:10:20 +01:00
Ted John fed4c248e3 Remove use of SDL RWOps from title sequence player 2017-02-02 22:00:01 +00:00
Michał Janiszewski 04a2734593 Merge pull request #5162 from duncanspumpkin/refactor 
Small refactor of world files
 2017-02-02 22:53:37 +01:00
Ted John 676903e65c Reduce false positive desync 
The staff list window modifies the sprites purely for local state causing a false positive desync warning to pop up in multiplayer. This now causes it to only happen if the map window is also open. This is also a performance improvement.

#5164
 2017-02-02 21:31:36 +00:00
Broxzier 81a8a1a939 Minor tile inspector improvements 
- Fix tile unselectable after closing the window
- Remove unused code (scenery has no dropdown)
- Drawing dashes in X/Y spinners when no tile is selected
 2017-02-02 21:28:18 +01:00
duncanspumpkin e384b9a508 Label known offsets and flags of wall/fence 2017-02-02 18:52:35 +00:00
duncanspumpkin e749285e48 Label PARK_FLAGS_18 and adjust SCENARIO_NO_MONEY comment 2017-02-02 17:59:23 +00:00
wolfreak99 99c68439b1 define MAX_PEEP_SPAWNS and MAX_PARK_ENTRANCES (#5119) 2017-01-29 22:27:14 +01:00
duncanspumpkin e2efb66d3d Minor refactor of banner and footpath enums 2017-01-29 09:40:43 +00:00
Michał Janiszewski 723e13cb16 Prevent some crashes when title sequence is not present 2017-01-28 21:13:36 +00:00
duncanspumpkin 3633b86405 Minor refactor of track design to label enums 2017-01-28 09:28:11 +00:00
duncanspumpkin d951c500c5 Refactor of peep data and label known addresses 
Fixes #4545. Incorrect sprite image for chicken and juice
 2017-01-26 19:51:30 +00:00
Ted John 7eac99c9f0 Merge pull request #5113 from IntelOrca/feature/random-entertainer-skin 
Set hired entertainers to a random costume.
 2017-01-25 12:35:08 +00:00
zaxcav 5424e7774c Display cut height in Units when Height Label: Units is selected in the options. (#5115) 2017-01-25 00:53:25 +01:00
Ted John 93762bf15f Fix issues 2017-01-24 17:32:17 +00:00
Ted John c40df001ca Use sint32 2017-01-24 17:04:03 +00:00
Ted John c699c91348 Pick random entertainer costume 2017-01-24 13:06:23 +00:00
Ted John 2900f38cc3 Allow entertainer costume to be given to game command 2017-01-24 13:06:23 +00:00
Ted John a0fc01d54e Clean up game init a bit more 2017-01-23 12:55:59 +00:00
Aaron van Geffen 3437b26db8 Clean up switch statement for map window 2017-01-22 23:06:56 +01:00
Ted John efb64603eb Only create OpenGL window when necessary 
Currently the game window is always created with an OpenGL context which then means that opengl32.dll and other modules are loaded. The OpenGL window flag will now only be used if the config drawing engine is set to OpenGL. This now means that a restart of the game is required when switching to the OpenGL drawing engine for Windows.

#5104
 2017-01-22 21:38:08 +00:00
zaxcav a4b476ac92 Minor changes as requested by reviewer. 2017-01-22 21:21:00 +01:00
zaxcav 80b0df3b74 Add formatting to tooltip texts; Fix printing of raw clip height value. 2017-01-22 21:21:00 +01:00
zaxcav 6a4ced856e Minor code changes per reviewer comments. 2017-01-22 21:17:08 +01:00
zaxcav 0d81835224 Correct mistakes during rebase. 2017-01-22 21:17:08 +01:00
zaxcav 93e5e80e26 Correct code alignment in widget placement code (tab based). 2017-01-22 21:11:42 +01:00
zaxcav e8f97da2c6 Implement further changes as requested by reviewer. 
Add toggling displayed clip height value between the raw value and value in units.
 2017-01-22 21:11:42 +01:00
zaxcav 25e57ca50d Updated code as requested by reviewer. 
Removed display of raw cut height value.

Changed display of cut height in METRIC/SI from 1DP to 2DP to display odd raw heights with accurate value.

Changed display of cut height in IMPERIAL to 1DP to display odd raw heights with accurate value.
 2017-01-22 21:02:19 +01:00
zaxcav e287b4ec3e Fix typo. 2017-01-22 20:57:17 +01:00
Broxzier ef5f4a5f5a Add spinners for better control of clip-height 
This commit also changes the step size to 1 (I did not notice anything
strange).
 2017-01-22 20:57:17 +01:00
Broxzier e87da61436 Fix screen invalidation on drag 
The window size did not match the sizes given to window_create, causing
the window to think it was actually smaller, and as a result not clearing
the screen properly. This commit adds the WW and WH macros and uses them.

This commit also has a few formatting changes.
 2017-01-22 20:57:17 +01:00
zaxcav f76628bff0 Recorrect errors identified by AppVeyor. 2017-01-22 20:57:17 +01:00
zaxcav d06d37e862 Revise previous error corrections 2017-01-22 20:57:17 +01:00
zaxcav c91871822b Correct more errors detected by AppVeyor 2017-01-22 20:57:17 +01:00
zaxcav c615368115 Correct errors identified by AppVeyor 2017-01-22 20:57:17 +01:00
zaxcav a30c9b3717 Minor code cleanups 2017-01-22 20:57:17 +01:00
zaxcav a008dcb186 Display clip height in METRIC/SI units with 1DP. 2017-01-22 20:57:17 +01:00
zaxcav c97f624965 Move view_clipping.c to under src/openrct2/windows 2017-01-22 20:50:39 +01:00
zaxcav c6da3fa862 Scrollbar for clipping height now works. 
Initialisatation of scrollbar with clip height is temporarily disabled.

Revised view menu entry bahaviour.

Other minor window tweaks.
 2017-01-22 20:45:21 +01:00
zaxcav fc8da2086f Fix view menu so view clipping entry shows 2017-01-22 20:45:21 +01:00
zaxcav e8d6cba5be Initial attempt at paintClip UI 
Compiles but untested.

NOT INTENDED FOR MERGING
 2017-01-22 20:45:21 +01:00
Ted John 8d959fa519 Merge pull request #5085 from IntelOrca/refactor/structs/various 
Create new OpenRCT2 news item struct
 2017-01-22 16:15:42 +00:00
Ted John fc66f42c31 Add config option to enable / disable light FX 2017-01-21 12:01:01 +00:00
Jonathan Haas 2fda0c8a1f Fix width of park rating bar in bottom toolbar 2017-01-17 23:11:12 +01:00
Ted John d57069c3d3 Name news flags 2017-01-17 17:23:03 +00:00
Ted John 94cb5818b7 Remove 256 text length constraint 2017-01-17 17:19:03 +00:00
Ted John 71f83cd7a7 Dissociate rct_news_item from RCT2 2017-01-17 12:51:02 +00:00
Michael Steenbeek 6016339773 Fix two usages of raw RIDE4 flag usages, rename one, add comment 
#5065
 2017-01-17 12:00:47 +00:00
Ted John 5efd23dbe5 Create new OpenRCT2 award struct 2017-01-16 18:00:04 +00:00
Broxzier 2235390ce2 Fix 5079 don't remove walls when building stalls and footpaths 2017-01-16 14:28:16 +01:00
Ted John 7edf1e8b7f Merge pull request #4936 from Broxzier/short 
Because of a comment on a diff in #4878 asking for clearer and more consistent type usage. What this PR changes:

No unsigned long long found
(signed) long long -> sint64
unsigned int -> uint32
(signed) int -> sint32
(signed) long -> sint32
unsigned short -> uint16
(signed) short -> sint16
unsigned char -> uint8
No signed chars found
plain char is implementation-defined, so I left those in.
 2017-01-14 23:41:47 +00:00
Ted John 8f57e514fe Name more ride entry flags 2017-01-14 17:36:47 +00:00
Ted John f4cea0e6c8 Name a couple of ride entry flags and format enum 2017-01-14 16:48:56 +00:00
Broxzier b80b71cf81 Fixed typos and warnings after rebase 2017-01-14 14:31:06 +01:00
Broxzier 60603ae10a Use types from common.h 2017-01-14 12:37:31 +01:00
Michał Janiszewski d88635307f Merge pull request #5062 from janisozaur/cmake-warnings 
More warnings for CMake
 2017-01-13 19:46:30 +01:00
Ted John aed5c0aa60 Name flag: RIDE_TYPE_FLAG_26 2017-01-13 13:20:16 +00:00
Ted John ae7048b2a7 Name flag: RIDE_TYPE_FLAG_30 2017-01-13 13:16:51 +00:00
Ted John cf0c489d40 Name flag: RIDE_TYPE_FLAG_13 2017-01-13 13:08:56 +00:00
Michał Janiszewski 33dcb1a506 Rename types to avoid shadowing 2017-01-13 10:57:00 +01:00
Ted John 7875fd1f3a Ensure object list pointer is updated after realloc 
Also update changelog for fix to #4944.
 2017-01-12 22:20:27 +00:00
Ted John 4090522901 Fix #4944: Game crashes upon selecting objects in scenario editor 
When the filter caused no results to be shown in the list, it would try to realloc for 0 bytes which returns NULL. The error shown in the console was a minor bug, the more serious issue was the the original memory was freed but the list pointer not updated. Instead just check for 0 items, dispose the list and return.
 2017-01-12 22:12:21 +00:00
Ted John 1bf7a0ffdb Fix Win32 warnings 2017-01-12 18:28:51 +00:00
Ted John 868bb54383 Fix remaining warnings 2017-01-12 18:20:22 +00:00
LRFLEW 47c532d020 Don't zoom to cursor for keyboard or toolbar inputs (#5028) 2017-01-11 17:43:11 -06:00
Marijn van der Werf b8bb3924a7 Fix cheat window colours (#5041) 2017-01-11 00:39:52 +01:00
wolfreak99 8932f61a67 Add cheats to set/add money by custom amounts 2017-01-10 23:43:42 +01:00
wolfreak99 bdc34b608d Make tile inspector selector draggable 2017-01-09 19:30:42 +00:00
duncanspumpkin ac5b0b0cf5 Rename sprite list vehicle to train to reflect true use 
This was found during the rct1 vehicle import branch. When importing it would load all vehicles into this list only to find that each car was treated as a seperate train.
 2017-01-07 16:59:46 +00:00
Ted John 4fbecc2f60 Replace magic numbers with constant SPRITE_INDEX_NULL 2017-01-05 12:49:42 +00:00
Ted John 25bc798ff8 Move contents of src into project sub directory 2017-01-04 17:44:12 +00:00