mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 20:13:07 +01:00
Code Issues Releases Wiki Activity
5,893 Commits 8 Branches 59 Tags
44fdffd7e2040aec0b000ef770eff8401b17843b
Commit Graph

441 Commits

Author SHA1 Message Date
duncanspumpkin
2bd6dac20f Merge branch 'develop' into vehicle-update 
Conflicts:
 openrct2.vcxproj
 2016-01-10 08:57:41 +00:00
Gymnasiast
03c35ab0b6 Don't remove walls when raising/lowering land/water, fixes #2681 2016-01-09 23:46:08 +01:00
Michał Janiszewski
133096cd64 Merge branch 'develop' into vehicle-update 2016-01-05 09:59:53 +01:00
Michał Janiszewski
9c4cf14069 Game commands hardening 2016-01-04 22:03:28 +01: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
Duncan
5b9a98a0f9 Merge pull request #2588 from HaasJona/refactor2 
Refactor peep code
 2016-01-01 22:22:18 +00: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
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
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
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
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
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
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
LRFLEW
e6f771ec90 Added newlines at end of files 2015-12-20 22:03:37 -06:00
IntelOrca
c2c41ec118 implement steam_particle_create 2015-12-20 12:50:33 +00:00
LRFLEW
d769a13206 Fixed extern and enum name usage 2015-12-16 14:48:27 -06:00
duncanspumpkin
c00669c942 Merge sub_6DAB4C into vehicle-update 2015-12-14 21:56:00 +00:00
IntelOrca
4f56709455 implement more sub_6DAB4C 2015-12-14 15:18:19 +00:00
Duncan
0604068aac Merge pull request #2440 from LinusU/world-map-fixes 
small fixes to world/map.c
 2015-12-13 21:27:40 +00:00
Linus Unnebäck
017899c0d9 small fixes to world/map.c 2015-12-13 21:45:58 +01:00
Kyle Kirbatski
4f03530e48 Clean up instances of 0x.. & 0x.. to 0x.., 0x.. 2015-12-12 14:08:09 -06: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
duncanspumpkin
a059f87805 Implement more of cableLift update 2015-12-05 12:05:15 +00:00
duncanspumpkin
ec5121b3f6 Implement vehicle crash on water. Fix small particle issues 
Requires a change in rand() implementation.
 2015-12-05 10:49:09 +00:00
Duncan
396e6f8fee Merge pull request #2297 from osconnoisseur/decompile-map_set_land_height 
Decompilation of map_set_land_height
 2015-11-30 20:35:50 +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
duncanspumpkin
843999997b Fix #2375. Issue caused by invalid z coordinate for invalidate. 
Also fixed a couple other functions which were calling with the incorrect z value
 2015-11-27 19:17:35 +00:00
duncanspumpkin
691aec5035 Fix #2381. Map animation invalidate now called during pause mode 
This was causing the number of map animations to skyrocket as there was no way to remove animations caused by ghosts. This shouldn't progress the animation only remove invalid animations.
 2015-11-27 18:40:37 +00:00
duncanspumpkin
119ca58cc7 Add check to prevent exceeding the maximum number of animations. Probable cause of #2381 2015-11-27 18:01:45 +00:00
duncanspumpkin
83d183954a Fix #2337. Fixed footpath placements with walls. 2015-11-24 20:10:03 +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
duncanspumpkin
e05475cb38 Fix #2342. Accidentally disabled pause mode building for large scenery 2015-11-18 22:32:23 +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
duncanspumpkin
6d3eaafe2f Fix #2327. Fix no entry signs. 
Issue was caused by mistakenly not stopping searching for tiles after finding the correct one. Mistake made during refactoring
 2015-11-17 19:04:43 +00:00
Dom Light
b9d48d2f9b Document audio.h 2015-11-17 01:05:22 +00:00
Dom Light
3a8b25a0ee Sanitize audio.h 2015-11-17 01:05:14 +00:00
duncanspumpkin
c1ed727067 Fix #2305. Fences now build correctly with shift. 
Issue was caused by failing to reinitialise a variable and reusing a variable name for two different purposes. It has been fixed by nameing the variable and also initialising it.
 2015-11-16 20:19:58 +00:00
U-ASUS-EEEPC\Cameron Hall
da79f706f3 Hoist gCheatsDisableSupportLimits check outside of loop 2015-11-16 12:09:11 -06:00
zsilencer
292b67874f Fix #2311. Water no longer is able to be raised above existing map elements. 2015-11-16 10:38:20 -07:00
Cameron
763a5f2938 Restore newline at end of file 2015-11-15 15:50:36 -06:00