mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 00:04:43 +01:00
Code Issues Releases Wiki Activity
6,230 Commits 8 Branches 59 Tags
2276bfff331bae2cdb507fa44094ab08022b3783
Commit Graph

4632 Commits

Author SHA1 Message Date
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
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
Jonathan Haas
bb01732f74 Fix indentation 2015-12-27 13:06:18 +01:00
duncanspumpkin
f7520fd2ba implement vehicle_update_motion_collision_detection 2015-12-27 11:46:15 +00:00
Jonathan Haas
cf78b28adf Use memmove for shifting 
Use memmove for shifting the customer history, rename ride fields, and add back the offset comments.
 2015-12-27 10:45:11 +01: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
Tomáš Pazdiora
6ac38a6382 fixed bug in "Fix #2158" 
which caused (if fullscreen was set) starting game in desktop resolution instead of selected fullscreen resolution.
 2015-12-26 23:48:05 +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
2dfc43b8e8 close #2382: Don't suppress drown messages in Six Flags scenarios 2015-12-26 17:34:14 +00: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
3b5768f5bc print '(debug)' to version string when build in debug configuration 2015-12-26 17:23:27 +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
Jonathan Haas
2ed4802032 Fix and replace some StringIDs 
Create some additional named StringIDs.
Fix a broken condition for tracked peep notifications, as the in/on ride messages were reversed.
 2015-12-26 14:50:03 +01: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
Ted John
de52321026 Merge pull request #2557 from janisozaur/max-path 
Use MAX_PATH define for path length, remove redefinition
 2015-12-26 10:54:19 +00:00
Ted John
34ab8c0d62 Merge pull request #2546 from AaronVanGeffen/fontdirs 
Proper font support for Linux and OS X
 2015-12-26 10:48:47 +00:00
Michał Janiszewski
6d5c96d083 Use MAX_PATH define for path length, remove redefinition 2015-12-26 11:18:44 +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
Michał Janiszewski
c0830ae02e Fix memory leaks in font selection for Linux 
Add some logging too, in particular warning when no font was found.
 2015-12-25 20:32:54 +01:00
Aaron van Geffen
eda733165e Added a hack for MINGW compatibility. 2015-12-26 01:00:34 +09:00
Aaron van Geffen
995799b843 Try Arial as a fallback font if a language's preferred font cannot be loaded. 2015-12-25 03:22:46 +09:00
Aaron van Geffen
474af5c204 Use Cocoa APIs for font detection on OS X. Moving FontConfig to Linux platform only. 2015-12-25 02:52:33 +09:00
Aaron van Geffen
8bdec9f68e Experimental: use SHGetKnownFolderPath to get font path on Windows. 2015-12-25 02:17:45 +09:00
Aaron van Geffen
dd604afc89 Use FontConfig to find suitable TrueType fonts on Linux and OS X. Fixes #2537. 2015-12-25 01:53:52 +09:00
Aaron van Geffen
a0de23758e Specify font name on all TTF descriptors. 2015-12-25 01:53:52 +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
f93a134aa6 fix map size error when sending network game information 2015-12-24 01:40:03 +00: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
duncanspumpkin
4c88609e7e Fix stretch backwards coasters 2015-12-23 11:57:50 +00:00
Michał Janiszewski
3ba9ec8c81 CMake updates for packaging on Linux 
This enables install and package targets for make.

You can specify installation prefix with -DCMAKE_INSTALL_PREFIX=path,
when doing `make install`, OpenRCT shall be found there.

You can also use `make package` for creating packaged release files.
 2015-12-22 22:47:44 +01:00
IntelOrca
0298ca38a0 improve project version defines and publish script 2015-12-22 17:46:20 +00:00
Ted John
48320419ea Merge pull request #2538 from janisozaur/vehicle-update-merge 
vehicle-update merge
 2015-12-22 16:24:38 +00:00
Michał Janiszewski
0903dda369 fixes for issues in vehcile-update 2015-12-22 17:00:21 +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
duncanspumpkin
7f68149516 Minor Refactor 2015-12-22 10:27:38 +00:00