mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-04 13:42:55 +01:00
Code Issues Releases Wiki Activity
11,473 Commits 8 Branches 58 Tags
d56dd24a2039b72ffc8a7be7a0d0686e40b141db
Commit Graph

11473 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
OpenRCT2 git bot
d56dd24a20 Merge Localisation/master into OpenRCT2/develop. 2017-05-12 04:00:21 +00:00
Richard Jenkins
d6b32591ae Implement guard function for decrementing guest counts 
* Implement guard function for decrementing guest counts

* Implement separate functions for incr/decr of peep count globals

* assert() on attempt to increment guest counts over UINT16_MAX

* Increase network version
 2017-05-11 18:31:29 +02:00
CraigCraig
58deb3a54a Grammar, readability, and spelling fixes 
[ci skip]
 2017-05-11 11:45:59 +02:00
Richard Jenkins
86d8863496 Fix #5456: Paths with non-ASCII characters mishandled on macOS (#5463) 2017-05-11 09:43:53 +02:00
xp4xbox
3331ab8a2d Make B&M booster fins rectangular 2017-05-10 22:05:05 +02:00
OpenRCT2 git bot
b83934da95 Merge Localisation/master into OpenRCT2/develop. 2017-05-10 04:00:24 +00:00
Ted John
faba009f24 Merge pull request #5072 from X123M3-256/g2_offsets 
Add support for x/y offsets in g2.dat
 2017-05-09 22:16:50 +01:00
Richard Jenkins
8d7fa07cba Update readme.md with RCT1 info 
[ci skip]
 2017-05-09 14:45:16 +01:00
OpenRCT2 git bot
787ddf811f Merge Localisation/master into OpenRCT2/develop. 2017-05-09 04:00:21 +00:00
Michael Steenbeek
a53b01d5b9 Remove magic numbers and Americanisms 2017-05-08 23:54:38 +02:00
Michał Janiszewski
bccedd3b1f Change network version after f9acdcb02 2017-05-08 23:52:03 +02:00
Richard Jenkins
563cd78ef7 Fix #5449: Underflow of gNumGuestsHeadingForPark in SC4 import 2017-05-08 23:49:02 +02:00
Ted John
f9acdcb02d Use callback mechanism in case server rejects command 2017-05-08 23:46:50 +02:00
Gymnasiast
2bb3a297b4 Do not close new campaign window when starting a campaign results in an error, fixes #4810 2017-05-08 23:46:50 +02:00
Richard Jenkins
1a20da3dfb Merge pull request #5452 from LucaRed/patch-1 
Add Italian language contributor
 2017-05-08 21:26:22 +01:00
Luca Andrea Rossi
bafae38eb8 Add Italian language contributor 2017-05-08 22:16:48 +02:00
Craig Craig
9dd820e2e7 Spelling fixes 2017-05-08 08:30:50 +02:00
OpenRCT2 git bot
4ab1289c83 Merge Localisation/master into OpenRCT2/develop. 2017-05-08 04:00:23 +00:00
Ted John
c4d2cd175d Use utf8 instead of char for platform_get_absolute_path 2017-05-07 19:17:11 +01:00
Ted John
e310956e81 Update command line help 2017-05-07 19:15:27 +01:00
Ted John
b789b17c14 Fix sprite building 2017-05-07 16:19:55 +01:00
Ted John
428a3d6569 Organise new sprites and add JSON 2017-05-07 16:19:35 +01:00
Ted John
ae3110e09d Remove exit call, probably no longer necessary 2017-05-07 01:01:07 +01:00
X7123M3-256
03606adbeb Fix more formatting 2017-05-07 01:01:07 +01:00
Gymnasiast
3d9e6a4e2d Fix formatting 2017-05-07 01:01:07 +01:00
Ted John
9a42edc695 Fix return of exit code 2017-05-07 01:01:07 +01:00
X123M3-256
52d2997a9f Fix more indentation 2017-05-07 01:01:07 +01:00
X123M3-256
dbfd898258 Correct sprite paths in project files 2017-05-07 01:01:07 +01:00
X123M3-256
dbd0067091 Remove logging 2017-05-07 01:01:07 +01:00
X123M3-256
edd830293c Correct path to sprite file 2017-05-07 01:01:07 +01:00
X123M3-256
7f74e07f2d Log path to sprite file 2017-05-07 01:01:07 +01:00
X123M3-256
7d2490710c Remove const 2017-05-07 01:01:06 +01:00
X123M3-256
d89fc32864 Use get_directory_path instead of dirname() 2017-05-07 01:01:06 +01:00
Ted John
7380c789e0 Implement platform_get_absolute_path for Windows 2017-05-07 01:01:06 +01:00
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