1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 05:23:04 +01:00
Commit Graph

1148 Commits

Author SHA1 Message Date
duncanspumpkin
2bd6dac20f Merge branch 'develop' into vehicle-update
Conflicts:
 openrct2.vcxproj
2016-01-10 08:57:41 +00:00
Hielke Morsink
39ae12eeb1 Using window width and height to define locations 2016-01-09 19:27:04 +01:00
Hielke Morsink
e4d3c546ad Moving staff costs along with the hire button 2016-01-09 19:26:13 +01:00
Hielke Morsink
19ddbaa84f Buttons on the right move when scaling the window. 2016-01-09 19:26:12 +01:00
Hielke Morsink
f9dc3f3454 replace FOR_ALL_PEEPS with FOR_ALL_STAFF 2016-01-09 19:26:11 +01:00
duncanspumpkin
268e2d34ce Merge branch 'develop' into vehicle-update
Conflicts:
 object.c
2016-01-09 16:51:23 +00:00
IntelOrca
f84c659010 fix #2670: title was not being loaded when a scenario failed to load 2016-01-09 15:11:12 +00:00
IntelOrca
3073bc64fd remove rct2_endupdate 2016-01-09 00:25:30 +00:00
IntelOrca
43a5cc92cc define STR_NONE as a rct_string_id 2016-01-07 22:14:53 +00:00
IntelOrca
48ad1314a9 refactor object_desc 2016-01-07 19:12:59 +00:00
IntelOrca
40a4bd1fa8 remove old object_paint calls, replace with new 2016-01-07 19:01:19 +00:00
IntelOrca
ab38828e03 integrate object list variables:
- gInstalledObjectsCount
- gInstalledObjects
- gNumInstalledRCT2Objects
- gNumInstalledCustomObjects
- gLastLoadedObjectChunkData
2016-01-06 20:41:21 +00:00
IntelOrca
29397ebcc5 fix #2658: fix dragging on land and water tools 2016-01-06 18:31:25 +00:00
IntelOrca
f4f07ae5bb integrate variable: gInputPlaceObjectModifier 2016-01-05 22:33:47 +00:00
IntelOrca
94ae72f228 integrate variable: gHoverWidget 2016-01-05 22:05:00 +00:00
IntelOrca
586e5ef9cd integrate variable: gPressedWidget 2016-01-05 21:46:38 +00:00
IntelOrca
ee9c695902 fix #2651: remove ride when multiplayer client aborts ride construction
also fix ride construction window closing immediately after placing first track piece of a ride for clients
2016-01-05 20:37:21 +00:00
Ted John
f4a25bd55e Merge pull request #2641 from Broxzier/fix_saving
Prevent extension from showing when "saving as"
2016-01-05 10:14:20 +00:00
Michał Janiszewski
133096cd64 Merge branch 'develop' into vehicle-update 2016-01-05 09:59:53 +01:00
IntelOrca
88c391120a integrate tooltip variables 2016-01-05 00:02:23 +00:00
Hielke Morsink
3641634aad Prevent extension from showing when saving a park for the first time. 2016-01-05 00:23:51 +01:00
IntelOrca
0c933234e0 remove all tutorial code 2016-01-04 23:21:23 +00:00
IntelOrca
f0adf90660 integrate variable: gInputFlags 2016-01-04 22:53:03 +00:00
IntelOrca
b5069d3809 integrate variable: gInputState 2016-01-04 22:45:51 +00:00
IntelOrca
b94cd7499d add config for hide mega park and set locking as default 2016-01-03 21:06:10 +00:00
IntelOrca
9b833e5f93 shorten path for scenario select debug 2016-01-02 23:14:41 +00:00
IntelOrca
9eacd3532b use correct window variable for highlighted scenario 2016-01-02 21:13:24 +00:00
IntelOrca
ededc82cba add DLC and Build your own scenario classification 2016-01-02 21:06:46 +00:00
IntelOrca
d147f516db fix default selected tab on scenario select 2016-01-02 21:05:57 +00:00
IntelOrca
aeda8d68f9 add logic for unlocking mega park and making it invisible 2016-01-02 21:05:37 +00:00
IntelOrca
82b05950ff add RCT1 title sequence 2016-01-02 21:05:33 +00:00
IntelOrca
f2c5ce32f2 improve options window for scenario options 2016-01-02 21:05:33 +00:00
IntelOrca
950722292c use user path for default scenario save location 2016-01-02 21:05:31 +00:00
IntelOrca
95ee0be3c5 handle scenario conflicts 2016-01-02 21:05:08 +00:00
IntelOrca
af67cf5703 refactor scenario sources and improve scenario select window 2016-01-02 21:04:44 +00:00
IntelOrca
72e820dead add horizontal rule headings to scenario list 2016-01-02 21:04:44 +00:00
IntelOrca
6a768c4a3c redo entire scenario highscore load / saving
- load and save highscores to new file format (highscores.dat)
- scan scenarios from RCT2 data and user data
- load highscores from legacy file (scores.dat)
- fix various issues with new scenario select window
2016-01-02 21:04:10 +00:00
IntelOrca
63529a5213 fix option widgets for scenario grouping 2016-01-02 21:03:39 +00:00
Aaron van Geffen
f7d33f3cab Rename constants et al per code reviewer's request. 2016-01-02 21:03:38 +00:00
Aaron van Geffen
f49e3eea1c WIP: misery: adding scenario options to options screen. 2016-01-02 21:01:53 +00:00
Aaron van Geffen
15782b88c4 Experimental: optional unlocking of scenarios ("campaign mode") in scenario select screen. 2016-01-02 21:01:53 +00:00
Aaron van Geffen
3bb1588cfa Shrink window when showing scenarios by difficulty level. 2016-01-02 21:00:07 +00:00
Aaron van Geffen
eb87c5284f Adapt scenario select screen based on scenario source game. 2016-01-02 21:00:06 +00:00
Aaron van Geffen
3bad0870fb Added routines to find scenario index and source from predefined listings. 2016-01-02 21:00:05 +00:00
Aaron van Geffen
cf935d45c6 Add configuration bits for scenario select mode and unlocking.
Note this lacks an interface in the options window as of yet.
2016-01-02 21:00:05 +00:00
Aaron van Geffen
3999ebd031 WIP: adding new tabs to scenario select window; extended window size. 2016-01-02 21:00:03 +00:00
Hielke Morsink
bc2ac2e28b Split extension setter into two functions 2016-01-02 20:45:00 +01:00
Hielke Morsink
f31a5f2248 More secure checks for removing and setting file extensions. 2016-01-02 18:57:11 +01:00
Hielke Morsink
eadb03426e fix #2620 and preventing names with dots from breaking. 2016-01-02 14:59:16 +01:00
Duncan
5b9a98a0f9 Merge pull request #2588 from HaasJona/refactor2
Refactor peep code
2016-01-01 22:22:18 +00:00