Commit Graph

1857 Commits

Author SHA1 Message Date
IntelOrca 966291eda2 fix #3186: stop auto opening shops causing problems (once and for all) 2016-03-27 19:34:35 +01:00
IntelOrca d690ee6423 fix #3183: opening ride with construction window open
Issue caused with boat hire rides as there is usually a ghost station present when the construction window is open. This causes vehicles to be created in the ghost station. Fixed by closing the construction window before the vehicles are created for the ride.
2016-03-27 14:18:20 +01:00
IntelOrca 74d96d86c0 fix #3158: close network status window doesn't abort 2016-03-22 23:27:49 +00:00
IntelOrca 304fd4b84e validate all the other ride operation settings 2016-03-22 21:59:16 +00:00
IntelOrca 16e8609da3 add constants for ride setting id 2016-03-22 21:32:37 +00:00
duncanspumpkin 8c7dfd3097 Revert #3147 and fix construction issue. Revert most of c7c1f86 and rework to prevent issues 2016-03-21 21:21:43 +00:00
IntelOrca 1daa657657 fix #3091: Korean words corrupted if over byte limit 2016-03-10 18:48:00 +00:00
IntelOrca d03c4de327 fix #3120: negative cash in finance window is not red 2016-03-09 23:31:49 +00:00
Ted John 09f0caf8c1 Merge pull request #3111 from janisozaur/ride-type
Be more careful when dealing with hacked rides. Fix #3109
2016-03-08 18:33:29 +00:00
Michał Janiszewski 02c5ece7b7 Be more careful when dealing with hacked rides. Fix #3109 2016-03-07 23:03:35 +01:00
IntelOrca b8edcd50e1 fix #3107: Number of sold items is reset after some time
Number of sold items was being overwritten by a memmove on the field before it.
Queue time changed to only be drawn for rides.
2016-03-07 21:34:26 +00:00
IntelOrca e7d88416f4 fix #2850: Theme window is glitchy 2016-03-07 19:15:49 +00:00
IntelOrca 45db398257 invalidate tile after modification in tile inspector 2016-03-05 23:39:49 +00:00
IntelOrca bb7765fedf fix #2935: Construction window doesn't close automatically in multiplayer 2016-03-05 13:11:06 +00:00
danidoedel 57b7934b83 Add ability to disable lightning effect, resolves #1299 2016-03-04 23:13:20 +01:00
IntelOrca 4c6c354093 fix unable to place entrance / exit as a client 2016-03-03 21:53:07 +00:00
IntelOrca 6ec5fc8cec fix #3075: default inspection Interval does not work when building track designs 2016-03-03 17:39:11 +00:00
IntelOrca c60e05fc99 add default ride inspection interval option, closes #1455 2016-03-02 19:27:54 +00:00
IntelOrca 646deebd3a re-order misc options 2016-03-02 19:00:33 +00:00
IntelOrca 669c15cbaf fix case mistake in refactor of server_list.c 2016-03-01 21:25:21 +00:00
IntelOrca d26ee19782 refactor server_list.c, use British English for names 2016-03-01 18:51:01 +00:00
IntelOrca dcf09c5d4b show total number of players online on server list 2016-03-01 18:45:30 +00:00
zsilencer e652177a31 fix player window auto_pos 2016-02-29 21:43:24 -07:00
zsilencer 66e406ab75 Fix #3048: Remove format codes in player names and chat 2016-02-29 21:33:46 -07:00
zsilencer f253acbea1 Fix #3056: Clip last action string 2016-02-29 21:12:00 -07:00
IntelOrca 781d84dfa4 fix warning 2016-02-29 22:54:01 +00:00
IntelOrca e57f27e1a1 improve group renaming 2016-02-29 22:34:37 +00:00
IntelOrca 4769e89b07 fix #3053: Long multiplayer group names overflow the dropdown 2016-02-29 22:34:36 +00:00
duncanspumpkin 957d5a9735 Fix #2324. Inventions list changes no longer break scenery window.
Issue was caused by the invention list flags being passed into the finish research function and interpreting always researched scenery sets as rides. This could also cause crashes if there were more scenery sets than rides researched.
2016-02-29 22:02:03 +00:00
IntelOrca a634aacfab show information about locked scenarios, closes #2660 2016-02-29 21:28:01 +00:00
duncanspumpkin e2073d22c4 Fix #3002. Fix ride construction on water breaking with shift.
Issue caused by a mistake during refactoring.
2016-02-29 20:53:22 +00:00
IntelOrca 1d99c233f6 fix #3008: construct ride that isn't placed yet causes side effects 2016-02-29 20:24:00 +00:00
Duncan 433caa2f84 Merge pull request #3036 from marijnvdwerf/finish-6CA2DF
Remove asserts and original call from sub_6CA2DF
2016-02-29 17:16:09 +00:00
Gymnasiast ddf3d7a03d Consistently use 'colour' rather than 'color' 2016-02-28 20:32:02 +01:00
Marijn van der Werf 3311e4f3e8 Remove asserts and original call from sub_6CA2DF 2016-02-28 09:04:41 +01:00
IntelOrca 22a194ffa6 clamp ride overview viewport zoom level to allowed range 2016-02-27 13:30:00 +00:00
IntelOrca d27c9c0ec4 fix #3026: can construct maze when its open 2016-02-27 13:14:26 +00:00
IntelOrca c7c1f862cc fix #2878: Shops and stalls doesn't open on the server with auto open
Use the set status game command instead of setting the status of the ride directly. In order to stop stack overflow, closing the ride construction window is now done in the update event for that window.
2016-02-27 01:20:21 +00:00
Michał Janiszewski 4a24aa6cf3 Don't crash if mapElement is null
This allows for loading parks such as "Cocopa Bay"
2016-02-26 23:05:01 +01:00
Michał Janiszewski aa8437cb9d Minor fixes 2016-02-26 20:49:01 +01:00
Michał Janiszewski 6b514d1e3a Fix possible issues highlighted at higher warn levels
Mostly possibly uninitialized values and signedness
2016-02-26 12:54:00 +01:00
Ted John ecb4dd2a09 Merge pull request #3007 from Overv/implement-2123
Hide the entrance/exit construction buttons if there is no station (resolves #2123)
2016-02-25 20:50:33 +00:00
Alexander Overvoorde f0c47ba292 Hide the entrance/exit construction buttons if there is no station (resolves #2123) 2016-02-25 21:30:46 +01:00
Ted John 6ec2e1724c Merge pull request #2943 from Overv/fix-ride-viewport-z
Fix overall view position using z coordinate of arbitrary element in same column (fixes #2636)
2016-02-25 18:44:59 +00:00
Duncan 5f2e158a55 Merge pull request #3004 from janisozaur/new-compilers
Fixes for upcoming GCC6 & Clang 3.8
2016-02-25 18:37:27 +00:00
Michał Janiszewski fc2bba3047 Fixes for upcoming GCC6 & Clang 3.8 2016-02-25 19:35:18 +01:00
Alexander Overvoorde 6311b5588d Fix ride overall views being recalculated constantly 2016-02-25 19:31:46 +01:00
Alexander Overvoorde 4a42b09bb3 Add new overall view logic 2016-02-25 19:31:46 +01:00
Alexander Overvoorde fe6d50f942 Fix overall view position using z coordinate of arbitrary element in same column (fixes #2636) 2016-02-25 19:28:43 +01:00
IntelOrca 6484326892 use built ago label for ride list instead of age 2016-02-25 17:59:32 +00:00
Jacob Wallraff 37de903831 Ride option additions 2016-02-25 17:43:29 +00:00
Ted John 74973a4a97 Merge pull request #2950 from janisozaur/ride-names
Rename ride_entry functions and provide better logging
2016-02-25 12:43:19 +00:00
Michał Janiszewski 14bff0c66f Rename rct_ride_type to rct_ride_entry 2016-02-25 13:33:19 +01:00
IntelOrca b0887f174b split sound and music mixing correctly, closes #1270 2016-02-24 22:42:50 +00:00
Michał Janiszewski d19fe0e334 Make sure null ride type gets handled properly 2016-02-24 23:16:25 +01:00
Michał Janiszewski eb645cd4f3 Rename ride_entry functions and provide better logging
For hacked rides, provide the name of offender in the log.
2016-02-24 22:23:33 +01:00
duncanspumpkin 53df541a39 Relabelled sprite_flags to flags. Relabelled peep/fountain flags 2016-02-23 17:22:19 +00:00
duncanspumpkin 5340af4a12 Refactor sprite_flags 2016-02-23 17:09:53 +00:00
Duncan baffb37b34 Merge pull request #2967 from marijnvdwerf/decompile-6CA2DF
Decompile sub_6CA2DF
2016-02-22 17:27:26 +00:00
Marijn van der Werf a744f84292 Clean up property calculation 2016-02-20 21:55:12 +01:00
Marijn van der Werf 88d0f8c60b Clean up track retrieval 2016-02-20 17:54:26 +01:00
IntelOrca 3583d601ad name flag: RIDE_TYPE_FLAG_15 2016-02-20 16:37:09 +00:00
IntelOrca bd040918a1 use helper functions instead of direct access to 0x00982164 2016-02-20 16:30:08 +00:00
IntelOrca caf8b45dc3 remove usages of 0x00F441D2 2016-02-20 15:52:38 +00:00
IntelOrca edbca479e3 remove old usages of 0x00993CCC and 0x00F441D3 2016-02-20 15:50:05 +00:00
Marijn van der Werf 9b8b90964e Use TRACK_SLOPE_NONE for comparing with bl 2016-02-19 17:19:34 +01:00
Marijn van der Werf a157a7945c Fix structure of diagonal curves 2016-02-19 16:30:56 +01:00
Marijn van der Werf 7b2c3f5b88 Refactor known input/output combinations to use table 2016-02-19 13:31:00 +01:00
Marijn van der Werf a5ee1ddb56 More fixes 2016-02-19 01:29:30 +01:00
Marijn van der Werf 0b792cb927 Fix conditional 2016-02-19 00:16:03 +01:00
Marijn van der Werf 2b879cd586 [temp] log tracktype conditions 2016-02-18 22:01:54 +01:00
Marijn van der Werf e20f487629 Fix mistakes 2016-02-18 21:44:09 +01:00
Marijn van der Werf 1f2afd6bac Process feedback 2016-02-18 14:24:09 +01:00
Marijn van der Werf b88ac9f26e Apply suggested fixes 2016-02-18 13:55:56 +01:00
Marijn van der Werf 76f0ca9afb Clean logic 2016-02-18 13:31:42 +01:00
Marijn van der Werf 235cc69b88 Decompile function 2016-02-18 13:02:59 +01:00
Martin Černáč aff8cec48c Refactor freeze climate cheat 2016-02-17 17:39:33 +01:00
Ted John 9c5196e9dc Merge pull request #2952 from octaroot/cheat_neverending_marketing
Add "neverending marketing" cheat
2016-02-17 12:28:37 +00:00
Martin Černáč fdfb4f7bd3 Add "neverending marketing" cheat
This cheat allows the player to have never-ending marketing campaigns
2016-02-17 09:35:56 +01:00
IntelOrca c31941c6dc fix #2958: import sc4, sv4 into editor using load landscape dialog 2016-02-16 18:15:26 +00:00
Ted John d42f8c5499 Merge pull request #2946 from Gymnasiast/debugging-tools-dropdown
Leave the debugging tools dropdown open after click, closes #2768
2016-02-15 13:45:53 +00:00
Gymnasiast 6cdab73cdf Don't say there are track designs available in multiplayer 2016-02-15 11:20:07 +01:00
Gymnasiast 32ff10ec4d Leave the debugging tools dropdown open after click, closes #2768 2016-02-15 10:00:14 +01:00
Michał Janiszewski 2ebb691e71 minor fixes
* initialize variables properly
* fixes to handling of zenity/kdialog on Linux
* remove unnecessary call
2016-02-14 21:06:44 +01:00
duncanspumpkin 667d38754f Start implementing handyman pathfinding 2016-02-13 14:13:33 +00:00
Ted John 703e9c3153 Merge pull request #2839 from anyc/develop
Linux: use zenity or kdialog to show user dialogs
2016-02-13 12:15:41 +00:00
Chad Anderson 4658e80deb allow starting server with new scenario 2016-02-13 11:42:51 +00:00
IntelOrca 934bf28cc1 change scenario select to callback mechanism 2016-02-13 11:32:34 +00:00
Ted John 6d384fa2e5 Merge pull request #2911 from Overv/show-peeps-in-closed-ride
Show amount of peeps still on ride in tooltip when ride is closed (resolves #2708)
2016-02-13 11:19:40 +00:00
Alexander Overvoorde d07b7159c8 Add amount of customers currently on ride to customers tab 2016-02-13 04:23:59 +01:00
IntelOrca 08dc095028 add viewport to player window, closes #2817 2016-02-11 00:09:10 +00:00
Ted John 113631f7d2 Merge pull request #2883 from danidoedel/fix
Fix two ride construction bugs
2016-02-10 18:49:46 +00:00
Alexander Overvoorde 06304799b6 Fix staff lacking tile rectangle when picked up (fixes #2877) 2016-02-09 22:06:49 +01:00
duncanspumpkin 2077c51e0b Fix #2902. Banner flags now correctly passed when re-colouring 2016-02-09 17:18:25 +00:00
Jacob Wallraff dbdf76649e Moving total admissions from park finance tab to stats tab 2016-02-05 19:32:07 -08:00
danidoedel 217047c1a6 Fix #2881 Disable banking for steep to flat track 2016-02-04 21:07:45 +01:00
danidoedel 55aa203aa7 Fix #2882 Helix up didn't work properly 2016-02-04 15:02:40 +01:00
IntelOrca c99ec93295 add theme entries for new windows 2016-02-03 18:23:47 +00:00
IntelOrca 7e1ce4fcc6 reinstate theme editor and fix bugs 2016-02-03 18:23:45 +00:00
IntelOrca caf9bd9939 get game working with new theme manager
Theme editor currently unavailable.
2016-02-03 18:23:44 +00:00
zsilencer b2083deed0 implement cheats over multiplayer 2016-02-02 14:08:59 -07:00
Ted John 21faeaeba1 Merge pull request #2867 from flk92/fix-scenario-dialog-text-overflow
Fix scenario path overflowing dialog on RCT1 font
2016-02-02 14:25:21 +00:00
Fabio K 976e0a53e0 Fix #2855: scenario path overflowing dialog on RCT1 font
Changes the global variable defining the current font in use before
calculating whether the path should be shortened.

Fixes OpenRCT2/OpenRCT2#2855
2016-02-02 11:36:25 -02:00
Michał Janiszewski f352fb7d47 Better options window design for scaling 2016-02-01 21:23:20 +01:00
Michał Janiszewski b3ed293bb3 Add another page to options
All 32 available widgets on "Display" page were taken, this adds another
page, "Rendering", to the options window, so it can hold remaining widgets.
2016-02-01 21:19:28 +01:00
Michał Janiszewski 80ad302087 Allow user to use NN scaling at integer scales
While linear/anisotropic filtering introduces in previous commit looks
good at non-integer scales, using it at integer scales may make screen
look unnecessarily blurry. This commit introduces an option to use NN
scaling at integer values of scale.
2016-02-01 21:19:26 +01:00
Michał Janiszewski 18ec2238a2 Allow runtime selection of render quality hint
This change allows to pass render quality hint to SDL in runtime. While
using hardware display, SDL can hint the renderer to use linear or
anisotropic filtering, which can deliver a better experience when using
non-integer scale value.
2016-02-01 21:18:15 +01:00
Martin Černáč 85b6effd0f Refactor the weather cheat UI
I removed the two buttons that were used previously to change the park's weather with a proper dropdown, which allows the player to select any of the available weather, not being limited to just two options. This change is (currently) listed on the project's wiki page 'Features to implement'.
2016-02-01 18:46:19 +01:00
Martin Černáč 52a42126f3 Fix a gap in the financial cheat UI 2016-02-01 18:46:08 +01:00
Michał Janiszewski e814cdd271 Decouple network version from OpenRCT2 version
This allows to present a different version of network stream than just
OpenRCT2 version, as we can possibly have breaking changes to network in
one release cycle.

This commit also adds easy way of identification which hosts are running
which versions, by showing a tooltip when hovering mouse cursor over the
network compatibility icon. Client's own version is displayed as well.
2016-01-30 22:44:43 +01:00
anyc ffafd07c90 use enum to specify file dialog type 2016-01-29 19:03:09 +01:00
Michał Janiszewski ec2387082c Remove cheats from config 2016-01-25 21:44:13 +01:00
Michał Janiszewski dd37ca05c3 Disable opening cheats window in MP
When connecting to a server, also reset cheats.

This should fix #2811
2016-01-25 21:44:09 +01:00
Chad Anderson bc92446d32 New Game Option
I added a menu option to bring up the Scenario Selector from within
game, so that you can easily choose a new level without needing to load
the Title Screen.
2016-01-25 13:15:26 -07:00
duncanspumpkin ba314c6fc8 Fix dropdown default highlight regression 2016-01-25 17:11:56 +00:00
Ted John 0e96c259b9 Merge pull request #2807 from LRFLEW/disabled
Improved Rendering of Disabled Scenario Names
2016-01-25 13:13:37 +00:00
zsilencer d315e9e075 fix bug caused by using id as index 2016-01-24 21:02:15 -07:00
zsilencer 32f1aa064d more accurate last player action location 2016-01-24 21:00:31 -07:00
LRFLEW a842e3a650 Improved Rendering of Disabled Scenario Names 2016-01-24 17:06:05 -07:00
Ted John 80550ca365 Merge pull request #2752 from Broxzier/fix_money_invalidation
Fix #2750 invalidate top toolbar when toggling the use of money.
2016-01-24 16:10:50 +00:00
Aaron van Geffen 2d90bc8354 Allow assigning a shortcut to the options window. 2016-01-25 00:45:24 +09:00
Ted John 6eaa93c9bc Merge pull request #2783 from zsilencer/multiplayer
MP groups and permissions
2016-01-24 12:29:27 +00:00
zsilencer 8c608b6f6c fix issues with a few game commands 2016-01-23 17:33:08 -07:00
zsilencer 85d77bb838 show last action in player window 2016-01-23 16:46:52 -07:00
zsilencer 845c7ad067 disallow peep pickup if group does not have permission 2016-01-23 16:36:16 -07:00
zsilencer db90477cae add locate player's most recent action button 2016-01-23 14:16:26 -07:00
zsilencer de1fa24e7b add last player action to player list 2016-01-23 12:32:02 -07:00
Aaron van Geffen 18a8ef0924 Repopulate ride list when invalidating the ride construction window.
When toggling the 'select by track type' option with the ride construction window open,
the ride list would not be repopulated until the player switched tabs. This commit
adds repopulation on window invalidation, too.
2016-01-23 23:43:13 +09:00
Michał Janiszewski 6d6f9f3c23 Refactor rides to be only accessible with getters
This changes how rides are accessed from macros to getter functions.
2016-01-23 01:13:36 +01:00
zsilencer 62c1780d65 fix couple other issues mentioned in pull request 2016-01-22 17:08:06 -07:00
zsilencer 1277c1a0d2 MP permissions update 2 2016-01-22 11:12:35 -07:00
zsilencer 7a249c6457 Add ability to toggle individual action permissions 2016-01-21 20:32:51 -07:00
zsilencer 6e3068cd0a MP groups and permissions 2016-01-20 21:42:31 -07:00
zsilencer 30d57916c2 fix dropdown menu position in scrolled list 2016-01-19 13:11:16 -07:00
zsilencer 7b280adf8d Fix #2760: Server join click 2016-01-19 12:46:55 -07:00
IntelOrca 162710d86a remove strange random game command call from loadsave 2016-01-19 18:04:15 +00:00
Hielke Morsink 0b445ab1a5 Fix #2747 map sprite issue. 2016-01-19 00:05:14 +01:00
Michał Janiszewski 3bf1e0e06d Rename `safe_strncpy` to `safe_strcpy` 2016-01-18 20:49:52 +01:00
IntelOrca 1ffee2435a fix #2363: show default item highlight, refactor 2016-01-17 23:37:14 +00:00
Hielke Morsink 4e5b8295c8 fix #2750 invalidate top toolbar when toggling the use of money. 2016-01-17 14:53:59 +01:00
IntelOrca 7c8245a63f fix #2749: inverse logic for removing colour tab on rides 2016-01-17 12:27:43 +00:00
Hielke Morsink 711afebf50 Hiding debug button while playing over a network. 2016-01-16 17:24:44 +01:00
Ted John e69e384d43 Merge pull request #2692 from marijnvdwerf/use-named-addresses
Replace known addresses with constants, globals and wrapper functions
2016-01-15 22:59:13 +00:00
IntelOrca 666bb03cc3 fix #2734: forgot to correct signature arguments for clip_drawpixelinfo 2016-01-15 20:20:29 +00:00
Marijn van der Werf 94e47be3e3 Use `ride_type_has_flag` for checking ride type flags 2016-01-15 21:02:39 +01:00
Marijn van der Werf 6568798af7 Use globals instead of addresses where applicable 2016-01-15 21:01:49 +01:00
Marijn van der Werf 98b5ad1bf4 Replace known addresses with constants 2016-01-15 21:01:34 +01:00
duncanspumpkin 10f85322ae Fix incorrect rct2 address comments 2016-01-15 19:17:00 +00:00
IntelOrca 730463dbbb remove rct2_malloc, rct2_realloc and rct2_free 2016-01-14 20:18:55 +00:00
IntelOrca b7484db239 refactor clip_drawpixelinfo to not allocate memory 2016-01-14 20:12:44 +00:00
IntelOrca cdee534eb1 use SDL2's platform defines to normalise platform guards 2016-01-14 20:12:43 +00:00
duncanspumpkin f2b70b74aa Fix incorrect common format offset causing issues when changing colour scheme 2016-01-14 17:47:06 +00:00
Duncan e2e749d644 Merge pull request #2697 from marijnvdwerf/get-ride-entry
Minimise direct usage of `RCT2_ADDRESS_RIDE_ENTRIES`
2016-01-11 23:09:43 +00:00
Ted John c6ab870404 Merge pull request #2698 from janisozaur/audio-device
Skip "Default sound device" on Linux
2016-01-11 14:09:44 +00:00
Michał Janiszewski ac8aec63bc Skip "Default sound device" on Linux
Sound on Linux is handled by PulseAudio, which creates a sink and offers
a central place to control which sources are distributed how and where.

Applications in general are expected to only offer volume controls.

Tested with 0 A.D., SuperTuxKart and a few media players, none of which
offers selecting sink directly.

As per https://en.wikipedia.org/wiki/PulseAudio#Adoption it should
covert vast majority of uses.
2016-01-11 13:59:41 +01:00
Marijn van der Werf ddab3a1b74 Use `GET_RIDE_ENTRY` macro to get ride entry 2016-01-11 13:34:08 +01:00
Marijn van der Werf 6eadf824ea Replace raw addresses of `RIDE_ENTRIES` 2016-01-11 13:34:08 +01:00
Marijn van der Werf 64646a501a Add missing brackets 2016-01-11 13:00:40 +01:00
Marijn van der Werf e961cc885a Use RCT2_ADDRESS_COMMON_FORMAT_ARGS instead of raw address 2016-01-11 12:55:33 +01:00
duncanspumpkin 2bd6dac20f Merge branch 'develop' into vehicle-update
Conflicts:
 openrct2.vcxproj
2016-01-10 08:57:41 +00:00
Hielke Morsink 39ae12eeb1 Using window width and height to define locations 2016-01-09 19:27:04 +01:00
Hielke Morsink e4d3c546ad Moving staff costs along with the hire button 2016-01-09 19:26:13 +01:00
Hielke Morsink 19ddbaa84f Buttons on the right move when scaling the window. 2016-01-09 19:26:12 +01:00
Hielke Morsink f9dc3f3454 replace FOR_ALL_PEEPS with FOR_ALL_STAFF 2016-01-09 19:26:11 +01:00
duncanspumpkin 268e2d34ce Merge branch 'develop' into vehicle-update
Conflicts:
 object.c
2016-01-09 16:51:23 +00:00
IntelOrca f84c659010 fix #2670: title was not being loaded when a scenario failed to load 2016-01-09 15:11:12 +00:00
IntelOrca 3073bc64fd remove rct2_endupdate 2016-01-09 00:25:30 +00:00
IntelOrca 43a5cc92cc define STR_NONE as a rct_string_id 2016-01-07 22:14:53 +00:00
IntelOrca 48ad1314a9 refactor object_desc 2016-01-07 19:12:59 +00:00
IntelOrca 40a4bd1fa8 remove old object_paint calls, replace with new 2016-01-07 19:01:19 +00:00
IntelOrca ab38828e03 integrate object list variables:
- gInstalledObjectsCount
- gInstalledObjects
- gNumInstalledRCT2Objects
- gNumInstalledCustomObjects
- gLastLoadedObjectChunkData
2016-01-06 20:41:21 +00:00
IntelOrca 29397ebcc5 fix #2658: fix dragging on land and water tools 2016-01-06 18:31:25 +00:00
IntelOrca f4f07ae5bb integrate variable: gInputPlaceObjectModifier 2016-01-05 22:33:47 +00:00
IntelOrca 94ae72f228 integrate variable: gHoverWidget 2016-01-05 22:05:00 +00:00
IntelOrca 586e5ef9cd integrate variable: gPressedWidget 2016-01-05 21:46:38 +00:00
IntelOrca ee9c695902 fix #2651: remove ride when multiplayer client aborts ride construction
also fix ride construction window closing immediately after placing first track piece of a ride for clients
2016-01-05 20:37:21 +00:00
Ted John f4a25bd55e Merge pull request #2641 from Broxzier/fix_saving
Prevent extension from showing when "saving as"
2016-01-05 10:14:20 +00:00
Michał Janiszewski 133096cd64 Merge branch 'develop' into vehicle-update 2016-01-05 09:59:53 +01:00
IntelOrca 88c391120a integrate tooltip variables 2016-01-05 00:02:23 +00:00
Hielke Morsink 3641634aad Prevent extension from showing when saving a park for the first time. 2016-01-05 00:23:51 +01:00
IntelOrca 0c933234e0 remove all tutorial code 2016-01-04 23:21:23 +00:00
IntelOrca f0adf90660 integrate variable: gInputFlags 2016-01-04 22:53:03 +00:00
IntelOrca b5069d3809 integrate variable: gInputState 2016-01-04 22:45:51 +00:00
IntelOrca b94cd7499d add config for hide mega park and set locking as default 2016-01-03 21:06:10 +00:00
IntelOrca 9b833e5f93 shorten path for scenario select debug 2016-01-02 23:14:41 +00:00
IntelOrca 9eacd3532b use correct window variable for highlighted scenario 2016-01-02 21:13:24 +00:00
IntelOrca ededc82cba add DLC and Build your own scenario classification 2016-01-02 21:06:46 +00:00
IntelOrca d147f516db fix default selected tab on scenario select 2016-01-02 21:05:57 +00:00
IntelOrca aeda8d68f9 add logic for unlocking mega park and making it invisible 2016-01-02 21:05:37 +00:00
IntelOrca 82b05950ff add RCT1 title sequence 2016-01-02 21:05:33 +00:00
IntelOrca f2c5ce32f2 improve options window for scenario options 2016-01-02 21:05:33 +00:00
IntelOrca 950722292c use user path for default scenario save location 2016-01-02 21:05:31 +00:00
IntelOrca 95ee0be3c5 handle scenario conflicts 2016-01-02 21:05:08 +00:00
IntelOrca af67cf5703 refactor scenario sources and improve scenario select window 2016-01-02 21:04:44 +00:00
IntelOrca 72e820dead add horizontal rule headings to scenario list 2016-01-02 21:04:44 +00:00
IntelOrca 6a768c4a3c redo entire scenario highscore load / saving
- load and save highscores to new file format (highscores.dat)
- scan scenarios from RCT2 data and user data
- load highscores from legacy file (scores.dat)
- fix various issues with new scenario select window
2016-01-02 21:04:10 +00:00
IntelOrca 63529a5213 fix option widgets for scenario grouping 2016-01-02 21:03:39 +00:00
Aaron van Geffen f7d33f3cab Rename constants et al per code reviewer's request. 2016-01-02 21:03:38 +00:00
Aaron van Geffen f49e3eea1c WIP: misery: adding scenario options to options screen. 2016-01-02 21:01:53 +00:00
Aaron van Geffen 15782b88c4 Experimental: optional unlocking of scenarios ("campaign mode") in scenario select screen. 2016-01-02 21:01:53 +00:00
Aaron van Geffen 3bb1588cfa Shrink window when showing scenarios by difficulty level. 2016-01-02 21:00:07 +00:00
Aaron van Geffen eb87c5284f Adapt scenario select screen based on scenario source game. 2016-01-02 21:00:06 +00:00
Aaron van Geffen 3bad0870fb Added routines to find scenario index and source from predefined listings. 2016-01-02 21:00:05 +00:00
Aaron van Geffen cf935d45c6 Add configuration bits for scenario select mode and unlocking.
Note this lacks an interface in the options window as of yet.
2016-01-02 21:00:05 +00:00
Aaron van Geffen 3999ebd031 WIP: adding new tabs to scenario select window; extended window size. 2016-01-02 21:00:03 +00:00
Hielke Morsink bc2ac2e28b Split extension setter into two functions 2016-01-02 20:45:00 +01:00
Hielke Morsink f31a5f2248 More secure checks for removing and setting file extensions. 2016-01-02 18:57:11 +01:00
Hielke Morsink eadb03426e fix #2620 and preventing names with dots from breaking. 2016-01-02 14:59:16 +01:00
Duncan 5b9a98a0f9 Merge pull request #2588 from HaasJona/refactor2
Refactor peep code
2016-01-01 22:22:18 +00:00
Hielke Morsink 560a435748 Drawing checkmarks for set flags 2016-01-01 21:29:10 +01:00
Hielke Morsink 829c3a3339 Added correct tooltips for moving up/down buttons. 2016-01-01 21:29:09 +01:00
Hielke Morsink bf7e45939a Pixel correct paddings for list and column headers 2016-01-01 21:29:08 +01:00
Hielke Morsink ae4ff5fc6c Redesigned UI to be more consistent with the ride/staff windows. 2016-01-01 21:29:07 +01:00
Hielke Morsink a1f506df58 Fix all buttons after deleting a map element. 2016-01-01 21:29:06 +01:00
Hielke Morsink 2b7a88297f Moved some UI elements and changed default size. Updated changelog. 2016-01-01 21:29:05 +01:00
Hielke Morsink 05e807a9ca Displayng ride type for tracks 2016-01-01 21:29:04 +01:00
Hielke Morsink 389249abfd Better UI spacing. 2016-01-01 21:29:03 +01:00
Hielke Morsink 6f824c9c2e Resolved warnings. 2016-01-01 21:29:02 +01:00
Hielke Morsink 38867b7462 Fixed old typo in string ID name. 2016-01-01 21:29:00 +01:00
Hielke Morsink 64312957a0 Added column headers instead of labels, and added columns for the flags. 2016-01-01 21:28:59 +01:00
Hielke Morsink db270d85c2 automatically en/disabling buttons when needed. Selecting corrupt element when added. 2016-01-01 21:28:58 +01:00
Hielke Morsink 2a3aefdb4e fixed list issue after removing element. 2016-01-01 21:28:57 +01:00
Hielke Morsink d226012d94 Function to remove elements using the tile inspector. 2016-01-01 21:28:56 +01:00
Hielke Morsink d68ed36147 Recreated UI for tile inspector. Added swap functionality. 2016-01-01 21:28:55 +01:00
Hielke Morsink 35bf18bcb6 Added empty button that swaps the top two map elements 2016-01-01 21:28:54 +01:00
Hielke Morsink f04c97fbc1 Getting path scenery type and index using helper functions throughout the entire project. 2016-01-01 21:28:53 +01:00
Hielke Morsink b82504c5e4 Better consistensy with already existing helper functions 2016-01-01 21:28:51 +01:00
Hielke Morsink 370c08f796 Added comments to path info 2016-01-01 21:28:50 +01:00
Hielke Morsink 955bf7b26f Displaying more path info for queue. Added some helper functions. 2016-01-01 21:28:49 +01:00
Hielke Morsink 855e122b55 Printing path and addition names in tile inspector. 2016-01-01 21:28:48 +01:00
Jonathan Haas 4d26e4c4a1 Refactor peep code
Name various fields and constants related to peeps. This includes:
  - Flags for flashing peeps in map window
  - Animation frames for picked up peeps
  - Function checking if peep should start to fall
  - Special sprite handling for slide boards and lawn mowers
  - Created array for peep sprite entries, renamed some variables and constants
2015-12-31 13:57:06 +01:00
Michał Janiszewski 8a5d066efe Fix strict aliasing violations
Compiler only guarantees proper accesses to variables when using
variable's native type or `char` (i.e. single byte type) [1].

This commit fixes violations of this rule. In most cases changing code
to a simple cast was enough, some required a bit deeper modifications.

This fixes #2596.

[1] http://blog.qt.io/blog/2011/06/10/type-punning-and-strict-aliasing/
2015-12-31 13:27:26 +01:00
Michał Janiszewski 5f66cd48f8 Merge branch 'develop' into vehicle-update
Conflicts:
	openrct2.vcxproj.filters
2015-12-31 11:41:23 +01:00
IntelOrca 64b589770a remove obsolete callprocs 2015-12-29 11:57:47 +00:00
IntelOrca c6b023df86 fix warnings 2015-12-29 11:39:06 +00:00
Ted John 69f0e9d55d Merge pull request #2398 from Broxzier/comments_and_optimizations
Refactored some util functions and some minor tweaks for saving tracks
2015-12-29 11:31:58 +00:00
Michał Janiszewski bcfdbbd25b Minor fixes for mapgen 2015-12-29 12:03:38 +01:00
IntelOrca 292ce3b103 don't show IP address when hovering over servers for basic security 2015-12-29 01:01:26 +00:00
IntelOrca 43b31c25a1 use sprite constants for tab animations 2015-12-28 19:44:43 +00:00
IntelOrca 08d47e26a7 improve player list
- animate tab
- show number of players
2015-12-28 19:44:43 +00:00
IntelOrca 1a5c5a5017 fix #2577: interest rate can be set to -1 and no protection from erroneous values 2015-12-28 18:43:11 +00:00
LRFLEW 50a1f588ec Disable chain button on steep slopes that cannot have one 2015-12-27 17:31:43 -06:00
Duncan 1c41b513b4 Merge pull request #2561 from HaasJona/refactor
Refactor Ride Customer History
2015-12-27 17:52:52 +00:00
Michał Janiszewski 4c6ee9570c Merge branch 'develop' into vehicle-update
Conflicts:
	openrct2.vcxproj.filters
2015-12-27 18:11:13 +01:00
Ted John ce0442f4a2 Merge pull request #2559 from janisozaur/map-assert
Add mapElementType entry for corrupt element
2015-12-27 15:47:21 +00:00
Michał Janiszewski e3f5ea25ae Map unknown elem type to corrupt, update tile inspector
In map view, all unknown types are mapped to MAP_ELEMENT_TYPE_CORRUPT,
the type that prevents rendering of all following elements on given
tile.

Tile inspector now displays element type (numeric value) for unknown
types.
2015-12-27 10:34:02 +01:00
Gymnasiast f87bdb0eda Sort load/save window on open, fixes #2477 2015-12-27 10:28:10 +01:00
Jonathan Haas b71c649d45 Refactor ride customer count
Renamed some confusing ride fields, extracted function to get recent ride customer count.
2015-12-26 22:03:33 +01:00
IntelOrca 574774b2af add notification conditions 2015-12-26 17:33:33 +00:00
IntelOrca cd99b87de6 add UI for notification settings 2015-12-26 17:30:13 +00:00
IntelOrca 6240f063f1 fix a couple of sprite ID definitions 2015-12-26 17:19:25 +00:00
IntelOrca 4eb8192549 replace tutorial button with new multiplayer button
tutorial button and multiplayer button can be enabled / disabled easily, window auto resizes etc.
2015-12-26 17:09:37 +00:00
Michał Janiszewski 53970c2d77 Add tile type for corrupt element
Fixes #2558
2015-12-26 13:36:32 +01:00
Michał Janiszewski 79e5bb758d Add an assert for getting proper mapElementType 2015-12-26 13:16:03 +01:00
Aaron van Geffen 3d99b73ae1 Name enabled widgets on scenario select screen. 2015-12-26 18:46:19 +09:00
Aaron van Geffen 020334fa18 Name rct_window's var_494: highlighted_item. 2015-12-26 18:46:19 +09:00
Aaron van Geffen 9232a9906f Inventarised instances of RCT2_ADDRESS_COMMON_FORMAT_ARGS 2015-12-26 18:24:36 +09:00
Ian Spence 434b62436c Addresses code review comments 2015-12-24 08:44:12 -08:00
Ian Spence ba038c10ab Automatically open shops & stalls
- Added a new option under misc to automatically open shops and stalls
 - Option is disabled by default
 - When enabled, shops & stalls are automatically opened right after being placed on the map
2015-12-24 00:00:41 -08:00
IntelOrca ce0f7ab426 fix #2536: Client crashes when building new Rides 2015-12-24 01:35:14 +00:00
Michał Janiszewski cd2ec16290 Merge branch 'develop' into vehicle-update
Conflicts:
	openrct2.vcxproj.filters
	projects/openrct2.vcxproj
2015-12-23 19:47:16 +01:00
Aaron van Geffen 2c5651614c Corrected misspellings of "substitute". 2015-12-23 00:40:36 +09:00
Michał Janiszewski e666a24c82 Merge branch 'develop' into vehicle-update
Conflicts:
	projects/openrct2.vcxproj.filters
	src/audio/mixer.cpp
	src/windows/ride.c
2015-12-22 14:57:40 +01:00
IntelOrca db18fa8f14 finally fix #1619: Can't place any path
RCT2_ADDRESS_TOOL_WIDGETINDEX was being read as an int32 sometimes
2015-12-21 22:28:34 +00:00
Ted John 569fd7771c Merge pull request #2532 from LRFLEW/newline
Added newlines at end of files
2015-12-21 21:36:05 +00:00
Michał Janiszewski 5d227d8fc8 Safe handling of malformed server entries
Refuse to add a nameless server or one without version specified, but
allow description missing.
2015-12-21 22:14:24 +01:00
LRFLEW e6f771ec90 Added newlines at end of files 2015-12-20 22:03:37 -06:00
Gymnasiast dd460300ca Extend fast lift hill cheat and update description 2015-12-20 21:12:24 +01:00
IntelOrca 785d54aa04 fix #2502: Update current pressed footpath direction when camera rotates 2015-12-19 22:54:15 +00:00
IntelOrca 4f5f0820d5 fix track manage delete prompt window position 2015-12-19 12:17:42 +00:00
IntelOrca 22b4df1a99 implement SI units for distance / speed measurement, closes #2496 2015-12-18 21:12:30 +00:00
Linus Unnebäck e1938bb17a trap-mouse: cleanup 2015-12-18 09:13:26 +01:00
Rune Laenen 1a4ebcc0f7 Add option to trap mouse cursor 2015-12-18 09:13:26 +01:00
LRFLEW d769a13206 Fixed extern and enum name usage 2015-12-16 14:48:27 -06:00
IntelOrca 12fdf1f5e7 name vehicle entry flags 2015-12-16 19:12:58 +00:00
duncanspumpkin c00669c942 Merge sub_6DAB4C into vehicle-update 2015-12-14 21:56:00 +00:00
Michał Janiszewski a5b465fad1 Fix some compiler warnings 2015-12-14 22:52:27 +01:00
Kyle Kirby caf07c2064 Clean up the comments a litte
• Make comment heads be /**
• Make rct2 addresses be double spaced indented
• Make there be a space afte rct2: and the address
• Make single-line rct2 addresses be full block comments
• Move description of method to top of comment
2015-12-11 16:19:46 -06:00
IntelOrca ca01e55fa8 add show fps, #2223 2015-12-09 21:42:46 +00:00
Linus Unnebäck 16e5ace672 use RCT2_ADDRESS_TRACK_LIST 2015-12-06 18:49:35 +01:00
Linus Unnebäck bd82b7a297 use RCT2_ADDRESS in track_manage.c 2015-12-06 18:22:33 +01:00
Ted John ebcde1b231 Merge pull request #2418 from janisozaur/fixes
fix remaining suspicious left shifts
2015-12-05 14:20:29 +00:00
Ted John 8e3bfb7a58 Merge pull request #2409 from Gymnasiast/track-designs-manager-close
Add close button to track designs manager, closes #1807
2015-12-05 13:31:31 +00:00
duncanspumpkin 53fa41f2b1 Implement ride lift data 2015-12-05 10:49:12 +00:00
Duncan Frost 79fb099c21 Added more of update measurements 2015-12-05 10:48:53 +00:00
Duncan Frost 5e198dfa1f Add known ride offsets 2015-12-05 10:48:52 +00:00
duncanspumpkin 11398cf60f Fix warning. 2015-12-04 16:57:43 +00:00
IntelOrca 9426170918 fix #2425: ride campaign list corrupted if over 40 rides 2015-12-02 17:50:32 +00:00
Michał Janiszewski 796021cfdc fix suspicious left shifts
See b5b1957f5
2015-12-02 08:32:15 +01:00
Hielke Morsink 90e67772e0 Resolved warnings, and removed duplicated function. 2015-12-01 12:03:34 +01:00
Gymnasiast 3f6990dac9 Add close button to track designs manager, closes #1807 2015-11-30 22:53:28 +01:00
Hielke Morsink 666da74beb Changed missleading variable name from 'filename' to 'path'. 2015-11-29 19:59:15 +01:00
Hielke Morsink 5b1d93805d More consistent use between name and paths. Improved path_get_* functions. 2015-11-29 19:41:06 +01:00
duncanspumpkin b9f7f6f4a2 Fix #2395. Fix pressing construct twice 2015-11-29 17:18:42 +00:00
duncanspumpkin 4527aa263e Added check to match mechanic fix 2015-11-29 17:18:41 +00:00
duncanspumpkin cae7b03bdf Fix #1717. Fixes fix ride from failing to fix safety cut out.
As the code to fix rides has not been completed yet it was unknown that safety cutout had so many flags requiring reseting
2015-11-29 17:18:40 +00:00
duncanspumpkin b1c8275ec0 Disable tracks for networked games until fixed 2015-11-29 17:18:40 +00:00
IntelOrca c6056cbb6c Merge branch 'pre-release-0.0.3' into develop
Conflicts:
	src/audio/audio.c
2015-11-27 22:05:40 +00:00
IntelOrca 674ff839bb add icons to server list for password and version 2015-11-27 18:54:59 +00:00
IntelOrca 46924bc9eb support unicode currencies with ascii fallback 2015-11-25 22:31:00 +00:00
duncanspumpkin 5bd3b8d6af Implement util_rand due to rand having a poor range on some platforms 2015-11-20 21:40:36 +00:00
IntelOrca 67b6aa7513 fix #2330: Clear button in Object Selector doesn't refresh item list 2015-11-18 23:19:25 +00:00
duncanspumpkin 6c8c5a157f Fix #2335. Increase land window size to show price correctly. 2015-11-18 17:48:14 +00:00
Duncan e36ed5e732 Merge pull request #2325 from BodrickLight/refactor
Refactor audio.c and audio.h
2015-11-18 17:33:21 +00:00
Dom Light bb62b7561a Replace some uses of play_sound_panned with play_sound_at_location 2015-11-18 00:03:15 +00:00
Dom Light e9b7e41635 Refactor audio_sound_play_planned 2015-11-17 23:05:24 +00:00
Hielke Morsink 68b0068a22 Resolved warnings 2015-11-17 19:40:48 +01:00
Hielke Morsink 504f551eec Avoiding the use of strlen 2015-11-17 19:40:47 +01:00
Hielke Morsink 063a568a72 Searching through rides now also checks their type. 2015-11-17 19:40:44 +01:00
Ted John 50edff6158 Merge pull request #2314 from Gymnasiast/obsolete-tooltip
Remote obsolete date tooltip
2015-11-17 18:21:29 +00:00
Dom Light b9d48d2f9b Document audio.h 2015-11-17 01:05:22 +00:00
Dom Light b736de003e Sanitize audio.c 2015-11-17 01:05:21 +00:00
Dom Light 3a8b25a0ee Sanitize audio.h 2015-11-17 01:05:14 +00:00
Alexander Overvoorde 0f065cf4a9 Add string ids for scenario name window 2015-11-16 20:30:38 +00:00
Alexander Overvoorde b83e570230 Fix length of max scenario name in scenario editor 2015-11-16 20:30:26 +00:00
Alexander Overvoorde 994dd1f945 Add string ids for scenario name window 2015-11-16 17:56:51 +01:00
Alexander Overvoorde 3ba35745c8 Fix length of max scenario name in scenario editor 2015-11-16 17:50:52 +01:00
Gymnasiast 2afed6a4de Remote obsolete date tooltip 2015-11-16 11:04:00 +01:00
duncanspumpkin cd07fd5d4e Fix #1565. Construction window now checks to see if it has control of tool before canceling it 2015-11-15 09:12:19 +00:00
duncanspumpkin 331d75e5f7 Fix signs. Broken by #2172 2015-11-14 12:40:40 +00:00
duncanspumpkin 45c4dfe12d Merge branch 'develop' into pre-release-0.0.3 2015-11-13 23:30:13 +00:00
Duncan bc9a28d7ae Merge pull request #2261 from osconnoisseur/fix_2233
Add buttons for Up and New File in the load/save dialog and fix #2233
2015-11-13 22:50:46 +00:00
Duncan 86fdd6d1f6 Merge pull request #2280 from janisozaur/highdpi
Highdpi
2015-11-13 18:39:24 +00:00
duncanspumpkin aa55ca6b62 Refactor banner_remove. Fixed an original bug.
Banners that are placed on two different heights that face the same direction will end up bugging out. This has now been fixed. This required modification of the top toolbar code in order to correctly set the z variable.
2015-11-13 18:30:14 +00:00
Michał Janiszewski b5b1957f58 Fix some left-shifts
An explicit `1` is considered signed by compiler, if `int` is 32 bit
long, a left shift `1 << 31` is undefined. Since the type of result is
the type of left shift operand, make sure we shift unsigned int so that
the behaviour is defined correctly.

Also one fix in peep code, where it would use too big value for
`item_extra_flags`.
2015-11-12 13:38:10 +01:00
Michał Janiszewski 075b98e209 Minor cleanups
Mostly just setting variables to better define game state, with one
minor update of decompilation where an `or` instruction was used in
place of `mov` (in `sub_6CBCE2`).
2015-11-12 12:19:40 +01:00
osconnoisseur b5c04a79e5 Added buttons for "up" and "new file" and fixed #2233 2015-11-11 21:51:21 -06:00
Michał Janiszewski 80510c91bd Add ui option to change scale in run-time
Doesn't let user go lower than 0.5f
2015-11-12 01:18:42 +01:00
IntelOrca 7f541240e2 fix #2279, make game remember save path rather than filename 2015-11-11 21:37:26 +00:00
Duncan bcc7e2f5a1 Merge pull request #2147 from Overv/develop
Fix confusing errors appearing when building a flat ride partially outside the park #2129
2015-11-09 12:39:41 +00:00
Alexander Overvoorde 3f00ec42f1 Replace trackPlaceZ RCT2_GLOBALs with define for clarity 2015-11-08 23:44:41 +01:00
IntelOrca 2e55495470 improve master server to POST json 2015-11-08 22:03:35 +00:00
Alexander Overvoorde b20a844982 Fix "land not owned" errors being overridden by "can't construct here"
I'm not entirely sure what the "hmm" check is about, but it caused
track_place() to return early when called from
window_ride_construction_construct(), so I moved up the owned land check
to give it a higher priority.
2015-11-08 21:47:18 +01:00
Ted John c70880c0a5 Merge pull request #2251 from Broxzier/fix_filename
Fixed filenames being cut off when there's a dot in them
2015-11-08 19:04:45 +00:00
Ted John a24844a6ee Merge pull request #2247 from Gymnasiast/ride-entry-flag-15-and-17
Identify RIDE_ENTRY_FLAG_15 and 17, fix 'Show all operating modes' cheat
2015-11-08 18:57:03 +00:00
IntelOrca 48e3d70e57 refactor colour maps 2015-11-08 18:55:32 +00:00
Hielke Morsink b929a27595 Fixed filenames with dots not being displayed completely. 2015-11-08 18:21:55 +01:00
IntelOrca 141705fe6b disable peep watching thought for multiplayer as its client specific 2015-11-08 15:15:10 +00:00
IntelOrca 12a6ec2fef stop desynchronisation when placing scenery, fixes #2111 2015-11-08 15:01:30 +00:00
IntelOrca 6fe2340dfe stop clients from pausing multiplayer games 2015-11-08 14:32:22 +00:00
Gymnasiast 4ba83b0418 Rename RIDE_ENTRY_HIDE_LAST_OPERATING_MODE to RIDE_ENTRY_DISABLE_LAST_OPERATING_MODE 2015-11-08 15:01:40 +01:00
Gymnasiast e749c1a82c Identify RIDE_ENTRY_FLAG_15 and 17, fix 'Show all operating modes' cheat 2015-11-08 14:55:01 +01:00
Gymnasiast 4e5b8a1a19 Add South Korean Won and Russian Rouble as currencies, closes #2222, also fix #2232 2015-11-08 11:46:11 +01:00
IntelOrca d2aa736492 fix master server communication 2015-11-08 04:02:23 +00:00
IntelOrca 782d3e63b2 add new master server functionality 2015-11-08 02:12:12 +00:00
IntelOrca 9bad4183a7 add default master server url and refactor 2015-11-07 23:56:16 +00:00
IntelOrca 74fe482a62 improve game info json 2015-11-07 23:47:50 +00:00
zsilencer 1e9381ef97 master server list 2015-11-07 22:27:51 +00:00
zsilencer 9acfd27735 password prompt for client 2015-11-07 22:26:46 +00:00
zsilencer 3b639ced47 allow host to specify password #2072 2015-11-07 22:25:47 +00:00
duncanspumpkin 983436d425 Implemented a insert corrupt element button on the tile inspector 2015-11-07 10:04:57 +00:00
IntelOrca daf95940ac add warning message for two unstable cheats 2015-11-06 18:46:18 +00:00
duncanspumpkin 13e2f8e9ed Fix #2210. Reverts from a0909a2 that cause the up button to load the same directory 2015-11-06 18:02:27 +00:00
Duncan db356290ba Merge pull request #2204 from janisozaur/language-check
Early out and report error if langauge files are missing
2015-11-05 22:02:25 +00:00
Michał Janiszewski 2d62c356c3 Early out and report error if langauge files are missing
This is a common problem if you don't set up your paths properly on
Linux, so be nice and try to provide helpful message why we failed to
load instead of crashing on user a moment later.
2015-11-05 22:41:20 +01:00
duncanspumpkin ce06ee8681 Fix #1523. Water tool selection now the correct colour. 2015-11-05 18:02:21 +00:00
Duncan 0f14d33cc6 Merge pull request #2184 from duncanspumpkin/fix_2151
fix #2151.
2015-11-04 19:42:34 +00:00
IntelOrca 800e80aeb3 fix demolish track piece as client on multiplayer 2015-11-03 22:58:30 +00:00
Flukiestemperor c8701ef01e partially fix #2181
create common function
2015-11-03 16:11:11 -06:00
duncanspumpkin d5688cdc4e Fix #2189. Map owned area not shown correctly.
Issue was caused by doubling up a bit of code and combining it with the next line when implementing it.
2015-11-03 18:19:23 +00:00
duncanspumpkin bbe2a34714 Fix #2151.
I think this fixes the issue but its hard to understand from the original
issue.
2015-11-03 14:39:33 +00:00
Michał Janiszewski c0e2a5c7be Add get_current_rotation function and DEBUG_LEVEL macros 2015-11-02 22:58:15 +01:00
IntelOrca a0909a242d fix several safe_strncpy calls 2015-11-02 21:23:01 +00:00
IntelOrca 45bfdad4e3 fix #1144 2015-11-02 20:43:55 +00:00
duncanspumpkin d21e5a3b8c Fix #2136. Issue caused by missing branch. 2015-11-01 21:03:50 +00:00
Michał Janiszewski 9a981ef68f Fix variable not being shifted
When decompiled, at 0x6AA8ED, there's `shr edi,0x4`, which is not
reflected in sources.

The `type` without that shift could easily become a value large enough
to point to memory beyond object entries and modify those values. In my
case, it was modifying `RCT2_ADDRESS_OBJECT_LIST_NO_ITEMS` from 2122 to
2123 (by setting lowest bit), which luckily, is used later in
`setup_in_use_selection_flags`. For this reason, I believe it could be a
major source of other problems, possibly also recent `MAP_ANIMATION`
ones, although I haven't checked.

I also put an assert in place to validate type against max available
count.
2015-11-01 18:53:47 +01:00
Ted John caa5f870c5 Merge pull request #2175 from zsilencer/network
Network
2015-11-01 11:24:04 +00:00
Jonathan Haas d2ec665ae4 Fix Bug #2138 2015-11-01 09:59:13 +01:00
zsilencer d18adc80de fix small error 2015-10-31 17:43:36 -06:00
zsilencer a95357a32d signs and banners editable in multiplayer 2015-10-31 11:07:36 -06:00
Michał Janiszewski 9284930d7e Add safe_strncpy function
safe_strncpy is similar to strncpy, but makes sure buffer is
null-terminated. Update most of project to use this updated function to
prevent illegal memory accesses.
2015-10-30 16:01:00 +01:00
Alexander Overvoorde 01793e11b7 Replace RCT2_GLOBAL magic numbers with address identifiers and string ids 2015-10-29 09:44:46 +01:00
zsilencer 00e2ca43a1 ipv6 support, non-blocking address resolve and connect 2015-10-26 22:35:34 -06:00
Gymnasiast 9504f3f10d Replace missed occurrence of magic numbers with defines 2015-10-26 13:53:26 +01:00
Gymnasiast 61444c8518 Display the visible/practical map size instead of the technical size, fixes #2133 2015-10-26 10:21:04 +01:00
IntelOrca 8d84b540ad add vehicle struct and enum labels from vehicle-update branch. 2015-10-25 21:26:03 +00:00
IntelOrca 4ac42ff1b2 add vehicle struct, enum labels and helper functions from implement-ride-create-vehicles branch. 2015-10-25 16:00:21 +00:00
Michał Janiszewski fcd22dd8ca Memory handling fixes 2015-10-25 01:15:52 +02:00
Hielke Morsink e5ce186534 Wrapped new widget with () 2015-10-24 17:23:34 +02:00
Hielke Morsink dc8e197799 Added 10-minute inspections cheat. 2015-10-24 17:10:33 +02:00
Ted John 5e9912e880 Merge pull request #2038 from HaasJona/restart_required
Require a restart after changing hardware rendering
2015-10-24 14:44:01 +01:00
Jonathan Haas 475466dcd9 Require a restart after changing hardware rendering setting, decouple setting from active status 2015-10-24 12:50:28 +02:00
Michał Janiszewski 79552feb54 Only copy strings when they're different
When called from window_loadsave_scrollmousedown,
window_loadsave_populate_list will try to strncpy a string over itself.
This commit prevents that.
2015-10-23 17:22:31 +02:00
Michał Janiszewski 11fb15bba7 Add casts for types 2015-10-22 23:51:05 +02:00
IntelOrca 00ff795d04 hide multiplayer button if network is disabled 2015-10-21 21:06:15 +01:00
Michał Janiszewski 8e45cccb7a Minor fixes
Includes (mostly) type fixes, dead code removal, signed vs unsigned
comparison fixes, memory leaks removal.
2015-10-21 08:47:09 +02:00
Michał Janiszewski 7d0ce00bab Strip all whitespace 2015-10-20 20:48:51 +02:00
Sam Horn 7250adaf71 Identify peep->var_C6 2015-10-19 18:36:45 +10:00
IntelOrca 8c276acde7 fix #2085 2015-10-18 21:16:00 +01:00
Sam Horn 34e1e773a7 Fixes #2080 2015-10-18 22:40:07 +10:00
Duncan 45d3fbf10d Merge pull request #2061 from clamburger/update_peep_on_enter_ride
Cleaned up peep_on_enter_ride
2015-10-18 10:21:04 +01:00
Sam Horn 05f6ea96a0 Fixed inconsistent use of peep->rides_been_on 2015-10-18 02:32:26 +10:00
IntelOrca 341b658ed0 add gui option for stay_connected 2015-10-16 22:45:17 +01:00
IntelOrca 6c6fa1d444 add ability for server to kick player, closes #2071 2015-10-16 22:20:16 +01:00
duncanspumpkin ee1e71f287 Fix loadlandscape breaking enabled tabs
Issue was caused by not calling sub_6DFED0 when loading the landscape. I assume in vanilla this would happen as part of the loading but due to the way loadsave now works it doesn't happen. In the process I also labelled the offset for editor step.
2015-10-15 22:16:27 +01:00
Ted John fdfe52fc19 Merge pull request #2057 from Gymnasiast/show-vehicles-from-other-track-types
Show vehicles from other track types
2015-10-15 12:57:57 +01:00
IntelOrca 0442f08aae remove redundant dropdown assignment 2015-10-14 21:16:10 +01:00
IntelOrca 3855d70d1a fix dropdown 64 item support and remove old RCT2 addresses 2015-10-14 21:01:04 +01:00
Gymnasiast d71ca1f376 Extend dropdowns to hold up to 64 items (with bugs) 2015-10-14 16:19:50 +02:00
Duncan d2398b65bb Merge pull request #2048 from clamburger/update_sub_6960AB
Clean up sub_6960AB function (peep_should_go_on_ride)
2015-10-12 21:49:46 +01:00
Gymnasiast a1cc3e4759 Fix vehicle dropdown when 'Select-by-track-type' off and 'Show vehicles from other track types' on 2015-10-12 16:01:58 +02:00
Gymnasiast 105280a082 Introduce cheat option to show vehicles from other track types 2015-10-12 15:58:15 +02:00
IntelOrca d5ae4a55ff allow 1 to 64 mountain tool size 2015-10-11 12:26:33 +01:00
Sam Horn 58b7df8fd7 Renamed ride->first_peep_in_queue to last_peep_in_queue 2015-10-11 03:03:59 +10:00
Ted John 5405cf7efd Merge pull request #2012 from Overv/develop
Add Steam overlay detection that pauses the game (#1903)
2015-10-05 00:07:10 +01:00
duncanspumpkin 36917bd75a Fix #1661. Track direction now remembered when deleteing last section 2015-10-04 20:52:27 +01:00
duncanspumpkin 9017e5ff86 Fix #1899. Prevent mountain tool from being possible for land ownership tool. 2015-10-04 20:44:17 +01:00
Alexander Overvoorde 51377fc960 Add setting for Steam overlay pausing and add extra check 2015-10-03 23:10:56 +02:00
Jonathan Haas ae82ffcd96 Rename window flags 2015-10-03 17:20:53 +02:00
Alexander Overvoorde 377650d9f5 Change autosave system to use wall-clock time based frequencies
The autosave system will now use frequencies based on wall-clock
time rather than in-game time, for example every 15 minutes. This
frequency is not affected by pausing the game or changing the game
speed. The default frequency is every 5 minutes.
2015-10-03 14:25:59 +02:00
Rune Laenen 7ac930c318 errorfix guest_list 2015-10-02 13:49:13 +02:00
Rune Laenen 5d75fa4464 var_2A to outside_of_park 2015-10-02 13:41:13 +02:00
duncanspumpkin eaa44ab1e1 Fix #1854. Special track elements disable correctly.
Issue was caused by a change I asked to be done a month back. Dropdowns are awkward windows the global array for dropdown content should be populated before creating them but not anything else as that will get reset. In this case the disabled items were reset. The same happens for highlighted index if that is specified before window creation
2015-09-27 21:55:48 +01:00
nightroan 8d3f7600fb As a multiplayer client, don't select the next track piece if is is unaffordable. 2015-09-26 16:01:04 -07:00
IntelOrca a04663368e add two new date formats, y/m/d and y/d/m, closes #1900 2015-09-26 14:35:26 +01:00
nightroan bd51c7ed80 Fixed #1939 by adding a callback to delay selection of the next piece until the server sends back the placement command. 2015-09-25 23:57:15 -07:00
zsilencer 9ac89c2b5e remove directsound and get sound working for linux native 2015-09-23 09:42:55 -06:00
YamaArashi 7c8b0641d9 replace viewport flags numeric literals with constants 2015-09-22 15:30:19 -07:00
Michał Janiszewski 5ceafd66a3 Fix memory leak in screenshot.c and guest.c 2015-09-22 22:58:20 +02:00
Gymnasiast e2ec6e0970 Move 'show all operating modes' to Cheats window 2015-09-18 11:55:52 +02:00
Gymnasiast 4909272a44 Add cheat option to show all operating modes; cleanup 2015-09-18 10:54:48 +02:00
Gymnasiast a6ee08de11 Fix filter buttons in RC designer and TD manager, clean up some strings 2015-09-11 16:21:27 +02:00
IntelOrca 4dd95c650b implement RideData4 data 2015-09-10 22:16:41 +01:00
IntelOrca 88db4f12aa fix #1910 2015-09-09 20:25:34 +01:00
Ted John 2a0366721e Merge pull request #1896 from janisozaur/some_fixes
assorted fixes
2015-09-07 20:11:29 +01:00
Michał Janiszewski 52252f82b3 assorted fixes 2015-09-07 20:51:21 +02:00
Gymnasiast 3ddddec21c Fix some warnings 2015-09-07 14:57:39 +02:00
IntelOrca 8c44ddac17 fix 2nd problem of #1848 2015-09-05 20:06:58 +01:00
Gymnasiast d849e3378c Keep track list responsive in pause mode, fixes #1493 2015-09-03 12:12:21 +02:00
Ted John a8fbc479d0 Merge pull request #1869 from LRFLEW/color_labels
Added tooltip to colour selector
2015-09-02 17:49:33 +01:00
Gymnasiast ea9f87d0f3 Remove faulty copy-and-pasted check on secondary items, fixes #1866 2015-09-02 12:42:43 +02:00
LRFLEW 7ef15a4326 Added tooltip to colour selector 2015-09-01 00:08:28 -06:00
Ted John e80d935964 Merge pull request #1867 from Gymnasiast/fix-select-by-track-type-research
Don't apply select by track type to research, fixes #1733
2015-08-31 20:06:00 +01:00
Gymnasiast 8490a19328 Don't apply select by track type to research, fixes #1733 2015-08-31 20:20:36 +02:00
Gymnasiast 2ff3e33e3e Add cheat to disable vandalism 2015-08-31 11:13:19 +02:00
IntelOrca dd5d607724 fix typo 2015-08-31 00:41:58 +01:00
IntelOrca 401a389e73 fix #1843 2015-08-30 23:45:45 +01:00
IntelOrca bea74ee261 make all file IO utf8 compatible, fixes #1847 2015-08-29 13:13:23 +01:00
Gymnasiast 20c7267b53 Don't show the Network status toolbar button in the Editors 2015-08-28 23:27:31 +02:00
Ted John 0c3fd7cd2f Merge pull request #1851 from Gymnasiast/network-button
Move network button to first group and adjust colours, fix debug menu colours, closes #1850
2015-08-27 17:17:12 +01:00
Gymnasiast 4d7a81bfe0 Remove unnecessary duplicate address, use more string constants 2015-08-27 16:44:18 +02:00
Gymnasiast 308b086c55 Name some addresses, clean up strings ids and usage 2015-08-27 16:19:17 +02:00
Gymnasiast cc705d9a1f Move network button to first group and adjust colours, fix debug menu colours 2015-08-27 13:27:46 +02:00
Gymnasiast 4733979df5 Fix crash when attempting to build a new ride when having the Ride construction window open, fixes #1844 2015-08-25 19:08:17 +02:00
Ted John 6a88ca17d0 Merge pull request #1835 from medsouz/cleanupscenery
Add names for all memory addresses in world/scenery.c
2015-08-22 17:43:28 +01:00
medsouz e9269cb882 Finish naming scenery.c addresses 2015-08-22 12:03:40 -04:00
IntelOrca 1a877e637d refactor sprite_invalidate 2015-08-22 11:56:32 +01:00
Gymnasiast 11fa6bbab7 Fill ride construction dropdown properly before drawing it, fixes #1793 2015-08-21 09:34:58 +02:00
Gymnasiast 93d49e314e Fix file menu for editor, restore menu order, add shortcut for quick saving 2015-08-20 12:13:08 +02:00
zsilencer abcd0afa9a make setting player name actually work 2015-08-19 18:26:42 -06:00
zsilencer be42f10d7a fix crash in server_list_save_saved_servers 2015-08-19 18:13:38 -06:00
Runelaenen d34a446d61 Easier saving
Replace Save game functionality and add 'save game as' function
2015-08-19 22:02:06 +02:00
medsouz 4207b41855 Name more addresses 2015-08-18 23:53:24 -04:00
Gymnasiast 59202f97f8 Make the string for 'Default audio device' translatable, fix comment 2015-08-18 21:55:04 +02:00
Ted John 4ee28af18c Merge pull request #1816 from Gymnasiast/allow-incorrect-checksum
Add option to allow loading scenarios with an incorrect checksum, closes #1790
2015-08-18 19:52:46 +01:00
Gymnasiast 9c23414fbe Keep the same orientation as in the preview when placing track, fixes #1817 2015-08-18 18:22:23 +02:00
Gymnasiast e8cc1738ca Fix saving of feature 2015-08-18 15:49:16 +02:00
Gymnasiast 8cf34ca662 Add option the Options window, clean up some string ids in that window 2015-08-18 11:58:47 +02:00
medsouz 958f2fb296 Document some scenery memory addresses 2015-08-17 23:05:46 -04:00
IntelOrca 23fcefd7eb fix saving of servers 2015-08-17 08:13:39 +01:00
medsouz 3b845a67ed Add option for handymen to mow grass by default 2015-08-16 19:26:42 -04:00
medsouz 02e2ebec9a Restore globals 2015-08-16 18:35:47 -04:00
medsouz 7071bd9353 Document more addresses
Created defines for all the memory addresses I could find in peep/staff.c
and updated everywhere they're being used.
2015-08-16 18:25:17 -04:00
xperia64 4733ea28c0 Add a cheat so guests ignore intensity and nausea ratings 2015-08-16 16:02:41 -04:00
Ted John 5452eb9b73 Merge pull request #1798 from medsouz/documentaddresses
Document various memory addresses
2015-08-16 18:43:20 +01:00
IntelOrca 90bf4c6836 fix #1797 2015-08-16 18:42:30 +01:00
medsouz ca1a1e0ddd Document various memory addresses 2015-08-16 13:05:49 -04:00
IntelOrca 4f8e289e79 finish server list and fix a couple of multiplayer issues 2015-08-16 17:29:47 +01:00
IntelOrca 094cc19411 allow joining of servers in server list window 2015-08-16 16:37:08 +01:00
IntelOrca a3450a4bf8 add loading / saving of servers 2015-08-16 15:27:21 +01:00
Gymnasiast c00e044b6c Multiplayer interface improvements, cleanup 2015-08-16 13:14:04 +02:00
IntelOrca f072440d18 add server list window (WIP) 2015-08-16 03:07:00 +01:00
IntelOrca 3f31221973 fix network merge issues, fix #1785 2015-08-14 22:06:15 +01:00
zsilencer c1e802e361 fix text for utf8 2015-08-14 09:15:07 -06:00
zsilencer a4267990b8 detect desyncs 2015-08-14 09:13:40 -06:00
zsilencer 584b34e6d5 fix game_command_create_ride for network 2015-08-14 09:13:39 -06:00
zsilencer 3b4a4fcdac network status window 2015-08-14 09:13:39 -06:00
zsilencer 1d811a5692 improve chat feature 2015-08-14 09:13:39 -06:00
zsilencer 56f8954e27 fix clear scenery for network 2015-08-14 09:13:39 -06:00
zsilencer d772f8b5fb measure and display ping 2015-08-14 09:13:39 -06:00
zsilencer 7ccb0eb655 basic player list 2015-08-14 09:13:38 -06:00
zsilencer 73211b4215 fix chat window for new window code 2015-08-14 09:13:30 -06:00
zsilencer 21334e307c move chat window to separate file 2015-08-14 09:13:30 -06:00
zsilencer df7f576e05 map loading over network 2015-08-14 09:13:29 -06:00
Gymnasiast 86bcbafc01 Rename finance_mark_loan_settings_as_legitimate() to finance_update_loan_hash() 2015-08-13 09:00:49 +02:00
Gymnasiast d04d2f5069 Silently update invented items when using Inventions List in-game 2015-08-12 16:21:16 +02:00
Gymnasiast e9637978a1 Fix cheat detection when using Scenario Options in-game, rename sub_69E869() 2015-08-12 16:12:34 +02:00
Gymnasiast d01a53bd16 Add Inventions List and Scenario Options to the Debug menu 2015-08-12 15:31:52 +02:00
Ted John e53aebc904 Merge pull request #1772 from Gymnasiast/refactor-map-window
Refactor map window
2015-08-12 13:43:52 +01:00
Gymnasiast 7db2008472 Fix minimum tool sizes 2015-08-12 14:24:20 +02:00
Gymnasiast 6ec3838b0b Refactor map window 2015-08-12 14:23:13 +02:00
Gymnasiast a0f75fbda2 Turn minimum and maximum tool sizes into defines 2015-08-12 14:07:16 +02:00
Gymnasiast f0054c7307 Fix typo 2015-08-12 00:23:40 +02:00
Gymnasiast fd715c7c5d Name RIDE_TYPE_FLAG_8 and _12 2015-08-12 00:21:53 +02:00
Gymnasiast 7fe0284917 Refactor land, water and land rights windows 2015-08-11 23:09:39 +02:00
Gymnasiast 23d4084332 Refactor Clear Scenery window and raise size limit to 64 2015-08-11 18:26:39 +02:00
medsouz db9ea4cdf3 Added toggle for audio disable on focus lost
This closes #1758
2015-08-11 07:06:00 -04:00
LRFLEW b2bb862f75 Fix #1756 2015-08-10 11:01:35 -05:00
LRFLEW d10f5c8f06 Added tracked guests filter 2015-08-09 22:58:15 -05:00
Gymnasiast 46a0529f40 Add comment to clarify that non-inventioned rides are skipped 2015-08-07 22:34:15 +02:00
IntelOrca d0827bd9d8 implement window_maze_construction_resize and window_maze_construction_construct 2015-08-06 02:12:36 +01:00
IntelOrca 4f77cc8df3 implement gfx_draw_sprite_raw_masked 2015-08-06 01:00:03 +01:00
Maikel Stuivenberg d12b75acc2 hide non-applicable marketing campaigns, closes #1516, closes #1454, fixes #1510 2015-08-05 21:18:56 +01:00
IntelOrca 6b72f9a555 refactor shop item strings 2015-08-05 19:17:37 +01:00
IntelOrca cec486839c add 'no entrance' style and refactor a few things 2015-08-05 01:24:18 +01:00
Michał Janiszewski 413805f675 portability fixes 2015-08-04 22:46:32 +02:00
IntelOrca e0769800e7 remove old zero clearance tool 2015-08-04 20:25:24 +01:00
Michał Janiszewski 7afb7e2dfd Portability fixes 2015-08-04 19:31:21 +02:00
Ted John 61c42fc653 Merge pull request #1725 from danidoedel/bugfix
fix recent messages toolbar tooltip
2015-08-04 17:46:50 +01:00
IntelOrca 9ec701345f fix #1724 2015-08-04 17:40:02 +01:00
danidoedel 1fc7c0ecac fix recent messages toolbar tooltip 2015-08-04 17:56:12 +02:00
IntelOrca ca0e63f1a1 fix #1598 2015-08-04 02:28:05 +01:00
IntelOrca f25ab8e9f3 fix #1715 2015-08-04 02:12:17 +01:00
IntelOrca cac0f2ab52 upgrade to VS2015 compiler 2015-08-03 23:16:30 +01:00
IntelOrca 36c5179b39 implement utf8, part 27 (tweak tooltips) 2015-08-03 18:40:16 +01:00
IntelOrca 7bcb12503a implement utf8, part 24 (bug fixes) 2015-08-02 11:25:26 +01:00
IntelOrca d228d13918 implement utf8, part 23 (bug fixes) 2015-08-01 16:40:15 +01:00
IntelOrca 7fe54661b9 implement utf8, part 21 (more font specific customisation and bug fixes) 2015-08-01 10:21:01 +01:00
IntelOrca 52d5732826 implement utf8, part 19 2015-08-01 10:21:00 +01:00
IntelOrca 6bf474bd52 implement utf8, part 16 2015-08-01 10:20:58 +01:00
IntelOrca 31eb758ba1 implement utf8, part 15 2015-08-01 10:20:57 +01:00
IntelOrca fa87d8e999 implement utf8, part 14 2015-08-01 10:20:57 +01:00
IntelOrca a9e6f8c3db implement utf8, part 12 2015-08-01 10:20:55 +01:00
IntelOrca 357111a560 implement utf8, part 11 2015-08-01 10:20:55 +01:00
IntelOrca 99c7c93764 implement utf8, part 9 2015-08-01 10:20:53 +01:00
IntelOrca 795c01cab5 implement utf8, part 5 2015-08-01 10:20:50 +01:00
IntelOrca 1682eae048 implement utf8, part 4 2015-08-01 10:20:50 +01:00
IntelOrca 2bb0c6c53f implement utf8, part 3 2015-08-01 10:20:49 +01:00
Ted John 10fc123228 Merge pull request #1699 from Gymnasiast/name-flags
Name a park flag and a TD6 flag.
2015-07-29 11:54:24 +01:00
Gymnasiast ade8779195 Name a park flag and a TD6 flag. 2015-07-28 20:44:44 +02:00
Ted John 2fc658e346 Merge pull request #1697 from Gymnasiast/guests-given-date
Allow setting 'Guests at given date' in increments of 50, with a minimum of 250
2015-07-28 19:39:45 +01:00
IntelOrca 3a07af140b Implement more peep path finding 2015-07-28 18:33:46 +01:00
Gymnasiast 88f4185b3b Allow setting 'Guests at given date' in increments of 50, with a minimum of 250 2015-07-28 19:17:25 +02:00
Ted John ea130a6126 Merge pull request #1694 from Gymnasiast/remove-six-flags-branding-and-limitations-2
Remove Six Flags branding and limitations, mark the lifecycle flag as deprecated, rename previously unidentified flag
2015-07-28 12:08:47 +01:00
Gymnasiast 9976b9673a Remove rest of Six Flags branding. 2015-07-28 10:13:16 +02:00
Gymnasiast 5ed8948e4f Remove Six Flags branding and limitations, mark the lifecycle flag as deprecated, rename previously unidentified flag 2015-07-27 21:47:55 +02:00
Gymnasiast 65900982c4 Fix '1 weeks remaining' 2015-07-27 17:33:22 +02:00
Gymnasiast 38f031655c Fix display of remaining marketing campaign weeks 2015-07-27 10:34:19 +02:00
Gymnasiast 777065e6a6 Allow running marketing campaigns for up to 12 weeks 2015-07-26 22:36:12 +02:00
Matt Layher 06f2adb9d6 Properly merge #1672: incorrect plural form for last inspection time, fixes #1513, closes #1672 2015-07-26 21:30:29 +01:00
Duncan 6f0ad6a916 Merge pull request #1686 from Gymnasiast/disable-tutorial-button
Disable tutorial button
2015-07-26 17:00:56 +01:00
Gymnasiast 19d2bbf919 Disable tutorial button 2015-07-26 15:14:38 +02:00
Gymnasiast bcdfdcb7a0 Reorder Options window 2015-07-26 14:37:27 +02:00
Ted John f4216227f4 Merge pull request #1682 from Gymnasiast/upper-case-banners
Add feature to make banners display text in all caps
2015-07-25 20:50:02 +01:00
Gymnasiast ae32b463c0 Add feature to make banners display text in all caps 2015-07-25 21:38:23 +02:00
IntelOrca 801d2ec341 implement window_maze_construction_mousedown 2015-07-25 17:48:00 +01:00
Ted John 2d11e54fa7 Merge pull request #1670 from duncanspumpkin/peep
Peep
2015-07-25 11:32:25 +01:00
Michał Janiszewski 6adb384a7e Refactoring in news_item
Now news_items are fetched only with exposed calls, which add a layer of
simple checks. I also switched few places to access a read-only version
of news_item.
2015-07-25 11:31:17 +02:00
Duncan Frost bff00b29bf Fix more small pathfinding bugs. Fix unset memory errors 2015-07-25 10:12:51 +01:00
IntelOrca 50187adc37 enable debug configuration and add optimisations to release configuration 2015-07-24 23:48:23 +01:00
IntelOrca 5f69e6f37a add cycle day / night 2015-07-24 22:58:41 +01:00
IntelOrca dd107ee25c save object selection filter, closes #1599 2015-07-24 20:15:13 +01:00
IntelOrca b12b1b5faf support map scroll keyboard shortcuts, e.g. WASD. Closes #757 2015-07-24 19:20:24 +01:00
Duncan e5aeb8dc38 Merge pull request #1668 from janisozaur/develop
sub_0x68615B doesn't really take any params
2015-07-24 12:36:58 +01:00
Michał Janiszewski 8f2dc5fd1a sub_0x68615B doesn't really take any params
In all cases, sub_0x68615B takes a single argument, 0xEE788C.
It now takes 0 arguments and simply knows about its initializing values.
2015-07-23 20:22:08 +02:00
IntelOrca faacd66ad9 allow trees to be raised if supports limits are disabled, close #1663 2015-07-23 18:55:51 +01:00
IntelOrca 1662b18a7e fix #1662, consistent location sign 2015-07-23 18:38:43 +01:00
IntelOrca 1f2502c8c2 add recent messages to toolbar, closes #1423 2015-07-22 18:13:35 +01:00
IntelOrca f35c23bb68 implement window_maze_construction_update 2015-07-21 15:02:53 +01:00
Duncan Frost cd400867e8 Merge branch 'develop' of https://github.com/OpenRCT2/OpenRCT2 into develop 2015-07-20 20:51:01 +01:00
Duncan Frost b94d77ccae Fix issue where saving would close toolbar.
Fixes 1537. Issue was caused by the window order being changed further down a function call. This meant all pointers to windows were invalid.
2015-07-20 20:49:56 +01:00
IntelOrca 4a16573786 fix cast warning 2015-07-20 20:25:05 +01:00
IntelOrca 1176e74ff6 fix guest and staff renaming 2015-07-20 20:21:12 +01:00
Duncan Frost 1725211713 Fix incorrect widgets enabled in ride construction. 2015-07-20 19:47:54 +01:00
Duncan Frost ed23efe389 Implement remaining functions that were crashing 2015-07-20 18:43:57 +01:00
Duncan Frost a877dd4a5b Get the initial maze construct working.
Note entrances are broken
2015-07-20 18:03:45 +01:00
Duncan Frost d2bcf096f7 Fix slope end when deleting sections.
Fixes #1646
2015-07-19 15:11:24 +01:00
IntelOrca a64a8c6021 implement peep_head_for_nearest_ride_with_flags 2015-07-19 00:06:55 +01:00
IntelOrca e967e9465f implement sub_68B2B7 2015-07-17 16:00:46 +01:00
IntelOrca 48028fcfc4 fix #1631, fix #1632 2015-07-16 16:42:46 +01:00
zsilencer 38b691b460 fix #1624 2015-07-15 15:44:05 -06:00
zsilencer 689f7c9f1d #1130 save last audio device 2015-07-14 16:45:24 -06:00
IntelOrca 118b9ea2ac fix tile inspector 2015-07-13 21:45:10 +01:00
IntelOrca b2d620bb9d implement window_ride_measurements_tooldown and refactor track save scenery 2015-07-13 20:43:17 +01:00
IntelOrca 5cda9af81f implement window_staff_list_tooldown 2015-07-13 19:51:46 +01:00
IntelOrca 1d9f404b5b implement ride_construction_set_default_next_piece 2015-07-13 12:47:31 +01:00
Gymnasiast 0cbabb479e Fix some warnings 2015-07-13 11:56:58 +02:00
Gymnasiast a63642b630 Fix some warnings 2015-07-13 11:50:09 +02:00
IntelOrca 3ffffc699c clean up and remove various callprocs 2015-07-12 01:46:52 +01:00
IntelOrca 9e9eb6a833 implement banner_get_closest_ride_index 2015-07-11 20:24:27 +01:00
IntelOrca fbd402eb67 implement remaining screen_get_map_xy... functions 2015-07-11 18:23:59 +01:00
zsilencer b876591543 use SDL_RWops for save games 2015-07-11 12:27:46 +01:00
IntelOrca da3be49f34 update sandbox icon 2015-07-10 21:33:32 +01:00
IntelOrca 9c8be6a483 allow disable clearance checks for footpaths 2015-07-10 21:33:32 +01:00
IntelOrca d5ffaefdf0 add better disable clearance cheat 2015-07-10 21:32:11 +01:00
IntelOrca 5724567b15 implement ride_get_place_position_from_screen_position 2015-07-10 14:54:02 +01:00
Ted John 35d444e28f Merge pull request #1583 from Gymnasiast/fix-no-money-checkbox
Fix display of 'No money' checkbox when opened in-game
2015-07-10 12:12:33 +01:00
IntelOrca f906391c9d remove registers from window events and changed to typed signatures 2015-07-10 01:39:16 +01:00
IntelOrca e42a11efa3 fix cheats window warnings and improve spacing 2015-07-09 18:37:51 +01:00
Gymnasiast 4ace6a6e1b Fix display of 'No money' checkbox when opened in-game 2015-07-09 17:05:14 +02:00
Gymnasiast be635030bd Reorder cheats window, use actual currency, add cheats to give guests money and to set goal to have fun 2015-07-09 16:36:45 +02:00
IntelOrca 6527bc6ac2 add shortcut versions and rotate clockwise/anticlockwise shortcut 2015-07-09 13:50:33 +01:00
Runelaenen bec1a52bba Changed function and occurences
It doesnt have to rotate three times to get an anti-clockwise return.
2015-07-09 14:22:28 +02:00
Runelaenen 624a402fa9 Removed comment 2015-07-09 14:22:26 +02:00
Runelaenen 5109224ba0 Add submenu and anti-clockwise rotation 2015-07-09 14:22:22 +02:00
IntelOrca 4acb7ff5e1 fix demolish of flat rides and unable to build it again 2015-07-06 22:53:16 +01:00
Duncan Frost bcd80b3db8 Fix issue with tracks on uneven ground.
Fixes #1525
2015-07-06 21:09:01 +01:00
Duncan 01be8bb70e Merge pull request #1563 from duncanspumpkin/fix_track
Fix track bugs.
2015-07-06 19:02:15 +01:00
IntelOrca 0def7c0883 refactor invalidation of map tiles and viewports 2015-07-06 18:57:36 +01:00
Duncan Frost e898e4dfc4 Fix track bugs.
Fixed issue with ride demolishing where only the first tile of a ride would get demolished causing issues when the ride entries were removed.
Fixed issue with rotation 3 track pieces where invalid memory would be accessed.

Fixes #1506
Fixes #1556
2015-07-06 18:21:42 +01:00