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

22430 Commits

Author SHA1 Message Date
Jonathan Hjorth 0195ce45a2 Added OnToolUpdate, OnToolDrag, OnToolUp, OnPrepareDraw to new window 2021-10-05 10:54:15 +02:00
Jonathan Hjorth 4fe21e3274 OnToolUpdate, OnToolDrag, OnToolUp now being used 2021-10-05 10:53:40 +02:00
Jonathan Hjorth 0a392841c2 Added functions OnToolUpdate, OnToolDrag, OnToolUp to rct_window 2021-10-05 10:52:44 +02:00
Jonathan Hjorth dbe07554c9 Added OnOpen() to ViewClippingWindow 2021-10-05 10:52:14 +02:00
Jonathan Hjorth 762005f25a Fixed crash caused by window not being properly initialized 2021-10-05 10:51:24 +02:00
Jonathan Hjorth 419201f476 Work on refactoring ViewClipping.cpp to the new window framework. 2021-10-05 10:50:47 +02:00
OpenRCT2 git bot 36a0a28e3f Merge Localisation/master into OpenRCT2/develop 2021-10-05 04:08:34 +00:00
ζeh Matt 8effeb26b0
Refactor action result passing for StaffHireNewAction 2021-10-04 17:01:27 +03:00
Michael Steenbeek 233b1e99b4
Fix Windows compilation of OrcaStream 2021-10-03 22:41:55 +02:00
Michael Steenbeek 7530a03b8e
Merge pull request #15508 from Broxzier/refactor/widget-references 
Use (const) references to widgets and scrolls where possible
 2021-10-03 21:07:31 +02:00
Silent 445fb747bf
Fix Scenario description missing when loading a park from a save file 
Saved games do not have a valid info chunk,
so scenario names/descriptions did not load.
 2021-10-03 20:57:17 +02:00
ζeh Matt cf7b4ded08
Move static declaration into cpp file 2021-10-03 21:13:04 +03:00
ζeh Matt dc44d1f79d
Merge pull request #15511 from ZehMatt/refactor/ridecreateaction-result 
Refactor RideCreateAction result data passing
 2021-10-03 07:55:14 -07:00
ζeh Matt 24ec2e1b67
Merge pull request #15510 from ZehMatt/refactor/largescenerayplace-result 
Refactor LargeSceneryPlaceAction result data passing
 2021-10-03 07:54:59 -07:00
Hielke Morsink b246a4919d
Fix #15514: Two “quit to menu” menu items available in track designer 2021-10-03 15:20:45 +02:00
OpenRCT2 git bot b7bda6e938 Merge Localisation/master into OpenRCT2/develop 2021-10-02 04:08:15 +00:00
ζeh Matt 76c2f9db85
Refactor LargeSceneryPlaceAction result data passing 2021-10-02 00:56:59 +03:00
ζeh Matt 2597c04eb4
Refactor RideCreateAction result data passing 2021-10-02 00:50:03 +03:00
Hielke Morsink 1d62a902e7
Make scenery_small_entry_has_flag a member function (#15509) 2021-10-01 16:50:05 -03:00
Gymnasiast 8c2bb15319
Fix Windows compilation 2021-10-01 19:05:08 +02:00
Gymnasiast be8722a578
Fix merge error 2021-10-01 18:48:05 +02:00
Gymnasiast 5a0fa60b9e
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-01 18:45:51 +02:00
Michael Steenbeek 06dc75845a
Fix #15476: Crash in map_place_clear_func() 2021-10-01 16:10:25 +00:00
Michael Steenbeek d320a5cfe7
Merge pull request #15505 from Gymnasiast/fix/15496 
Fix #15496 and clean up paint_swinging_inverter_ship_structure() a bit
 2021-10-01 18:03:22 +02:00
Hielke Morsink 5b9b52c028
Use (const) references to scrolls where possible 2021-10-01 15:21:01 +02:00
Hielke Morsink 6de1868ad8
Use (const) references to widgets where possible 
Note: The change from `w->widgets[WIDX_ENTRY_PRICE]` to `entryPriceWidget` is intended.
 2021-10-01 15:21:00 +02:00
Michael Steenbeek 317e562845
Merge pull request #15495 from ZehMatt/refactor/xyz-access 
Use GetLocation in more places
 2021-10-01 14:02:34 +02:00
Gymnasiast d3cfa07a2a
Fix #15496: crash in paint_swinging_inverter_ship_structure() 2021-10-01 13:51:00 +02:00
Gymnasiast c74984740b
Pass ride ref to paint_swinging_inverter_ship_structure() 2021-10-01 13:48:27 +02:00
duncanspumpkin 69c520e278 Readd header 2021-09-30 17:07:21 +01:00
Michael Steenbeek 26d1186240
Merge pull request #15493 from Broxzier/refactor/minor-cleanups 
Minor code cleanups
 2021-09-30 15:03:33 +02:00
ζeh Matt 456e54b022
Remove useless comment 
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
 2021-09-30 05:37:23 -07:00
Hielke Morsink 429e34d7f3
Make uses of window_get_main use (const) auto* 2021-09-30 14:36:06 +02:00
ζeh Matt c492362e45
Fix mistake and cleanup 2021-09-30 15:34:22 +03:00
duncanspumpkin 7b954f876e Merge branch 'develop' into HEAD 2021-09-30 13:06:41 +01:00
Duncan e01c9a3afa
Stream changes from NSF (#15446) 
* Bring over NSF changes to stream classes

* Add orca stream to project files

* Bring over util changes as well.

* Add const to util and fix util ungzip

* Add const and apply review comments

* Apply review comments
 2021-09-30 13:02:54 +01:00
Hielke Morsink bb5d09982f
Properly name argument 2021-09-30 10:40:32 +02:00
Hielke Morsink 94144bcd89
Remove some dead code 
Reported by clang
clang-analyzer-deadcode.DeadStores
 2021-09-30 10:40:32 +02:00
Michael Steenbeek bfe7caacd7
Fix #15487: map animations do not work correctly in vanilla RCT2 (#15492) 
Co-authored-by: duncanspumpkin <duncanspumpkin@users.noreply.github.com>

Co-authored-by: duncanspumpkin <duncanspumpkin@users.noreply.github.com>
 2021-09-30 07:40:58 +01:00
ζeh Matt ac84b61eaf
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-09-30 00:21:02 +03:00
Michał Janiszewski ce1d3e9c83
Minor fixes (#15491) 2021-09-29 21:06:46 +00:00
Hielke Morsink ba74393a43
Remove pointless return statement 2021-09-29 22:39:34 +02:00
ζeh Matt afc0e87f29
Merge pull request #15477 from ZehMatt/nsf/update-xyz 
Update entities xyz to int32_t
 2021-09-29 13:32:06 -07:00
ζeh Matt 15547ff8f4
Merge pull request #15488 from ZehMatt/fix-14798 
Fix #14798: Overflow on sound position
 2021-09-29 13:07:09 -07:00
ζeh Matt 98625e1aaa
Fix #14798: Overflow on sound position 2021-09-29 22:47:53 +03:00
Michael Steenbeek 987174e828
Merge pull request #15436 from duncanspumpkin/staff 
Small Staff Refactor from NSF
 2021-09-29 20:46:24 +02:00
Michael Steenbeek e5f9282a36
Merge pull request #15470 from Broxzier/bugfix/15213-unicode-freeze 
Fix #15213: Freeze when reading a partially cut unicode character
 2021-09-29 20:26:01 +02:00
Michael Steenbeek 22af2ecdcc
Merge pull request #15486 from ZehMatt/nsf/backport-overflow 
Use int32_t for iterating tiles
 2021-09-29 20:02:05 +02:00
Gymnasiast bb933d1eb7
Fix #14824: locating a staff member by patrol area picks wrong staff member 
Co-authored-by: duncanspumpkin <duncanspumpkin@users.noreply.github.com>
 2021-09-29 19:56:55 +02:00
ζeh Matt 82f0da24b1
Use int32_t for iterating tiles 
Co-authored-by: Ted John <ted@brambles.org>
 2021-09-29 20:40:57 +03:00