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

4426 Commits

Author SHA1 Message Date
Michał Janiszewski abf0801725 Fix erroneous address 2016-01-07 21:26:38 +01:00
IntelOrca 8f4c8006b5 Merge branch 'refactor-object-paint' into develop 2016-01-07 19:24:36 +00:00
IntelOrca 569026f36b fix #1333: added missing logic from finance_pay_ride_upkeep to make rides safe again 2016-01-07 19:20:11 +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
Michał Janiszewski 2d82bf344e shadows for fonts 2016-01-07 15:48:52 +01:00
IntelOrca 01c67b6146 refactor object_paint, part 1 2016-01-07 00:34:15 +00:00
IntelOrca ab38828e03 integrate object list variables: 
- gInstalledObjectsCount
- gInstalledObjects
- gNumInstalledRCT2Objects
- gNumInstalledCustomObjects
- gLastLoadedObjectChunkData
 2016-01-06 20:41:21 +00:00
IntelOrca c0eeefa609 integrate variables: _currentScrollIndex, _currentScrollArea 2016-01-06 18:47:55 +00:00
IntelOrca 29397ebcc5 fix #2658: fix dragging on land and water tools 2016-01-06 18:31:25 +00:00
Gymnasiast b89025ae62 Improve object loading 2016-01-06 08:58:56 +01:00
IntelOrca 023ac79494 optimise object_calculate_checksum 2016-01-06 00:59:07 +00:00
IntelOrca 2b343838e0 fix scrollbar scrolling 2016-01-05 23:37:57 +00:00
IntelOrca 50eaa99eac fix widget index size & size for consistency 2016-01-05 23:16:09 +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
Ted John 923b3daf40 Merge pull request #2644 from LRFLEW/invalid-entrance-fix 
Resolved leaving guests searching for invalid entrance
 2016-01-05 21:49:17 +00:00
IntelOrca 586e5ef9cd integrate variable: gPressedWidget 2016-01-05 21:46:38 +00:00
IntelOrca c181f18309 remove left over RCT2 drag variables 2016-01-05 21:37:15 +00:00
LRFLEW 63ddfa53cd Resolved leaving guests searching for invalid entrance 2016-01-05 14:36:49 -07:00
IntelOrca f5db0a83e5 refactor mouse input queue 2016-01-05 21:20:59 +00:00
IntelOrca e94b7d5338 fix unable to right click to remove scenery 
regression introduced f0adf90660
 2016-01-05 20:53:08 +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
IntelOrca e4c6c79552 fix #2650: validate game commands sent from clients in multiplayer 2016-01-05 18:30:39 +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
LRFLEW db76615af0 Fixed typo in viewport_interaction.c 2016-01-05 00:17:10 -07:00
Michał Janiszewski e63f43c337 Fix for missing exit 2016-01-05 08:16:14 +01:00
IntelOrca d842708f90 refactor drag widget in input.c 2016-01-05 00:10:28 +00: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
Michał Janiszewski 9c4cf14069 Game commands hardening 2016-01-04 22:03:28 +01:00
IntelOrca 3b4928c041 fix windows file enumerate pattern matching 2016-01-04 18:29:18 +00:00
Ted John 015c76084e Merge pull request #2616 from atmaxinger/autosave-timestamp 
Append timestamp to autosave
 2016-01-04 17:54:11 +00:00
Maximilian Irlinger a0bb568889 Append timestamp to autosave 2016-01-04 16:22:15 +01:00
duncanspumpkin d5bce19af1 Fix race car mode collisions 2016-01-04 10:06:26 +00:00
duncanspumpkin ccc7b1f228 Refactor var_4C into seperate variables 2016-01-04 09:36:29 +00:00
duncanspumpkin 5e6befe20b Fix 3D films only lasting 1 ticks time 2016-01-04 09:11:36 +00:00
IntelOrca b94cd7499d add config for hide mega park and set locking as default 2016-01-03 21:06:10 +00:00
Michał Janiszewski b45ca38d52 UTC epoch time for POSIX 2016-01-03 21:41:21 +01:00
duncanspumpkin 3d2a456481 Rework logic to make flow clearer. Fix issue with invalid direction. Fix small logic mistake. 2016-01-03 11:10:02 +00:00
IntelOrca 99e0d999b2 add timestamp to highscores.dat 2016-01-03 01:48:52 +00:00
Michał Janiszewski 2b1b0f76f3 Whitespace fixes. 
This is just whitespace fixup for all files affected in vehcile-update
branch.
 2016-01-03 00:59:10 +01: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 a4e919b023 fix scenario sorting for real and other parks 2016-01-02 21:06:01 +00:00
IntelOrca 2f00a28503 add Geoffrey Gardens mistake alias 2016-01-02 21:06:00 +00:00
IntelOrca 212b8bfa10 translate scenarios by raw normalised name 2016-01-02 21:06:00 +00:00
IntelOrca 5a4ad66a80 fix order of Southern Sands and Tiny Towers 2016-01-02 21:05:59 +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 8f5a9cfade fix issue caused by not copying filename string 2016-01-02 21:05:37 +00:00
IntelOrca 9d88982138 fix mistake in scenario sources array 2016-01-02 21:05:36 +00:00
IntelOrca 3ad3113523 add alias for 'Cradle of Civilisation' 2016-01-02 21:05:35 +00:00
IntelOrca 51141a9057 refactor translation of scenarios 2016-01-02 21:05:35 +00:00
IntelOrca 868da8e450 fix title sequence issue 2016-01-02 21:05:34 +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 be6f7321d0 place custom real parks in real parks for source mode 2016-01-02 21:05:32 +00:00
IntelOrca 6747f20238 hardcode difficulty for original scenarios 2016-01-02 21:05:31 +00:00
IntelOrca 950722292c use user path for default scenario save location 2016-01-02 21:05:31 +00:00
IntelOrca bb84558ae3 fix localisation issues with scenarios 2016-01-02 21:05:09 +00:00
IntelOrca 95ee0be3c5 handle scenario conflicts 2016-01-02 21:05:08 +00:00
IntelOrca 8aa14f876e identify highscores using scenario filenames only 2016-01-02 21:04:45 +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 e78d37f03c Add information on scenario source games. 2016-01-02 21:00:04 +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
Aaron van Geffen 448d4fb657 New string ids for scenario select screen. 2016-01-02 21:00:02 +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
duncanspumpkin 797a2cc75d Fix bug with block breaks when there are track overlaps. 
Labeled map_flag (1<<5) as block break closed as well.
 2016-01-02 17:04:39 +00:00
duncanspumpkin afca9d27d6 Fix sound bugs with opening/closing track doors. Fix average speed bug. 2016-01-02 16:19:06 +00:00
Hielke Morsink eadb03426e fix #2620 and preventing names with dots from breaking. 2016-01-02 14:59:16 +01:00
Duncan 7914ebd0e2 Merge pull request #2619 from Broxzier/fix_speed_hotkeys 
fix #2609 hotkeys for gamespeed work for client
 2016-01-02 10:53:33 +00:00
Ted John c0857dc210 Merge pull request #2617 from AaronVanGeffen/japanese 
Add Japanese to the list of available languages
 2016-01-02 10:52:55 +00:00
Ted John 367f1252c0 Merge pull request #2586 from techfreek/closest-engineer 
Improved mechanic selection for broken down rides
 2016-01-02 10:52:23 +00:00
duncanspumpkin bcd02e833c Fix vehicles bunching up when waiting for passengers in certain directions. 
Most notable in bumper boats on blackpool pleasure
 2016-01-02 10:45:59 +00:00
Hielke Morsink b6c1f3a6c4 Fix #2609 disabling hotkeys for game speed while playing online. 2016-01-02 11:42:51 +01:00
Aaron van Geffen 89a2e32f28 Add Japanese to the list of available languages. 2016-01-02 13:45:21 +09:00
Michał Janiszewski 17e5a0d356 Use strndup when setting last_run_version 
gConfigGeneral.last_run_version should have the string value copied to,
otherwise the SafeFree in config_set_property could try freeing value
from stack if used.
 2016-01-02 00:11:34 +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 6f0d14b65f Using ghost helper funcitons for getting and setting the bit now. 2016-01-01 21:28:52 +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
duncanspumpkin 1f4b4b2c3f Fix flying boats when entering the station. 
Issue was caused by not clearing the word var_34 but instead only the byte var_34. This caused track_progress (word var_34) to become a very large negative number that would be interpreted as a valid track_progress. This would eventually end up reading invalid memory.
 2015-12-31 10:27:33 +00:00
duncanspumpkin 3e03ab71fa Fix small bugs in boat hire code. 2015-12-31 09:53:23 +00:00
Duncan 9884ad416e Merge pull request #2593 from xiane/develop 
Applied enum value to ride type flags.
 2015-12-30 18:54:23 +00:00
Ian Spence ae7da3e830 Fix #2550 Program crashes when executing "exit" command from the console 
- exit and quit commands are aliased to "hide"
 - value of the command was being set to a constant value and could not be freed
 - updated command value to use a freeable value
 2015-12-30 08:57:43 -08:00
IntelOrca 68a600f679 finish converting last lodepng calls to libpng 2015-12-30 13:36:14 +00:00
IntelOrca cabd0fdc3a use image_io_png_write in cmdline_sprite 2015-12-30 13:36:14 +00:00
IntelOrca 00e5c4418d refactor image IO to new source file 2015-12-30 13:36:09 +00:00
Michał Janiszewski 9321c53b87 Enable libpng on Linux builds 
Lodepng is still available.
 2015-12-30 13:34:51 +00:00
IntelOrca 8ae43fd0ff use libpng for screenshots 2015-12-30 13:34:51 +00:00
sangch.go fce5eab9d8 Refactored code. bugfix and more define. 2015-12-30 17:13:00 +09:00
sangch.go 94d5eb86c8 Applied enum value to ride type flags. 2015-12-30 13:56:56 +09:00
Alex Bahm 2c7f0d6ae2 Improved mechanic selection for broken rides 
Switch to using manhattan distance to calculate distance. Also changed
starting closestDistance to UINT_MAX and removed ternary check because it is not needed.
 2015-12-29 13:51:30 -08:00
Michał Janiszewski 36de7a9027 Fix warnings 
Some off-by-one errors, truncation warning fix, main() in posix.c no
longer a stub.
 2015-12-29 16:09:36 +01:00
duncanspumpkin ac0d729baf implement sub_6DA280 2015-12-29 12:06:11 +00: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
Ted John f83d60e30d Merge pull request #2573 from janisozaur/cmake-mingw 
Fix CMakeLists for MinGW cross-compilation
 2015-12-28 19:01:30 +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
Michał Janiszewski 6a5fc90cd4 Fix CMakeLists for MinGW cross-compilation 
This makes sure that shared library built with MinGW toolchain is linked
statically to *all* its dependencies, including libc, libstdc++, libsdl2
and all the others. This allows producing of working `openrct2.dll` by
cross-compiling.

I hit a bug with libcrypto, a dependency of libssl, which in turn is a
dependency of curl, which creates a `DllMain` entrypoint for static lib
too, but since we don't do anything in ours, this should be safe.

I have only had chance to try it out when cross-compiling, ideally it
should be tested under Cygwin/MSYS too, but it is too bothersome to
setup for me.
 2015-12-28 01:17:28 +01:00
LRFLEW 50a1f588ec Disable chain button on steep slopes that cannot have one 2015-12-27 17:31:43 -06:00
Ted John c4dcd7d3fe Merge pull request #2570 from HaasJona/fixrefactor 
Fix memset
 2015-12-27 20:22:12 +00:00
Michał Janiszewski 184b375dcb Fix XP compatibility after #2546 
8bdec9f68 (#2546) introduced call to SHGetKnownFolderPath which is only
available on Vista and later operating systems, but eda733165 restored
previous hard-coded functionality for MinGW. Use the same for XP
support.

According to
https://tedwvc.wordpress.com/2014/01/01/how-to-target-xp-with-vc2012-or-vc2013-and-continue-to-use-the-windows-8-x-sdk/
it should work.
 2015-12-27 20:34:04 +01:00
Jonathan Haas dfd6cfef87 Fix incorrect memset 2015-12-27 20:33:04 +01:00
Duncan 1c41b513b4 Merge pull request #2561 from HaasJona/refactor 
Refactor Ride Customer History
 2015-12-27 17:52:52 +00:00
Jonathan Haas cf67177a08 Extract ride data array, use memset for zeroing array 2015-12-27 18:42:32 +01:00