4273 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
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
zsilencer	73211b4215	fix chat window for new window code	2015-08-14 09:13:30 -06:00
zsilencer	f7be55eb9d	fix cmake compile errors ... fix cmake compile errors	2015-08-14 09:13:30 -06:00
zsilencer	f883e7a8da	get game commands working a bit better	2015-08-14 09:13:30 -06:00
zsilencer	802ccfd98e	allow multiple client connections	2015-08-14 09:13:30 -06:00
zsilencer	21334e307c	move chat window to separate file	2015-08-14 09:13:30 -06:00
zsilencer	6c571bab00	convert network to c++	2015-08-14 09:13:30 -06:00
zsilencer	df7f576e05	map loading over network	2015-08-14 09:13:29 -06:00
IntelOrca	99f2b87043	add chat feature	2015-08-14 09:13:29 -06:00
IntelOrca	196e6eb675	get basic network game working	2015-08-14 09:13:17 -06:00
IntelOrca	7e23d2d013	add basic server connection functions	2015-08-14 09:13:17 -06:00
Ted John	fd0b8adf3e	Merge pull request #1781 from Gymnasiast/reliability-anti-cheat ... Remove anti-cheat code that slashes reliability for hacked rides, fixes #1780	2015-08-14 13:58:06 +01:00
Ted John	80281e82ea	Merge pull request #1778 from Gymnasiast/patch-2 ... Mark former tutorial strings as unused	2015-08-14 13:57:15 +01:00
Gymnasiast	5a6b011d24	Remove anti-cheat code that slashes reliability for hacked rides, fixes #1780	2015-08-14 14:33:45 +02:00
Ted John	e9c8d03bd9	Merge Localisation/master into OpenRCT2/develop.	2015-08-14 04:00:15 +01:00
Ted John	65206f2f20	Merge pull request #1777 from Gymnasiast/inventions-in-debug-menu ... Rename finance_mark_loan_settings_as_legitimate() to finance_update_loan_hash()	2015-08-13 10:33:42 +01:00
Michael Steenbeek	5ee6d563d0	Mark former tutorial strings as unused	2015-08-13 10:40:37 +02:00
Gymnasiast	86bcbafc01	Rename finance_mark_loan_settings_as_legitimate() to finance_update_loan_hash()	2015-08-13 09:00:49 +02:00
Ted John	76df9b156a	Merge Localisation/master into OpenRCT2/develop.	2015-08-13 04:00:15 +01:00
Ted John	d368aa9941	Merge pull request #1773 from Gymnasiast/inventions-in-debug-menu ... Add Inventions List and Scenario Options to the Debug menu, closes #1770	2015-08-12 15:35:01 +01:00
Gymnasiast	d04d2f5069	Silently update invented items when using Inventions List in-game	2015-08-12 16:21:16 +02:00
Gymnasiast	e9637978a1	Fix cheat detection when using Scenario Options in-game, rename sub_69E869()	2015-08-12 16:12:34 +02:00
Gymnasiast	d01a53bd16	Add Inventions List and Scenario Options to the Debug menu	2015-08-12 15:31:52 +02:00
Ted John	e53aebc904	Merge pull request #1772 from Gymnasiast/refactor-map-window ... Refactor map window	2015-08-12 13:43:52 +01:00
Ted John	c6ba48f53e	Merge pull request #1771 from Gymnasiast/minimum-maximum-size-to-define ... Turn minimum and maximum tool sizes into defines	2015-08-12 13:43:25 +01:00
Gymnasiast	7db2008472	Fix minimum tool sizes	2015-08-12 14:24:20 +02:00
Gymnasiast	6ec3838b0b	Refactor map window	2015-08-12 14:23:13 +02:00
Gymnasiast	a0f75fbda2	Turn minimum and maximum tool sizes into defines	2015-08-12 14:07:16 +02:00
Ted John	16653b6f9f	Merge Localisation/master into OpenRCT2/develop.	2015-08-12 04:00:14 +01:00