Commit Graph

  • 47ca2c4c59 Merge branch 'fix_2284' of https://github.com/Overv/OpenRCT2 into pre-release-0.0.3 duncanspumpkin 2015-11-11 19:21:26 +00:00
  • 74cc03ac06 Fix title sequence script interpreter treating parameters as commands (fixes #2284) Alexander Overvoorde 2015-11-11 15:17:43 +01:00
  • fb6a90affa Merge pull request #2283 from janisozaur/abs Ted John 2015-11-11 08:10:56 +00:00
  • 2b02a04114 Use C++'s std::abs instead of C's to get floats Michał Janiszewski 2015-11-11 08:05:52 +01:00
  • 77699e99e5 Final fix of #2151. duncanspumpkin 2015-11-10 21:34:09 +00:00
  • 54ff0b2045 ride_with_colour_config_exists should ignore itself IntelOrca 2015-11-10 21:28:10 +00:00
  • c9de9aeee0 fix #2051, stop queue paths connecting to three different directions IntelOrca 2015-11-10 21:23:16 +00:00
  • 026dba0348 Fix issue with last commit. duncanspumpkin 2015-11-10 19:38:48 +00:00
  • 1e21c56e38 Merge pull request #2276 from duncanspumpkin/fix_1539 Ted John 2015-11-10 19:24:31 +00:00
  • e6c08fcdf4 Fix #1539. This is an alternative to @warp-10 's technique. duncanspumpkin 2015-11-10 19:04:36 +00:00
  • 1f08f092dd Fix #2273 duncanspumpkin 2015-11-10 17:23:38 +00:00
  • 207e8e8008 Merge Localisation/master into OpenRCT2/develop. Ted John 2015-11-10 04:00:19 +00:00
  • 5b37f8c810 Merge pull request #2266 from janisozaur/linux-memory-setup Duncan 2015-11-09 21:25:43 +00:00
  • 1bd665563b Improve memory setup for Linux Michał Janiszewski 2015-11-09 22:11:46 +01:00
  • efb30a8121 Fix #2037. Issue caused by reseting the zoom difference before too early. duncanspumpkin 2015-11-09 18:48:03 +00:00
  • 501d36b16c format top spin seat position offset array IntelOrca 2015-11-09 18:39:22 +00:00
  • 2ee1e05408 Implemented seatpositionoffset. duncanspumpkin 2015-11-09 17:39:49 +00:00
  • bcc7e2f5a1 Merge pull request #2147 from Overv/develop Duncan 2015-11-09 12:39:41 +00:00
  • 03cbb37d8a Merge Localisation/master into OpenRCT2/develop. Ted John 2015-11-09 04:00:16 +00:00
  • bbd5e6dbe3 Merge branch 'master-server-improvements' into develop IntelOrca 2015-11-08 23:50:59 +00:00
  • 09cd007f3f add dedicated flag to gameInfo IntelOrca 2015-11-08 23:50:38 +00:00
  • da6d382c47 make server heartbeat PUT IntelOrca 2015-11-08 23:29:52 +00:00
  • 3f00ec42f1 Replace trackPlaceZ RCT2_GLOBALs with define for clarity Alexander Overvoorde 2015-11-08 23:44:41 +01:00
  • 2e55495470 improve master server to POST json IntelOrca 2015-11-08 22:03:35 +00:00
  • 6114aa5dac Rename hmm variable to something more descriptive Alexander Overvoorde 2015-11-08 22:30:51 +01:00
  • b20a844982 Fix "land not owned" errors being overridden by "can't construct here" Alexander Overvoorde 2015-10-28 10:50:12 +01:00
  • d1a6b65049 Fix supports error appearing when building outside of owned land Alexander Overvoorde 2015-10-27 23:11:30 +01:00
  • c70880c0a5 Merge pull request #2251 from Broxzier/fix_filename Ted John 2015-11-08 19:04:45 +00:00
  • 20f21c6bf6 Delete colour.c Ted John 2015-11-08 18:57:55 +00:00
  • a24844a6ee Merge pull request #2247 from Gymnasiast/ride-entry-flag-15-and-17 Ted John 2015-11-08 18:57:03 +00:00
  • 48e3d70e57 refactor colour maps IntelOrca 2015-11-08 18:55:32 +00:00
  • 442cfef887 fix #2230, scroll bar colour issues IntelOrca 2015-11-08 17:31:46 +00:00
  • b929a27595 Fixed filenames with dots not being displayed completely. Hielke Morsink 2015-11-08 18:21:55 +01:00
  • 141705fe6b disable peep watching thought for multiplayer as its client specific IntelOrca 2015-11-08 15:14:36 +00:00
  • 12a6ec2fef stop desynchronisation when placing scenery, fixes #2111 IntelOrca 2015-11-08 15:01:30 +00:00
  • 6fe2340dfe stop clients from pausing multiplayer games IntelOrca 2015-11-08 14:32:22 +00:00
  • c557a54fdc Merge pull request #2248 from Gymnasiast/changelog Ted John 2015-11-08 14:10:12 +00:00
  • ab8edaca16 Update changelog Michael Steenbeek 2015-11-08 15:08:43 +01:00
  • 4ba83b0418 Rename RIDE_ENTRY_HIDE_LAST_OPERATING_MODE to RIDE_ENTRY_DISABLE_LAST_OPERATING_MODE Gymnasiast 2015-11-08 15:01:40 +01:00
  • e749c1a82c Identify RIDE_ENTRY_FLAG_15 and 17, fix 'Show all operating modes' cheat Gymnasiast 2015-11-08 14:55:01 +01:00
  • 40268878a0 Merge pull request #2245 from Gymnasiast/american-spelling Ted John 2015-11-08 12:49:49 +00:00
  • e1b67eeda0 improve command line version information and add headless check IntelOrca 2015-11-08 12:49:19 +00:00
  • 4855a53c22 Correct two instances of American spelling Michael Steenbeek 2015-11-08 13:11:36 +01:00
  • 7d51eb55e1 Merge pull request #2243 from Gymnasiast/rossija Ted John 2015-11-08 11:59:41 +00:00
  • 91edd322ae Merge pull request #2242 from Gymnasiast/more-currencies Ted John 2015-11-08 11:58:41 +00:00
  • 6e6637922a Merge pull request #2240 from Gymnasiast/fix-2125 Ted John 2015-11-08 11:57:20 +00:00
  • 6413052cbb Use language codes for Korean and Russian Gymnasiast 2015-11-08 12:49:25 +01:00
  • eed070bde0 Use string IDs for all currencies Gymnasiast 2015-11-08 12:41:55 +01:00
  • b7a09cca0c Adjust Arial placement and sizes Gymnasiast 2015-11-08 12:26:49 +01:00
  • ea5282f508 Add support for Russian Gymnasiast 2015-09-26 20:17:32 +02:00
  • 4e5b8a1a19 Add South Korean Won and Russian Rouble as currencies, closes #2222, also fix #2232 Gymnasiast 2015-11-08 11:46:11 +01:00
  • 7a510f76e2 Only play message sound in normal playing mode, fixes #2125 Gymnasiast 2015-11-08 11:07:35 +01:00
  • 251ee91bf6 Fix #2235 anti clockwise no longer crashes duncanspumpkin 2015-11-08 09:22:29 +00:00
  • d1c597aaa0 Merge pull request #2237 from Gymnasiast/water-colours Duncan 2015-11-08 09:09:17 +00:00
  • a1aa08b209 Fix #2231 Michael Steenbeek 2015-11-08 10:06:20 +01:00
  • 15f6f9b66a remove git merge seperator IntelOrca 2015-11-08 04:10:40 +00:00
  • 40a885f2c4 Merge branch 'zsilencer-network' into develop IntelOrca 2015-11-08 04:08:53 +00:00
  • d2aa736492 fix master server communication IntelOrca 2015-11-08 03:55:30 +00:00
  • 301c7f53c1 Merge Localisation/master into OpenRCT2/develop. Ted John 2015-11-08 04:00:17 +00:00
  • 0b9882b96f fix master server poll times IntelOrca 2015-11-08 02:22:49 +00:00
  • 782d3e63b2 add new master server functionality IntelOrca 2015-11-08 02:12:12 +00:00
  • 9bad4183a7 add default master server url and refactor IntelOrca 2015-11-07 23:56:16 +00:00
  • 74fe482a62 improve game info json IntelOrca 2015-11-07 23:47:50 +00:00
  • 1e9381ef97 master server list zsilencer 2015-11-03 16:31:09 -07:00
  • 9acfd27735 password prompt for client zsilencer 2015-11-01 20:12:14 -07:00
  • 3b639ced47 allow host to specify password #2072 zsilencer 2015-11-01 17:28:53 -07:00
  • d66eb70f56 fix potential overflow zsilencer 2015-11-01 14:28:01 -07:00
  • c7a85c5114 add desync debug checks for scenario_rand IntelOrca 2015-11-07 17:56:03 +00:00
  • 366e5ced03 Merge pull request #2220 from Gymnasiast/no-entrance-warning Ted John 2015-11-07 14:54:43 +00:00
  • c9808823a2 Add notice that 'No entrance' only works in OpenRCT2 Michael Steenbeek 2015-11-07 15:48:46 +01:00
  • 2d4b30756e add DEBUG preprocessor definition IntelOrca 2015-11-07 12:50:15 +00:00
  • 8d3655e0f6 fix #2162 Flukiestemperor 2015-11-07 12:22:44 +00:00
  • 5d0e88afa0 Merge pull request #2218 from duncanspumpkin/corrupt Ted John 2015-11-07 11:44:25 +00:00
  • 983436d425 Implemented a insert corrupt element button on the tile inspector duncanspumpkin 2015-11-07 10:04:57 +00:00
  • 10674fe439 Merge Localisation/master into OpenRCT2/develop. Ted John 2015-11-07 04:00:18 +00:00
  • 4df3d745a4 fix g2 msbuild call IntelOrca 2015-11-07 01:45:17 +00:00
  • 1d828591dc Fix post build event to work with CommandLineToArgvW duncanspumpkin 2015-11-06 19:40:39 +00:00
  • 6493c83efc Fix regression in last commit duncanspumpkin 2015-11-06 19:13:29 +00:00
  • 31ab7c8b98 fix several warnings IntelOrca 2015-11-06 18:50:37 +00:00
  • daf95940ac add warning message for two unstable cheats IntelOrca 2015-11-06 18:46:18 +00:00
  • 7366c87e2c Merge pull request #2196 from IntelOrca/custom-user-data-path Ted John 2015-11-06 18:35:38 +00:00
  • f68e307c06 Merge pull request #2211 from Gymnasiast/open-new-window Ted John 2015-11-06 18:35:30 +00:00
  • 13e2f8e9ed Fix #2210. Reverts from a0909a2 that cause the up button to load the same directory duncanspumpkin 2015-11-06 18:02:27 +00:00
  • db356290ba Merge pull request #2204 from janisozaur/language-check Duncan 2015-11-05 22:02:25 +00:00
  • 2d62c356c3 Early out and report error if langauge files are missing Michał Janiszewski 2015-11-04 18:11:10 +01:00
  • 70ef8d6777 add unicode support for windows command line arguments and resolve relative paths to absolute IntelOrca 2015-11-05 21:36:24 +00:00
  • 6684804e28 Fix small regression that caused a black screen when switching between hardware rendering duncanspumpkin 2015-11-05 21:22:08 +00:00
  • 599c259603 Fix #1749. Rainbow road graphical glitch. duncanspumpkin 2015-11-05 19:42:23 +00:00
  • ce06ee8681 Fix #1523. Water tool selection now the correct colour. duncanspumpkin 2015-11-05 18:02:21 +00:00
  • 68aea9740d Update english_uk.txt Michael Steenbeek 2015-11-05 14:43:06 +01:00
  • 4f68684e28 Merge pull request #2212 from HaasJona/loc Ted John 2015-11-05 13:38:04 +00:00
  • 3be79fd738 Fix screen location on resize/alt+tab Jonathan Haas 2015-11-05 10:16:13 +01:00
  • b3c8a1d2b7 Correct 'Open new window' Michael Steenbeek 2015-11-05 10:08:08 +01:00
  • 36b8c1ce98 Merge pull request #2193 from duncanspumpkin/fix_2082 Duncan 2015-11-04 19:43:58 +00:00
  • 0f14d33cc6 Merge pull request #2184 from duncanspumpkin/fix_2151 Duncan 2015-11-04 19:42:34 +00:00
  • 96a1f0c6f7 Refactor. duncanspumpkin 2015-11-04 19:28:45 +00:00
  • c3ec45b25f Add more entries to changelog. Ted John 2015-11-04 18:27:33 +00:00
  • e2ce5ee49e Merge pull request #2202 from HaasJona/fixrotation Ted John 2015-11-04 12:06:01 +00:00
  • 569a1f34cc Merge pull request #1993 from AaronVanGeffen/develop Duncan 2015-11-04 12:05:28 +00:00
  • 96d71ac174 Fix Bug #2201 Jonathan Haas 2015-11-04 12:51:00 +01:00