mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 20:43:04 +01:00
Code Issues Releases Wiki Activity
5,669 Commits 8 Branches 59 Tags
5e6befe20b4cf39f8924b1c4c45522913be02aee
Commit Graph

4212 Commits

Author SHA1 Message Date
duncanspumpkin
5e6befe20b Fix 3D films only lasting 1 ticks time 2016-01-04 09:11:36 +00: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
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
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
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
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
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
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