1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Commit Graph

310 Commits

Author SHA1 Message Date
Ted John
c5899139d7 Move scenario sources to sub directory 2016-12-16 01:25:05 +00:00
Ted John
abc3835d7b Rename openrct2.c h to OpenRCT2.c h 2016-12-14 00:32:06 +00:00
Duncan
35472fe6e2 Fix #4819. Prevent peep queue loops when next_in_queue broken. 2016-12-12 09:33:55 +01:00
Yaroslav Tretyakov
51fcfe3379 Fix #4852: Clicking on the hook icon for a person does not return it to the original location (#4854) 2016-12-07 22:28:55 +01:00
Michał Janiszewski
1ae2ca54f7 Sort includes 2016-12-01 16:03:16 +01:00
Michał Janiszewski
54e622659d Extract common parts from rct2.h to common.h 2016-12-01 16:03:16 +01:00
Michał Janiszewski
7eb008b546 Ensure includes are used when needed 2016-12-01 09:09:15 +01:00
Michał Janiszewski
29a4277709 Refactor sawyercoding 2016-11-28 09:59:01 +00:00
Michael Steenbeek
7ac7c1e852 Increase network version to prevent desyncs due to 90dbcdb 2016-11-22 22:39:20 +01:00
Michael Steenbeek
ba1225cf6e Merge cheats in console, pathfinding improvements 2016-11-14 08:54:51 +01:00
Michał Janiszewski
3f7fd56328 Remove trailing whitespace in sources 2016-11-13 20:32:55 +01:00
Michał Janiszewski
00dd35481e Remove unused enum from network.cpp 2016-11-13 19:36:03 +01:00
Michael Steenbeek
418c542cba Increase network version 2016-11-13 12:31:30 +01:00
Michał Janiszewski
b30454366f Add note about possible improvement of object sending
[ci skip]
2016-11-11 18:38:23 +01:00
Michał Janiszewski
0793b3bc11 Fix #4755: Crash loading new map while running a server 2016-11-11 18:27:40 +01:00
Michał Janiszewski
867de18c96 Use json_is_true instead of json_boolean_value
This should lower required version of jansson, which would
let us use 2.5 in Trusty (current version in Travis-CI)

See https://github.com/akheron/jansson/issues/146
2016-11-09 13:19:12 +01:00
Michał Janiszewski
b164c2be61 Extract openrct2_assert to guard.h (#4753)
* Extract openrct2_assert to Guard.hpp

`openrct2_assert` is not defined in util.c and including all of
openrct2.h is unnecessary.
2016-11-06 21:02:25 +01:00
Michał Janiszewski
43a7e6b854 Add missing static keyword to template-ised functions (#4750)
This fixes building with ICC
2016-11-06 21:01:07 +01:00
Alexander Overvoorde
9be47d11ed Fix #4747: Fix available land rights not being recounted when using sandbox tools
This commit fixes the game command set_land_ownership missing a land
rights recount call. This would cause problems when the user changes
land ownership with the sandbox mode tools.
2016-11-04 22:51:35 +01:00
Michał Janiszewski
88ccfad303 Merge pull request #4615 from janisozaur/mediate-network-objects
Mediate network objects
2016-10-22 15:46:03 +02:00
zsilencer
e2e4201112 Validate peep game command which caused crash from invalid sprite index 2016-10-22 01:53:33 -06:00
Michał Janiszewski
18ff83fd6c Fix forward declaraction of ObjectRepositoryItem 2016-10-21 11:22:17 +02:00
Michał Janiszewski
8b5024a893 Update network version 2016-10-21 11:22:17 +02:00
Michał Janiszewski
194c9aed01 Refactor scenario_write_packed_objects and friends 2016-10-21 11:22:17 +02:00
Michał Janiszewski
65c6cd5412 Implement review suggestions 2016-10-21 11:22:17 +02:00
Michał Janiszewski
5ebc95e0b2 Mediate objects to send over from server 2016-10-21 11:22:17 +02:00
Michał Janiszewski
3a0e3c04e1 network send map refactor 2016-10-21 11:22:17 +02:00
zsilencer
d83df63acf Increment network version 2016-10-19 16:24:14 -06:00
zsilencer
541ae91d67 fix pickup commands to work with hiring staff 2016-10-18 13:40:50 -06:00
zsilencer
db3aa2b656 Add balloon popping as game command 2016-10-18 13:40:50 -06:00
zsilencer
d74efb23fe Add picking up peeps/staff as game command 2016-10-18 13:40:49 -06:00
Ted John
5b9f7904ea Update dependencies for Windows and remove certificates 2016-10-16 16:11:33 +01:00
wolfreak99
3ae63da9a5 More Reformatting 2016-10-12 17:54:13 -04:00
wolfreak99
5bd5310038 Refactor, remove temporary console logging 2016-10-12 17:05:19 -04:00
wolfreak99
bea3803917 Log IP address to console 2016-10-12 10:03:15 -04:00
Michał Janiszewski
7f9fa28995 Fix uninitialised variables 2016-10-09 22:43:07 +02:00
LRFLEW
e5ff7412e4 Refactor/Improve String and Path Handling 2016-10-09 15:29:58 -05:00
Duncan
b29be9bfeb Merge pull request #4527 from zaxcav/fixPathfindHistory
Further pathfinding improvements
2016-10-07 12:08:36 +01:00
Michał Janiszewski
9966052ca7 Fix more configurations 2016-10-06 23:32:10 +02:00
Michał Janiszewski
71d0861be1 Mark classes as final
This may hint compiler to de-virtualise some calls.
2016-10-04 18:14:29 +01:00
zaxcav
d447223535 Increase network version for pathfinding updates. 2016-10-04 12:32:06 +02:00
Ted John
8932707018 Don't show read groups.json error when it doesn't exist 2016-10-02 13:38:22 +01:00
Ted John
22c7cd4179 Improve bad error messages in multiplayer window
Set the title and text in the multiplayer commands to make sure it doesn't show an error box with the wrong text.
2016-10-02 12:28:28 +01:00
Michał Janiszewski
6a86f007f3 Fix #4437: Crash in Network::Server_Handle_AUTH 2016-09-19 19:25:00 +01:00
Marijn van der Werf
487d6d8f15 Remove unnecessary addresses.h imports 2016-09-17 20:59:55 +01:00
zsilencer
dfc100f15e Fix issue with kick message not being received 2016-09-14 15:48:15 -06:00
LRFLEW
e1b6319bc1 Fix Warnings in Xcode about Copy Elision 2016-09-13 18:07:40 -05:00
Ted John
b8e4f71ab1 Fix #4422: Save overwrite multiplayer
Make sure we reset gFirstTimeSave when we join a new game or exit to title screen.
2016-09-13 23:53:46 +01:00
Ted John
5e352a9dfe Remove usage of List from Twitch.cpp 2016-09-13 18:27:57 +01:00
Manuel Vögele
73b7f3c9f4 Fix corrupted tcp stream when pinging while sending packets
Don't push network packets to the front of the queue if the frist packet is only partially transmitted. They are now inserted at the second
position instead.
2016-09-12 23:59:22 +01:00