mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 22:34:33 +01:00
Code Issues Releases Wiki Activity
13,174 Commits 8 Branches 59 Tags
8ffe7d5b43b2126e0f94ffa643b139c5c6c2df88
Commit Graph

13174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Enrico Paganin
8ffe7d5b43 Refactor maze flags 2017-11-17 17:03:57 +01:00
Enrico Paganin
27b420374e Refactor path flags 2017-11-17 17:03:57 +01:00
Enrico Paganin
c2bf44ab1b Refactor scenery flags 
Every SCENERY_GHOST_FLAG_X is connected with its respective
SCENERY_TYPE_xxx flag
 2017-11-17 17:03:57 +01:00
Enrico Paganin
94bdfb0e43 Refactor marketing.h flag 2017-11-17 17:03:57 +01:00
Enrico Paganin
95e75c4575 Refactor colour.h flags 2017-11-17 17:03:57 +01:00
Michael Steenbeek
e23c10863e Fix tile element type confusion 2017-11-17 14:20:49 +01:00
Michael Steenbeek
470c9993fa Fix calling wrong function 2017-11-17 13:10:58 +01:00
Michael Steenbeek
3bd68947b9 Create functions for getting large scenery type and sequence 2017-11-17 12:56:08 +01:00
Michael Steenbeek
9a4021996f Remove unnecessary comment 
[ci skip]
 2017-11-17 12:54:47 +01:00
Michael Steenbeek
e12de39407 Fix include 2017-11-17 12:54:47 +01:00
Michael Steenbeek
dd6257af1e Tackle the two residual usages of the colour property 2017-11-17 12:54:47 +01:00
Michael Steenbeek
268851aa87 Fix testpaint 2017-11-17 12:54:47 +01:00
Michael Steenbeek
3cf8da184d Create tile_element_get_ride_index() 2017-11-17 12:54:47 +01:00
Michael Steenbeek
99830ed069 Add track_cable_lift functions to compat.c 2017-11-17 12:54:47 +01:00
Michael Steenbeek
a5dee3a0ae Add track_element_[sg]et_type to compat.c 2017-11-17 12:54:47 +01:00
Michael Steenbeek
60d5d5ca1e Cleanup 2017-11-17 12:54:47 +01:00
Michael Steenbeek
f448d16707 Add methods for getting and setting track element type 2017-11-17 12:54:47 +01:00
Michael Steenbeek
5a7ace134f Apply changes to Testpaint 2017-11-17 12:54:47 +01:00
Michael Steenbeek
953d6840f4 Fix some missed occurrences 2017-11-17 12:54:47 +01:00
Michael Steenbeek
ab3f42f1f9 Add getters and setters for ride index and maze entry 2017-11-17 12:54:47 +01:00
Michael Steenbeek
74209c7282 Move track tile element functions to Track.cpp 2017-11-17 12:54:47 +01:00
Aaron van Geffen
13f99e495e Reduce console verbosity for TTF loading. 2017-11-17 10:31:26 +01:00
Michael Steenbeek
a292917e50 Compile mapgen.c as C++ 2017-11-17 10:22:54 +01:00
OpenRCT2 git bot
36236d8c97 Merge Localisation/master into OpenRCT2/develop. 2017-11-17 04:00:43 +00:00
TELK
d6131ed062 Fix #6547: logging does not work if server contains CJK characters (#6565) 2017-11-16 23:02:37 +00:00
Mike Slone
aca7048377 Fix #6293: Screenshot sound not played when the game is paused (#6429) 
Stop all sounds when pausing the game, but allow new sounds to play.
This allows interface sounds to function while paused, which fixes #6293.
 2017-11-16 23:02:16 +00:00
Ted John
271f15328b Merge pull request #6329 from JeroenDStout/railway-crossings-fix-clip 
Fix railway/path clipping when on same height
 2017-11-16 23:00:40 +00:00
Michał Janiszewski
63e246938f Make sure PORTABLE option is honoured globally 2017-11-16 23:08:03 +01:00
Ted John
f36cffc98a Fix running headless instances 
colours_init_maps was not blocked when running in headless mode.
 2017-11-16 21:53:34 +00:00
Ted John
d649a3e8b4 Merge pull request #6631 from sajattack/develop 
replace flock with fcntl for better os compatibility
 2017-11-16 20:28:24 +00:00
Ted John
f7c7a5bace Fix build 2017-11-16 19:11:10 +00:00
Ted John
6b5ad0cf73 Fix alignment in sprites.h 2017-11-16 19:06:19 +00:00
Jeroen D Stout
deb37a8de8 Add missing 3-tile turn piece 2017-11-16 19:04:08 +00:00
Jeroen D Stout
0c1265aba3 Add sprites to sprite index 2017-11-16 19:04:08 +00:00
Jeroen D Stout
f8b4ee2602 Add gravel / grooved track painting behaviour to miniature railway 2017-11-16 19:04:08 +00:00
Jeroen D Stout
c6d548cc36 Increase bouding box z of peeps 2017-11-16 19:03:14 +00:00
Jeroen D Stout
b207826e56 Increase bounding box z of litter 2017-11-16 19:03:14 +00:00
Jeroen D Stout
afab2bd51f Change path bounding box when intersecting with track 2017-11-16 19:03:14 +00:00
Jeroen D Stout
3410330bb2 Add paint session memory for tracks and paths 2017-11-16 19:02:28 +00:00
Jeroen D Stout
95997ae78e Update sprites json 2017-11-16 18:59:25 +00:00
Jeroen D Stout
43e7eb8623 Add sprites 2017-11-16 18:59:25 +00:00
Ted John
b5137b0e37 Merge pull request #6574 from IntelOrca/protect-g1-access 
Refactor g1 access
 2017-11-16 18:51:32 +00:00
Michał Janiszewski
0f3b6b1590 Explicitly mention the expected root directory for discord-rpc 
[ci skip]
 2017-11-15 22:39:47 +01:00
Michał Janiszewski
0b5a067bbc Update changelog with Linux support for Discord Rich Presence 
[ci skip]
 2017-11-15 22:38:10 +01:00
Michał Janiszewski
45421d6a4c Update gitignore 2017-11-15 22:32:51 +01:00
Michał Janiszewski
8ec5f3ae82 Move FORCE32 option to top-level CMakeLists.txt 2017-11-15 22:32:51 +01:00
Michał Janiszewski
a9179fff52 chmod whole build directory on Travis 2017-11-15 22:32:51 +01:00
Michał Janiszewski
8f50660ad6 Use proper paths for discord-rpc in cmake 2017-11-15 22:32:51 +01:00
Michał Janiszewski
7612c2881d Add some discord-rpc logging to cmake 2017-11-15 22:32:51 +01:00
Michał Janiszewski
8f3434d084 Add discord-rpc support to Linux 2017-11-15 22:32:51 +01:00