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

3376 Commits

Author SHA1 Message Date
Ted John 6451f9d771 Merge pull request #1865 from Gymnasiast/fix-td4-river-rapids-colours 
Fix seat colour of TD4 River Rapids, fixes #1695
 2015-08-31 12:32:08 +01:00
Ted John 1cd2383a70 Merge pull request #1864 from Gymnasiast/fix-map-elements-generation 
Clear all map elements before generating a new map, fixes #1762
 2015-08-31 12:31:37 +01:00
IntelOrca 5508ba5874 fix #1841 2015-08-31 12:27:02 +01:00
Gymnasiast d49c99e020 Fix seat colour of TD4 River Rapids, fixes #1695 2015-08-31 13:23:52 +02:00
Gymnasiast 03034e7e2a Clear all map elements beforing generating a new map, fixes #1762 2015-08-31 12:42:46 +02:00
Ted John ce64c02872 Merge pull request #1863 from Gymnasiast/disable-vandalism-cheat 
Add cheat to disable vandalism
 2015-08-31 11:12:27 +01:00
IntelOrca 5f342eeb05 fix flag value 2015-08-31 11:11:02 +01:00
Gymnasiast 2ff3e33e3e Add cheat to disable vandalism 2015-08-31 11:13:19 +02:00
IntelOrca dd5d607724 fix typo 2015-08-31 00:41:58 +01:00
IntelOrca 401a389e73 fix #1843 2015-08-30 23:45:45 +01:00
IntelOrca 0c0847160d fix #1857 2015-08-30 22:57:29 +01:00
IntelOrca be3c54d266 fix #1859 2015-08-30 14:25:56 +01:00
IntelOrca bea74ee261 make all file IO utf8 compatible, fixes #1847 2015-08-29 13:13:23 +01:00
IntelOrca f0100a71a7 use windows lean and mean to reduce definition conflicts 2015-08-29 13:13:22 +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
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
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 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
Gymnasiast 11fa6bbab7 Fill ride construction dropdown properly before drawing it, fixes #1793 2015-08-21 09:34:58 +02:00
LRFLEW 5d19c44e46 Fixed autosaves preventing saving before quitting dialog from appearing 2015-08-20 20:57:09 -05: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
zsilencer 720076acb5 fix cmake error 2015-08-19 22:59:55 -06: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
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
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
medsouz 4207b41855 Name more addresses 2015-08-18 23:53:24 -04:00
Michał Janiszewski fc533c92c4 Add switch to disable network at compile-time 2015-08-19 01:47:33 +02:00
Gymnasiast 59202f97f8 Make the string for 'Default audio device' translatable, fix comment 2015-08-18 21:55:04 +02:00
Ted John 4ee28af18c Merge pull request #1816 from Gymnasiast/allow-incorrect-checksum 
Add option to allow loading scenarios with an incorrect checksum, closes #1790
 2015-08-18 19:52:46 +01:00
Gymnasiast 9c23414fbe Keep the same orientation as in the preview when placing track, fixes #1817 2015-08-18 18:22:23 +02:00
Gymnasiast e8cc1738ca Fix saving of feature 2015-08-18 15:49:16 +02:00
Gymnasiast 8cf34ca662 Add option the Options window, clean up some string ids in that window 2015-08-18 11:58:47 +02:00
Gymnasiast 4fa571a041 Add option to allow loading scenarios with an incorrect checksum 2015-08-18 10:47:31 +02:00
medsouz 958f2fb296 Document some scenery memory addresses 2015-08-17 23:05:46 -04:00
xperia64 a6043c6f78 Re-add PLUGIN.DAT 2015-08-17 20:48:18 -04:00
Ted John c5d2023a47 Merge pull request #1775 from Gymnasiast/obsolete-config-code 
Remove / comment out obsolete config code and unused file references
 2015-08-17 20:13:42 +01:00
IntelOrca 23fcefd7eb fix saving of servers 2015-08-17 08:13:39 +01:00
medsouz 3b845a67ed Add option for handymen to mow grass by default 2015-08-16 19:26:42 -04:00
medsouz 719b897936 Named addresses in staff.c globals 2015-08-16 18:37:57 -04:00
medsouz 02e2ebec9a Restore globals 2015-08-16 18:35:47 -04:00
medsouz 7071bd9353 Document more addresses 
Created defines for all the memory addresses I could find in peep/staff.c
and updated everywhere they're being used.
 2015-08-16 18:25:17 -04:00
Gymnasiast 99dd05176f Use a define the number of default music tracks 2015-08-16 22:26:17 +02:00
xperia64 4607659149 Rebase 2015-08-16 16:06:21 -04:00
xperia64 9af5f029aa Rebase 2015-08-16 16:04:21 -04:00
xperia64 a629de4666 Correct String IDs 2015-08-16 16:03:23 -04:00
xperia64 4733ea28c0 Add a cheat so guests ignore intensity and nausea ratings 2015-08-16 16:02:41 -04:00
medsouz 150fe74e4e Remove unused code 
0x009DEA5C is set but never read
0x009AAC73 is normally set to 0 when the screen resolution is changed to
delay saving the config. This is no longer neccesary in OpenRCT2
 2015-08-16 15:30:37 -04:00
Gymnasiast 6a23e28670 Refactored music file list, removed some extra unused code, clear up some comments 2015-08-16 21:29:10 +02:00
Gymnasiast fcb74d13b2 Get rid of unused file references, comment out unused obsolete config file code 2015-08-16 20:45:23 +02:00
Gymnasiast 4d81eb578e Remove long-disabled config code 2015-08-16 20:45:23 +02:00
xperia64 7a30f614a1 Correct String IDs 2015-08-16 14:16:45 -04:00
Ted John 5452eb9b73 Merge pull request #1798 from medsouz/documentaddresses 
Document various memory addresses
 2015-08-16 18:43:20 +01:00
IntelOrca 90bf4c6836 fix #1797 2015-08-16 18:42:30 +01:00
medsouz ca1a1e0ddd Document various memory addresses 2015-08-16 13:05:49 -04:00
IntelOrca 4f8e289e79 finish server list and fix a couple of multiplayer issues 2015-08-16 17:29:47 +01:00
IntelOrca 094cc19411 allow joining of servers in server list window 2015-08-16 16:37:08 +01:00
Ted John 43489db6a2 Merge pull request #1796 from Gymnasiast/chosen-name-in-use 
Add console option to reset all user strings
 2015-08-16 16:32:11 +01:00
Gymnasiast eeeb7927eb Reset ride names to their defaults when using reset_user_strings 2015-08-16 17:16:16 +02:00
IntelOrca a3450a4bf8 add loading / saving of servers 2015-08-16 15:27:21 +01:00
Gymnasiast 7449deeffe Add console option to reset all user strings 2015-08-16 15:31:59 +02:00
Gymnasiast c00e044b6c Multiplayer interface improvements, cleanup 2015-08-16 13:14:04 +02:00
IntelOrca f072440d18 add server list window (WIP) 2015-08-16 03:07:00 +01:00
IntelOrca 9746bccbf6 improve multiplayer 2015-08-15 23:19:15 +01:00
xperia64 a18dc9dc61 Add a cheat so guests ignore intensity and nausea ratings 2015-08-15 14:42:53 -04:00
IntelOrca 3f31221973 fix network merge issues, fix #1785 2015-08-14 22:06:15 +01:00
IntelOrca 90fcc6f18e only show desync on network games 2015-08-14 16:59:27 +01:00
zsilencer c1e802e361 fix text for utf8 2015-08-14 09:15:07 -06:00
zsilencer ad70dbb84c map load on join 2015-08-14 09:13:40 -06:00
zsilencer a4267990b8 detect desyncs 2015-08-14 09:13:40 -06:00
zsilencer 111a2e8198 fix another source of nondeterminism 2015-08-14 09:13:40 -06:00
zsilencer 5dab3be1d7 fix view position when loading map over network 2015-08-14 09:13:40 -06:00
zsilencer 3a26f56000 fix path placement for network 2015-08-14 09:13:40 -06:00
zsilencer 584b34e6d5 fix game_command_create_ride for network 2015-08-14 09:13:39 -06:00
zsilencer 3b4a4fcdac network status window 2015-08-14 09:13:39 -06:00
zsilencer 1d811a5692 improve chat feature 2015-08-14 09:13:39 -06:00
zsilencer 56f8954e27 fix clear scenery for network 2015-08-14 09:13:39 -06:00
zsilencer 04dedbcec4 fix scenery placement issue over network 2015-08-14 09:13:39 -06:00
zsilencer d772f8b5fb measure and display ping 2015-08-14 09:13:39 -06:00
zsilencer 7ccb0eb655 basic player list 2015-08-14 09:13:38 -06:00
zsilencer c0dc591152 refactor and add network authorization 2015-08-14 09:13:31 -06:00
zsilencer 71f20b44aa endian-safe packet streams 2015-08-14 09:13:30 -06:00
zsilencer 149b3d86af network refactoring 2015-08-14 09:13:30 -06:00