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

11489 Commits

Author SHA1 Message Date
Ted John afb85fa3d7 Fix warning in cmdline_sprite.c 2017-05-07 01:01:06 +01:00
X7123M3-256 b0bf1c9d7c Add missing file 2017-05-07 01:01:06 +01:00
X7123M3-256 3131e883f4 Correct filenames 2017-05-07 01:01:06 +01:00
X7123M3-256 c2a1cf8b45 Remove old files from repository 2017-05-07 01:01:06 +01:00
X7123M3-256 4214781430 Give sprites meaningful names 2017-05-07 01:01:06 +01:00
X7123M3-256 e3ec934cc5 Remove redundant IDs 2017-05-07 01:01:06 +01:00
X7123M3-256 2769550415 Fix more indentation 2017-05-07 01:01:06 +01:00
X7123M3-256 1a32c73681 Format JSON file 2017-05-07 01:01:05 +01:00
X7123M3-256 5e7ca2207e Fix indentation 2017-05-07 01:01:05 +01:00
X7123M3-256 aaf16a7ec5 Amend usage message 2017-05-07 01:01:05 +01:00
X7123M3-256 92c8da4091 Use 16 bit integers for offsets 2017-05-07 01:01:05 +01:00
X7123M3-256 7a04cf05f7 Remove redundant paths 2017-05-07 01:01:05 +01:00
X7123M3-256 96856028bb Fix misplaced characters 2017-05-07 01:01:05 +01:00
X7123M3-256 f12889c625 Add JSON file to resources/g2 2017-05-07 01:01:05 +01:00
X7123M3-256 4d46a255e0 Load sprite information from JSON file 2017-05-07 01:01:05 +01:00
X7123M3-256 3b12e4cc66 Add function to get an absolute path from a relative one 2017-05-07 01:01:05 +01:00
X7123M3-256 e496271859 Add apparently missing commands to this list 2017-05-07 01:01:05 +01:00
X7123M3-256 942ea5be4b Fix segfault when entered command doesn't exist 2017-05-07 01:01:05 +01:00
X7123M3-256 424bb406c3 Add support for x/y offsets to append command 2017-05-07 01:01:05 +01:00
Richard Jenkins f2debcee44 Fix #4748: No way to see owned rights after #4701 
This partially reverts #4701 - the land rights button in the park window will always be visible, and if no construction rights are available to buy, all owned rights will be displayed.
 2017-05-06 22:53:19 +01:00
Richard Jenkins f9117d100a Fix #5440: Autosaves in landscape folder aren't cleaned up 2017-05-06 22:52:51 +01:00
Richard Jenkins e2f51d314d Fix #5440: Autosaves in landscape folder aren't cleaned up 2017-05-06 21:32:13 +01:00
Michał Janiszewski c9eb2bdf77 Update version information in CMakeLists.txt 2017-05-06 20:43:54 +02:00
Richard Jenkins fc873f2ce0 Fix #4748: No way to see owned rights after #4701 
This partially reverts #4701 - the land rights button in the park window will always be visible, and if no construction rights are available to buy, all owned rights will be displayed.
 2017-05-06 19:14:04 +01:00
Ted John b703520311 Merge pull request #5336 from IntelOrca/refactor/nosdl/phase-0 
Remove SDL2 dependencies: Phase 0
 2017-05-06 18:07:42 +01:00
zaxcav 268f6d9ac0 Minor improvements to the path finding debugging (#5443) 2017-05-06 15:51:47 +01:00
OpenRCT2 git bot 1dffe4ea3f Merge Localisation/master into OpenRCT2/develop. 2017-05-06 04:00:22 +00:00
Michał Janiszewski 04b4ae429e Fix platform_get_ticks for POSIX 
Previously it did not include seconds
 2017-05-05 22:25:47 +02:00
Michał Janiszewski e103a90d59 Update network version in wake of 14ec639 2017-05-05 21:21:58 +02:00
Richard Jenkins 14ec639b47 Fix #5433: Strange Umbrella Pricing Bug 
Secondary shop item pricing was being overwritten by on-ride photo price when placing shop. (#5436)
 2017-05-05 18:08:02 +01:00
Michał Janiszewski a25ce1e646 Make Network::server_connection dynamically instantiated 2017-05-05 16:54:44 +02:00
Michał Janiszewski 03d1115425 Fix macOS version detection macros again 2017-05-05 10:37:41 +02:00
Michał Janiszewski 7fc9bf62ce Fix macros detecting macOS version 2017-05-05 08:46:03 +02:00
OpenRCT2 git bot 6e7ce919f7 Merge Localisation/master into OpenRCT2/develop. 2017-05-05 04:00:22 +00:00
Richard Jenkins 28eb5fb279 Move mach_timebase_info init to core_init() 2017-05-05 00:40:07 +01:00
Michał Janiszewski 599af1c410 Fix object entry empty check (#5435) 2017-05-05 00:02:30 +01:00
Richard Jenkins f8b79a4a3f Cache mach_base_info 2017-05-04 22:33:32 +01:00
Richard Jenkins 3d6f13da13 Whitespace fix 2017-05-04 22:10:00 +01:00
Richard Jenkins e1d964cb26 Implement platform_get_ticks() for macOS <10.12 2017-05-04 22:00:25 +01:00
Richard Jenkins 6e443343a8 Update macOS deployment target to OS 10.8 2017-05-04 19:35:23 +01:00
crorabaugh2015 44175b8b38 Fixes issue 5288 - updated intro.c (#5425) 2017-05-04 18:23:27 +01:00
Ted John ac2eb8b5da Fix FileStream for macOS 2017-05-04 17:29:05 +01:00
Marijn van der Werf 6990762376 Update Xcode project 2017-05-04 17:29:05 +01:00
Michał Janiszewski 8e6ea776f6 Add time.h include to shared.c for clock_gettime 2017-05-04 17:29:05 +01:00
Ted John 4ba60cbf52 Replace SDLRW with fopen in interop.c 2017-05-04 17:29:05 +01:00
Ted John 80bdb25740 Change http.cpp to use std::thread 2017-05-04 17:29:05 +01:00
Ted John 08b3817272 Use C++ future, thread and chrono for TcpSocket 2017-05-04 17:29:05 +01:00
Ted John b8931bd503 Use C++ mutex instead of SDL for server_list.cpp 2017-05-04 17:29:05 +01:00
Ted John ec3652152a Quick port of server_list window to C++ 
So that C++ mutex can be used.
 2017-05-04 17:29:04 +01:00
Ted John 90596e0f54 Remove unnecessary SDL headers from NetworkTypes.h 2017-05-04 17:28:37 +01:00