4567 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ted John	580a6c7388	Merge Localisation/master into OpenRCT2/develop.	2015-08-25 04:00:15 +01:00
Ted John	a3656b1e3a	Merge pull request #1842 from Gymnasiast/patch-3 ... Include naijim's real name	2015-08-24 19:40:20 +01:00
Michael Steenbeek	5a03da5f6f	Include naijim's real name	2015-08-24 19:55:50 +02:00
Ted John	55d0afa627	Merge pull request #1840 from Gymnasiast/patch-4 ... Fix spacing and typo	2015-08-24 17:19:55 +01:00
Michael Steenbeek	83d87fceb8	Fix spacing and typo	2015-08-24 13:36:14 +02:00
Ted John	306b9427cc	Update contributors.md	2015-08-24 12:21:48 +01:00
Ted John	43e2a88742	Update contributors.md	2015-08-24 12:21:01 +01:00
Ted John	6c27baef3b	Merge pull request #1839 from Gymnasiast/contributors ... Update translators in contributors file	2015-08-24 12:10:54 +01:00
Gymnasiast	d20af1444c	Update translators in contributors file	2015-08-24 11:38:27 +02:00
Ted John	2afd9b8a61	Merge Localisation/master into OpenRCT2/develop.	2015-08-24 04:00:17 +01:00
Ted John	972ae72d87	Merge Localisation/master into OpenRCT2/develop.	2015-08-23 04:00:15 +01:00
Ted John	6a88ca17d0	Merge pull request #1835 from medsouz/cleanupscenery ... Add names for all memory addresses in world/scenery.c	2015-08-22 17:43:28 +01:00
medsouz	e9269cb882	Finish naming scenery.c addresses	2015-08-22 12:03:40 -04:00
IntelOrca	745365ca69	implement crash particles	2015-08-22 16:39:24 +01:00
IntelOrca	3062bbf3b6	refactor balloon, duck and money effect	2015-08-22 12:11:20 +01:00
IntelOrca	1a877e637d	refactor sprite_invalidate	2015-08-22 11:56:32 +01:00
Duncan	8c2ea82a7e	Merge pull request #1832 from Gymnasiast/fix-special-dropdown ... Fill ride construction dropdown properly before drawing it, fixes #1793	2015-08-21 12:23:07 +01:00
Gymnasiast	11fa6bbab7	Fill ride construction dropdown properly before drawing it, fixes #1793	2015-08-21 09:34:58 +02:00
Ted John	ebf9a42956	Merge pull request #1831 from LRFLEW/save-prompt-fix ... Fixed autosaves preventing saving before quitting dialog from appearing	2015-08-21 07:30:07 +01:00
Ted John	3bfeddbee7	Merge Localisation/master into OpenRCT2/develop.	2015-08-21 04:00:16 +01:00
LRFLEW	5d19c44e46	Fixed autosaves preventing saving before quitting dialog from appearing	2015-08-20 20:57:09 -05:00
Ted John	415fac21e3	Merge pull request #1830 from Gymnasiast/update-gitignore ... Add build_nonet to .gitignore	2015-08-20 20:27:32 +01:00
Gymnasiast	903fba2747	Only build the nonet version if specified	2015-08-20 20:48:22 +02:00
Gymnasiast	27df537559	Use wildcard to include all differing build configurations	2015-08-20 20:05:18 +02:00
Ted John	32a46e699d	Merge pull request #1828 from Gymnasiast/fix-menu-saving ... Fix file menu for editor, restore menu order, add shortcut for quick saving	2015-08-20 18:19:00 +01:00
Gymnasiast	51b278c58a	Add build_nonet to .gitignore	2015-08-20 13:49:33 +02:00
Gymnasiast	f384a9cbf8	Remove test code	2015-08-20 13:23:07 +02:00
Gymnasiast	93d49e314e	Fix file menu for editor, restore menu order, add shortcut for quick saving	2015-08-20 12:13:08 +02:00
Ted John	c0ac3ba06d	Merge pull request #1826 from zsilencer/develop ... fix some multiplayer bugs	2015-08-20 07:30:00 +01:00
zsilencer	720076acb5	fix cmake error	2015-08-19 22:59:55 -06:00
Ted John	2500ee452e	Merge Localisation/master into OpenRCT2/develop.	2015-08-20 04:00:15 +01:00
zsilencer	7322307a04	fix issues with pausing in multiplayer	2015-08-19 20:34:52 -06:00
zsilencer	5bb3218d4c	make desync detection work again	2015-08-19 19:07:11 -06:00
zsilencer	abcd0afa9a	make setting player name actually work	2015-08-19 18:26:42 -06:00
zsilencer	be42f10d7a	fix crash in server_list_save_saved_servers	2015-08-19 18:13:38 -06:00
Ted John	4bcf0e67e6	Merge pull request #1824 from runelaenen/quicksave-save-as ... Easier saving	2015-08-19 23:16:49 +01:00
Runelaenen	2830cdd3a3	Capitalisation of 5512	2015-08-19 23:16:07 +02:00
Runelaenen	3b1708f1be	Wrong logging fixed	2015-08-19 23:09:54 +02:00
Runelaenen	6ec01c6d65	Changed localisation strings	2015-08-19 22:35:20 +02:00
Runelaenen	d34a446d61	Easier saving ... Replace Save game functionality and add 'save game as' function	2015-08-19 22:02:06 +02:00
Ted John	4e578aeaf2	Merge pull request #1823 from runelaenen/headless ... --headless	2015-08-19 18:32:11 +01:00
Runelaenen	fe0e1d1207	arguments	2015-08-19 18:10:08 +02:00
Runelaenen	fb5921db6d	First headless version	2015-08-19 18:07:04 +02:00
IntelOrca	408628c80c	fix building on VS	2015-08-19 07:47:21 +01:00
Ted John	d5cd9902f8	Merge pull request #1820 from janisozaur/disable_network ... disable network	2015-08-19 07:27:52 +01:00
medsouz	4207b41855	Name more addresses	2015-08-18 23:53:24 -04:00
Ted John	f836590a18	Merge Localisation/master into OpenRCT2/develop.	2015-08-19 04:00:15 +01:00
Michał Janiszewski	fc533c92c4	Add switch to disable network at compile-time	2015-08-19 01:47:33 +02:00
IntelOrca	d9fdb0950a	patch exe to remove DirectDraw, DirectInput and DirectPlay dependencies.	2015-08-18 21:32:21 +01:00
Ted John	f20d1c7110	Merge pull request #1819 from Gymnasiast/audio-device-translatable ... Make the string for 'Default audio device' translatable, fix comment	2015-08-18 21:07:38 +01:00