Commit Graph

8801 Commits

Author SHA1 Message Date
Marijn van der Werf 7766faf00d Rename _curPixel to _currentLine 2016-09-01 13:13:07 +02:00
Marijn van der Werf 74eac21162 Dynamically allocate memory for map 2016-09-01 13:07:28 +02:00
Marijn van der Werf 2431930a8e Integrate map array 2016-09-01 00:22:41 +02:00
Marijn van der Werf 4e8e664e94 Integrate 0x00F1AD61 2016-08-31 21:12:07 +02:00
Michael Steenbeek 02c1db82af Fix assertion getting hit on valid path types 2016-08-31 17:58:58 +01:00
Michael Steenbeek 2d55356e6e Update .gitignore 2016-08-30 19:36:07 +01:00
Michał Janiszewski dd7bfdc529 Conditionally integrate pointer at 0xEE7880 2016-08-30 15:27:08 +01:00
OpenRCT2 git bot f2687eebb2 Merge Localisation/master into OpenRCT2/develop. 2016-08-30 04:00:22 +00:00
Ted John 5e30390f4a Set user agent for HTTP requests 2016-08-29 19:25:53 +01:00
Michał Janiszewski 344c480a0f Push Linux builds to Bintray
Seeing how Travis CI is unable to resolve their issue with connectivity,
I have added Bintray as alternative download location.
2016-08-29 18:39:11 +01:00
Gert-Jan Vercauteren 66eed2b9a1 Added network code to xCode project 2016-08-29 17:13:20 +01:00
Ted John 7e5c22145e Merge branch 'refactor/network-advertise' into develop 2016-08-29 15:40:28 +01:00
Ted John d73c2ba13c Wire up new advertiser class 2016-08-29 15:35:46 +01:00
Ted John a346d8a048 Add NetworkServerAdvertiser class 2016-08-29 15:35:46 +01:00
Ted John 6266e77fd5 Add tag to http request / response 2016-08-29 15:35:45 +01:00
Michael Steenbeek 8cb212dbf9 Properly fix #4348
PREMT1 obviously belongs to the LIM Launched RC, not to the non-existing ride 59.
2016-08-29 13:55:33 +02:00
Ted John d07102ecf9 Fix #4348: Crash upon opening rollercoaster tab
GetPreferedRideEntryOrder(...) did not define all 90 ride types. This caused said issue to happen when 'Select ride by track type (like in RCT1)' was enabled.
2016-08-29 11:53:34 +01:00
Ted John 4ee9c2c76f Fix count-rct-globals script for Windows 2016-08-28 21:19:55 +01:00
Marijn van der Werf 51137b1fb6 Add script to count globals in use 2016-08-28 17:34:06 +01:00
Ted John 89c9cc26c0 Fix #4342: x64 version crashes on ride window, station view 2016-08-28 17:24:51 +01:00
Ted John c586b887fd Fix warnings in crash.cpp 2016-08-28 17:19:13 +01:00
Ted John 12ef20ef31 Re-enable crash dumping 2016-08-28 17:17:20 +01:00
Michał Janiszewski 7b1c018f53 Improve architecture detection macros 2016-08-28 16:57:54 +02:00
Ted John 831936d134 Draw platform information on title screen 2016-08-28 15:15:07 +01:00
Ted John 17b69d257b Merge pull request #4097 from marijnvdwerf/clean/string-ids-2
Continue string ID cleanup
2016-08-28 14:05:13 +01:00
Michał Janiszewski f73794e093 Fix NO_RCT2 evaluation in hook.c 2016-08-28 10:31:53 +01:00
Ted John 76043d4050 Fix peep thoughts crashing on x64 2016-08-28 00:37:10 +01:00
Michael Steenbeek 7ebdec7e8f Implement flat-to-steep pieces and 25-to-60-degree lifts on the Junior rc 2016-08-27 23:36:36 +01:00
Ted John 8cf7e87b5c Fix many warnings for x64 2016-08-27 23:32:15 +01:00
Ted John 1f398a69ff Add platform to upload filename 2016-08-27 15:14:34 +01:00
Ted John 75dde0467f Add static modifier 2016-08-27 14:40:05 +01:00
Ted John 10ef3fdcc3 Fix use of uninitialised GIT_COMMIT_SHA1_SHORT in msbuild 2016-08-27 14:08:31 +01:00
Ted John 68fc6371ae Fix building g2.dat on x64 2016-08-27 14:05:25 +01:00
Ted John 94a31fe630 Set correct version text for upload filenames 2016-08-27 13:54:19 +01:00
Ted John 691995246f Use binary path for segment data, not working directory 2016-08-27 13:31:45 +01:00
Ted John d2cb3fa0b4 Merge pull request #4335 from OpenRCT2/new-msbuild-proj
Change Windows build configuration to msbuild and add x64 publish and deployment.
2016-08-27 13:13:23 +01:00
Michał Janiszewski 26d2e61fd8 Update readme.md with Linux packages information (#4336)
[ci skip]
2016-08-27 12:57:45 +02:00
Ted John a3e4bd1af4 Avoid signing when build has not changed 2016-08-26 19:06:44 +01:00
Ted John bd006de77b Fix appveyor deployment script 2016-08-26 18:50:52 +01:00
Ted John 4ea05cfb95 Use correct x64 flavour ids 2016-08-26 18:33:54 +01:00
Ted John c19437028d Move artifact upload to AppVeyor deploy 2016-08-26 18:29:42 +01:00
Ted John 6a367e2066 Improve artifact clean 2016-08-26 18:04:17 +01:00
Ted John 6654cdadfe Create segment data for x64 builds 2016-08-26 14:34:46 +01:00
Ted John a19d28a00c Remove obsolete NSIS build 2016-08-26 14:20:17 +01:00
Ted John ce7afb92fd Migrate update libs to msbuild project 2016-08-26 00:45:57 +01:00
Ted John f416da96f4 Update msbuild proj documentation
[ci skip]
2016-08-26 00:03:52 +01:00
Ted John ea2e5f3273 Update readme.md
[ciskip]
2016-08-25 23:58:43 +01:00
Ted John 76b0e3158b Delete obsolete scripts
[ciskip]
2016-08-25 23:49:59 +01:00
Ted John c86de10f3d Control what builds are uploaded 2016-08-25 23:38:48 +01:00
Ted John 0b2341ab8e Improve artifact building 2016-08-25 23:07:02 +01:00