Gymnasiast
4fa571a041
Add option to allow loading scenarios with an incorrect checksum
2015-08-18 10:47:31 +02:00
Ted John
abe02bb408
Merge pull request #1811 from xperia64/develop
...
Re-add PLUGIN.DAT
2015-08-18 07:27:28 +01:00
Ted John
3a8dd25020
Merge Localisation/master into OpenRCT2/develop.
2015-08-18 04:00:15 +01: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
Ted John
e46cc379ab
Merge pull request #1803 from medsouz/handymenmowdefault
...
Add option for handymen to mow grass by default
2015-08-17 08:05:18 +01:00
Ted John
00ab8be6af
Merge Localisation/master into OpenRCT2/develop.
2015-08-17 04:00:16 +01:00
medsouz
3b845a67ed
Add option for handymen to mow grass by default
2015-08-16 19:26:42 -04:00
Ted John
006a25ec8a
Merge pull request #1801 from medsouz/documentaddresses
...
Document more addresses
2015-08-16 23:39:50 +01: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
Ted John
fb9f6be201
Merge pull request #1799 from xperia64/develop
...
Add a cheat so guests ignore intensity and nausea ratings
2015-08-16 21:13:51 +01: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
Ted John
3efb74e1c4
Merge pull request #1800 from medsouz/unusedcode
...
Remove unused code
2015-08-16 20:45:07 +01: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
Ted John
2ce8f53c00
Merge pull request #1794 from Gymnasiast/multiplayer-interface-improvements
...
Multiplayer interface improvements, cleanup
2015-08-16 15:15:03 +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
Ted John
905efcd412
Merge Localisation/master into OpenRCT2/develop.
2015-08-16 04:00:15 +01: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
IntelOrca
44b71240f4
Merge branch 'network' into develop
2015-08-14 16:52:40 +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