mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
17,416 Commits 8 Branches 40 Tags 362 MiB
Commit Graph

17416 Commits

Author SHA1 Message Date
Michał Janiszewski 8637eb6c57
Rename some bits to allow unity builds of libopenrct2 (#9944) 
* Rename some bits to allow unity builds of libopenrct2

Some names are clashing when doing a unity build, renaming them solves
the problem.
 2019-08-29 23:03:56 +02:00
ζeh Matt 1db18d4778 Bump up network version (#9949) 2019-08-28 19:58:30 +01:00
Michael Steenbeek 931a607fd6
Merge pull request #9938 from Gymnasiast/refactor/less-access-to-type-flags 
Refactor some accessors to tile element type and flags fields
 2019-08-28 09:37:39 +02:00
OpenRCT2 git bot e5dd6f43d7 Merge Localisation/master into OpenRCT2/develop. 2019-08-28 04:00:15 +00:00
Gymnasiast d6b6edcc06
Remove unnecessary parentheses [ci skip] 2019-08-27 23:07:46 +02:00
Gymnasiast 0152d9f880
Fix comment [ci skip] 2019-08-27 23:05:12 +02:00
Gymnasiast f365bc3cb7
Create getters and setters for occupied quadrant 2019-08-27 21:12:48 +02:00
Ted John c211292fdd Fix #9941: Giant screenshot's made from command line aren't positioned right 2019-08-26 14:50:47 +01:00
Ted John 48bc28b618 Fix #9937: Incorrect tooltips when hovering ride entrances and ride exits 
- Localised strings have an extra POP16, not sure why it was there in vanilla.
- Exit string never appended station number.
 2019-08-26 14:31:20 +01:00
Ted John 9be0130f2d
Show image limit in show_limits console command (#9935) 2019-08-26 12:28:37 +01:00
Matt 787979cfe9
[ci skip] Update changelog.txt 2019-08-25 18:15:37 +02:00
Matt db5c4ab1b4
Cleanup code in ride_music_update_final 2019-08-25 18:14:28 +02:00
Matt 1e1dd2fc2f
Increase the number of ride music played simultaneously to 32 2019-08-25 18:14:25 +02:00
Gymnasiast 5ef72a4e11
Rename quartertile param in map_can_construct_with_clear_at() 2019-08-25 17:49:44 +02:00
Gymnasiast ec5ba20992
Create dedicated method for SetLastForTile() 2019-08-25 16:13:02 +02:00
Ted John fa792d04e1 Add constexpr modifiers 2019-08-25 12:56:42 +01:00
OpenRCT2 git bot e19b3f5680 Merge Localisation/master into OpenRCT2/develop. 2019-08-25 04:00:16 +00:00
Ted John c653f13552 Add tertiary colour to ImageId 2019-08-24 22:40:19 +01:00
Gymnasiast 6e200459d3
Refactor some accessors to tile element type and flags fields 2019-08-24 22:42:47 +02:00
Ted John 3925a6162d Start using ImageId 2019-08-24 18:35:40 +01:00
Ted John 583855d639 Add new ImageId struct 2019-08-24 17:30:39 +01:00
Ted John f23e3368b1
Merge pull request #9933 from ZehMatt/fix-desync-regression 
Fix desync regression
 2019-08-24 16:33:20 +01:00
Ted John 8d543a056d
Prevent cropping top of giant screenshot (#9934) 
Search through every single tile on the map for the highest element in 2D space. Use that as reference for top of screenshot.
 2019-08-24 16:33:03 +01:00
Michael Steenbeek e11f2d965a
Merge pull request #9437 from Gymnasiast/nog-eens-research 
Move research to vectors
 2019-08-24 10:45:58 +02:00
Michael Steenbeek 7270a86eb7
Fix #9924: Traffic light in Ride List shows incorrect status (#9931) 2019-08-24 10:45:39 +02:00
Hielke Morsink f7ce9b10b3
Merge pull request #9932 from AaronVanGeffen/changelog-update-1 
Update changelog for #9285, #9918
 2019-08-23 23:10:15 +02:00
Matt 9f773f27f8
Bump up network version 2019-08-23 23:06:45 +02:00
Matt d6d480a31b
Fix desyncs because of GameActions ignoring the tick on client 2019-08-23 23:06:27 +02:00
Aaron van Geffen 0e795b376f Update changelog for #9285, #9918. [ci skip] 2019-08-23 23:04:36 +02:00
Gymnasiast ad96aa5785
Fix bug introduced after empty vector check 2019-08-23 22:52:13 +02:00
Ted John ae8c93ca2b
Fix research list UI / dragging 2019-08-23 22:41:50 +02:00
Gymnasiast abe721b308
Fix rebase errors and formatting 2019-08-23 22:41:50 +02:00
Gymnasiast 984fd5e58a
Make EditorInventionsList a bit less buggy 2019-08-23 22:41:50 +02:00
Gymnasiast 9de2819cef
Process feedback from code review 2019-08-23 22:41:50 +02:00
Gymnasiast 1265913bdb
Fix dragging crash and some bugs 2019-08-23 22:41:43 +02:00
Gymnasiast 5ce3d4b947
Use new iterator syntax in more places 2019-08-23 22:41:43 +02:00
Gymnasiast b1fb75e496
Move everything to research vectors 2019-08-23 22:41:43 +02:00
Gymnasiast c3fdb728d1
Rename rct_research_item to ResearchItem 2019-08-23 22:41:43 +02:00
Gymnasiast daa00147d5
Split off RCT12ResearchItem 2019-08-23 22:41:43 +02:00
Michael Steenbeek 91d02093f9
Merge pull request #9918 from IntelOrca/increase-image-list 
Increase image list and fix assert when exiting scenario editor
 2019-08-23 22:32:48 +02:00
Hielke Morsink 371f1fd016 Fix #9926: Africa - Oasis park has wrong peep spawn (#9927) 2019-08-23 21:54:54 +02:00
Hielke Morsink 1ee5c0fa56
Merge pull request #9929 from Broxzier/bugfix/remove-park-fences-screen-artifacts 
Fix: Fences still visible after using remove_park_fences
 2019-08-23 21:47:30 +02:00
Ted John adb5c3aa7f Fix assert when exiting game in scenario editor 
The object selection window loads objects when it is closed which is triggered from window_close_all. We need to unload all the objects after this step on shutdown.
 2019-08-23 20:15:53 +01:00
Ted John 6d80e65783 Increase the capacity of dynamic / object images 2019-08-23 20:14:05 +01:00
Ted John d5a1b4fc8f Fix #9920: Ghost pieces break maps on multiplayer for the client (#9928) 2019-08-23 21:05:00 +02:00
Hielke Morsink bd42977243 Fix: Fences still visible after using remove_park_fences 2019-08-23 21:01:08 +02:00
Michael Steenbeek 4cf1d1eb69
Fix #9905: Ride type dropdown shows wrong text (#9923) 2019-08-22 23:46:15 +02:00
Michael Steenbeek 4093480f83
Fix #9909: 'Build 10 roller coasters' objectives do not complete (#9922) 2019-08-22 23:08:11 +02:00
Michael Steenbeek af2ad8045c
Merge pull request #9914 from ZehMatt/refactor/gameaction-queue 
Refactor network queue out and one desync fix
 2019-08-22 12:07:19 +02:00
r0 9f6a944174 Fix #9603: Don't render audio when master volume is turned off (#9907) 2019-08-21 23:36:07 +02:00