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

11996 Commits

Author SHA1 Message Date
Ted John 16d6ddd22b Remove unused code from SDL_ttf 2017-06-24 23:40:46 +01:00
Ted John 8046cbc707 Replace SDL2 calls 2017-06-24 23:31:40 +01:00
Ted John b7fd89361b Use complete SDL_ttf code 2017-06-24 23:13:07 +01:00
ZehM4tt efa0275104 Fix client not resuming when server toggles pause. 2017-06-24 23:30:53 +02:00
Michał Janiszewski 47b63620a1 Make Travis only do Android jobs when triggered from cron 2017-06-24 22:08:12 +02:00
wolfreak99 c80e782e67 Add default shortcut 2017-06-24 19:01:00 +02:00
wolfreak99 8364d8d3d8 Implement load game shortcut 2017-06-24 19:01:00 +02:00
camthesaxman c301e83a64 fix water rendering 2017-06-24 18:53:25 +02:00
Gymnasiast c9b5ec4172 Guard against NULL ObjectRepositoryItem, fixes #5614 2017-06-24 17:45:04 +02:00
Ted John 9ee1bbe4b5 Add some TTF code, poor 2017-06-24 14:50:30 +01:00
Ted John 2c07a55696 Refactor TTF into new source and remove SDL2_ttf 2017-06-24 14:50:30 +01:00
Michał Janiszewski 21e65934d6 Change number of launches in multilaunch test to 3 
[ci skip]
 2017-06-24 09:56:51 +02:00
Ted John b9e9ddfc1c Use more dependency injection 2017-06-24 09:56:51 +02:00
Ted John 3003393c87 Allow re-creation of object manager 
Removing lazy initialisation of it.
 2017-06-24 09:56:51 +02:00
Michał Janiszewski e2184f3e32 Exclude MultiLaunch test from appveyor run 2017-06-24 09:56:51 +02:00
Michał Janiszewski 6aa4722c22 Add MultiLaunch test 2017-06-24 09:56:51 +02:00
OpenRCT2 git bot 050ac3dee4 Merge Localisation/master into OpenRCT2/develop. 2017-06-24 04:00:23 +00:00
Gymnasiast 55977997fd Fix #1705: Time Twister's Medieval entrance has incorrect scrolling 2017-06-23 23:17:22 +02:00
Gymnasiast 2f51251273 Update changelog for #739 
[ci skip]
 2017-06-23 17:39:04 +02:00
Gymnasiast db091032cc Put .DAT fixes into their own method, fix max cars on the Crocodile Ride 2017-06-23 17:29:51 +02:00
Gymnasiast 234bedb8b8 Replace more occurences of vehicles per ride entry 2017-06-23 17:19:51 +02:00
Matte A a1c456f607 Fix clipping in text for some translations (#5692) 2017-06-23 09:54:05 +02:00
Gymnasiast 8561f3774e Raise friction cap on the Junior Roller Coaster to 18 2017-06-23 09:41:45 +02:00
Matte A 92426994af Giving the cheat "Own all land" a tool-tip 2017-06-23 08:18:45 +02:00
OpenRCT2 git bot f7937f56f0 Merge Localisation/master into OpenRCT2/develop. 2017-06-23 04:00:24 +00:00
RMcTn 92988a6020 Moved peep release balloon code into a function 2017-06-22 22:55:19 +02:00
Michael Steenbeek fef10c1f60 Clean up windows using land tools 2017-06-22 20:49:13 +02:00
Michael Steenbeek 1f00469b26 Replace free+null with SafeFree, allow freeing NULL 
free(NULL) is perfectly fine, no need to check
 2017-06-22 12:49:33 +02:00
OpenRCT2 git bot 14f9b221b3 Merge Localisation/master into OpenRCT2/develop. 2017-06-22 04:00:22 +00:00
ZehM4tt 81572e9592 Fix game crashing/freezing when kicking players in MP. 2017-06-21 12:02:37 +02:00
Gymnasiast 8ffe50728a Bump network version 2017-06-21 09:56:23 +02:00
Gymnasiast 16900dd618 Avoid booster speed overflows and undefined behaviour, fixes #5679 2017-06-21 09:54:54 +02:00
Gymnasiast 1f180c19b3 Clean up crooked house and top spin vehicle update 2017-06-21 09:54:53 +02:00
OpenRCT2 git bot 1d93ac5011 Merge Localisation/master into OpenRCT2/develop. 2017-06-21 04:00:25 +00:00
Gymnasiast 77481847ca Refactor Giga and Junior booster speed factor 2017-06-20 19:12:49 +02:00
Gymnasiast 176fe0d036 Replace OPENSSL_{malloc,free} with the standard C versions 2017-06-20 18:49:43 +02:00
Michał Janiszewski 9bfc9a91e3 Pre-emptively reset sprites on export for higher compression ratios (#5668) 
The sprites need to be reset anyway before they get used, so reset them
on every export just so they can be compressed better
 2017-06-20 16:34:04 +02:00
Gymnasiast 8b6ecc76d2 Clean up boosters 2017-06-20 14:24:10 +02:00
Gymnasiast 412332a3a5 Use constants for the max amount of stations and colour schemes in the rct_ride struct 2017-06-20 13:39:12 +02:00
Gymnasiast f2f8cec944 Clean up dropdowns 2017-06-20 13:38:51 +02:00
Gymnasiast 0db5bc6bd2 Define max vehicles per ride entry, use SPRITE_INDEX_NULL more 2017-06-20 13:38:23 +02:00
Gymnasiast d6488f34a8 Remove unused NUM_COLOURS 
It's the same as COLOUR_COUNT, which _is_ used
 2017-06-20 10:44:59 +02:00
Michał Janiszewski 5f1e62721a Merge pull request #5655 from janisozaur/gfxbench 
Add support for benchmarking park rendering
 2017-06-20 08:10:56 +02:00
OpenRCT2 git bot 97e6191851 Merge Localisation/master into OpenRCT2/develop. 2017-06-20 04:00:23 +00:00
Gymnasiast 53be8da368 Fix incorrect constant 2017-06-19 22:44:06 +02:00
Gymnasiast 5db6e5afa1 Use constants for number of marketing campaigns and expenditure table 2017-06-19 22:17:05 +02:00
Gymnasiast 65806a55db Create and use defines for the amount of surface and edge textures 2017-06-19 22:16:34 +02:00
Hielke Morsink d68bed10cd Readd call to network_process_game_commands (#5662) 2017-06-19 22:16:19 +02:00
ZehM4tt def76edd55 Ignore UI-only flag in sprite checksum 
Ignore peep.window_invalidate_flags in sprite checksum to prevent
false positivie desync alerts, flag does not affect game state.
 2017-06-19 17:42:51 +02:00
ZehM4tt 10740106f2 Fix causing asserts with DEBUG_DESYNC and loading new maps. (#5650) 
Moved input handling out of game_logic_update back to game_update,
should be executed per frame not tick.
Placed gInUpdateCode at the proper locations.
 2017-06-19 17:41:28 +02:00