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

4381 Commits

Author SHA1 Message Date
IntelOrca f0100a71a7 use windows lean and mean to reduce definition conflicts 2015-08-29 13:13:22 +01:00
Ted John 09f411364e Merge pull request #1856 from Gymnasiast/editor-hide-network-button 
Don't show the Network status toolbar button in the Editors
 2015-08-28 22:37:53 +01:00
Gymnasiast 20c7267b53 Don't show the Network status toolbar button in the Editors 2015-08-28 23:27:31 +02:00
IntelOrca 7a4c418d9e fix #1487 2015-08-28 17:55:50 +01:00
Ted John cfecc817f2 Merge pull request #1853 from Gymnasiast/fix-banner-count 
Add a console option to fix the banner count, fixes #667
 2015-08-28 12:35:05 +01:00
Ted John 0c3fd7cd2f Merge pull request #1851 from Gymnasiast/network-button 
Move network button to first group and adjust colours, fix debug menu colours, closes #1850
 2015-08-27 17:17:12 +01:00
Duncan 8b7c593bb5 Merge pull request #1852 from Gymnasiast/addresses-and-strings-cleanup 
Name some addresses, clean up strings ids and usage, closes #515
 2015-08-27 17:15:47 +01:00
Gymnasiast e9b5282486 Add a console option to fix the banner count, fixes #667 2015-08-27 17:24:23 +02:00
Gymnasiast 4d7a81bfe0 Remove unnecessary duplicate address, use more string constants 2015-08-27 16:44:18 +02:00
Gymnasiast 592b6f578d Fix oversight in string order 2015-08-27 16:27:05 +02:00
Gymnasiast 308b086c55 Name some addresses, clean up strings ids and usage 2015-08-27 16:19:17 +02:00
Gymnasiast cc705d9a1f Move network button to first group and adjust colours, fix debug menu colours 2015-08-27 13:27:46 +02:00
Ted John 3375f3d43b Merge pull request #1845 from Gymnasiast/fix-ride-construction-crash 
Fix crash when attempting to build a new ride when having the Ride construction window open, fixes #1844
 2015-08-25 18:15:59 +01:00
Gymnasiast 4733979df5 Fix crash when attempting to build a new ride when having the Ride construction window open, fixes #1844 2015-08-25 19:08:17 +02:00
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