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

16748 Commits

Author SHA1 Message Date
Greg Hennis 1fcedae3bc Fix #9258: Rename SPRITE_LIST_NULL to ..._FREE (#9260) 2019-05-15 19:07:01 +02:00
Michael Steenbeek c9cbe391eb
Merge pull request #8427 from Mikroscopic/minimap-fix 
Fix #8385: Ghost objects rendered in minimap
 2019-05-14 22:38:26 +02:00
Michael Steenbeek abc13422ed
Fix #9132: System file browser cannot open SV4 files 2019-05-14 22:12:23 +02:00
Michael Steenbeek c4812e08d0
Merge pull request #9244 from duncanspumpkin/modify_kick_ga 
Implement Modify Group and Kick Player Actions.
 2019-05-14 21:59:42 +02:00
Gymnasiast cb6a563e2d Bump network version [ci skip] 2019-05-14 21:59:16 +02:00
duncanspumpkin 0b7d7027e1 Fix formatting 2019-05-14 21:58:55 +02:00
duncanspumpkin e72195d16e Make suggested changes 2019-05-14 21:58:55 +02:00
duncanspumpkin 1eb7f4d8c6 Implement Modify Group and Kick Player Actions. 
Further work on the Game Actions porting
 2019-05-14 21:58:55 +02:00
Duncan 7793001f5d Implement BalloonPressAction 
Furthering reducing the number of game commands and moving them to the Game Action framework
 2019-05-14 21:54:54 +02:00
joshtucker132 4dc77bf121 Feature #8791: Improved tile element flag manipulation in Tile Inspector 2019-05-14 21:38:31 +02:00
Michael Steenbeek b67470c75b
Merge pull request #9252 from Gymnasiast/small-cleanup 
Small cleanup
 2019-05-14 21:27:30 +02:00
Gymnasiast 5e39640837 Also remove game_command_set_park_entrance_fee from new_game_command_table 2019-05-14 18:39:14 +02:00
Gymnasiast 4e23c42d38 Remove stub functions from new_game_command_table[] 2019-05-13 22:51:41 +02:00
Gymnasiast 8d9645a382 Remove comment 2019-05-13 22:22:14 +02:00
Gymnasiast 170307cd0f Remove redundant semicolons after for loops 2019-05-13 22:16:30 +02:00
Gymnasiast 2ea1fcc69d Remove unused declarations and functions 2019-05-13 22:16:14 +02:00
ζeh Matt 0ff19f071f Fix #9240: crash when passing directory instead of save file 2019-05-13 21:34:58 +02:00
OpenRCT2 git bot 058475f445 Merge Localisation/master into OpenRCT2/develop. 2019-05-13 04:00:25 +00:00
Duncan 62e188586c
Merge pull request #8914 from duncanspumpkin/buy_land_rights 
Add landset/buyrights action
 2019-05-12 19:38:39 +01:00
duncanspumpkin 4de6071fb4 Increment network version 2019-05-12 19:03:03 +01:00
duncanspumpkin b9a70d02a3 Make suggested changes 
Implement suggestions

Fix formatting
 2019-05-12 17:31:48 +01:00
Aaron van Geffen a8ae81519c Add LandBuyRightsAction.hpp to Xcode project. 2019-05-12 17:29:19 +01:00
duncanspumpkin e9e445837f Add landset/buyrights action 2019-05-12 17:29:19 +01:00
Michael Steenbeek e5eea9d1fa
Merge pull request #9235 from ZehMatt/fix-util-rand 
Improve util_rand
 2019-05-12 13:50:19 +02:00
Ted John 15cb3e1889 Remove unnecessary new line characters from log calls (#9237) 2019-05-12 13:48:56 +02:00
Ted John 616fdfd96e
Merge pull request #9212 from IntelOrca/fix/2339-broadcast-lan 
Implement searching of local servers by broadcasting UDP packets.
 2019-05-12 12:07:56 +01:00
Matt eb3018b6a9
Fix warnings 2019-05-12 11:32:41 +02:00
Matt c6ea47c631
Make util_rand thread safe 2019-05-12 11:32:33 +02:00
Matt 5198df5c25
Improve generation of random advertisment key 2019-05-12 11:27:48 +02:00
Duncan 5da95e963d
Fix GameAction use during pause (#9242) 
* Use correct flag to allow action while paused.

Mistake made during implementing on GameActions

* Increment network version
 2019-05-12 09:54:21 +01:00
OpenRCT2 git bot d3b5ac3f07 Merge Localisation/master into OpenRCT2/develop. 2019-05-12 04:00:22 +00:00
Ted John 1ac8d9058f Colour local servers as green 2019-05-12 01:05:11 +01:00
Ted John dd20ebad49 Make more methods const 2019-05-12 00:57:56 +01:00
Ted John 5e94f6385d Initialise hostname 2019-05-12 00:51:33 +01:00
Ted John 73b8310e8e Refactor creation of UDP socket 2019-05-12 00:51:33 +01:00
Ted John f8e3abcf4e Remove by-reference string_view 2019-05-12 00:51:33 +01:00
Ted John f0d1e9c320 Apply some of the code review comments 2019-05-12 00:51:33 +01:00
Ted John 3334d40da4 Explicitly use std::launch::async 2019-05-12 00:51:33 +01:00
Gymnasiast 6e6fe3c3c1 Replace optional.value() with *optional (fix Xcode compilation) 
Xcode cannot handle the optional.value() notation, but *optional
should mean the same.

Also see https://en.cppreference.com/w/cpp/utility/optional/operator*
 2019-05-12 00:51:33 +01:00
Gymnasiast 9b1321067b Use opt:: namespace 2019-05-12 00:51:33 +01:00
Gymnasiast 26e0264b5d Fix Xcode project 2019-05-12 00:51:33 +01:00
Ted John 52afcb795f Fix windows build 2019-05-12 00:51:33 +01:00
Ted John 47f48721e8 Fix clang build 2019-05-12 00:51:33 +01:00
Ted John 4b0f2bbceb Fix disable network / disable http builds 2019-05-12 00:51:33 +01:00
Ted John 20f52a8cbe Refactor TcpSocket and UdpSocket 2019-05-12 00:51:33 +01:00
Ted John 131a6dad34 Update changelog 2019-05-12 00:51:33 +01:00
Ted John 6a4791e39e Only reply to broadcasts with correct message 2019-05-12 00:51:33 +01:00
Ted John 59ddd7e1ea Get and broadcast to all broadcast address 2019-05-12 00:51:33 +01:00
Ted John 51117432f0 Improve status messages and prevent duplicates 2019-05-12 00:51:33 +01:00
Ted John 04c04d197e Refactor broadcasting code and logging 2019-05-12 00:51:33 +01:00