Duncan Frost
|
a7f4d44ece
|
Add check_for_entrance_exit. Fixed ride name not shown
|
2015-02-12 22:30:31 +00:00 |
IntelOrca
|
a66b29076b
|
move osinterface code to shared or windows
|
2015-02-12 20:51:40 +00:00 |
Duncan Frost
|
719e23ec3b
|
Fix bathrooms missing same price everywhere box. Fix #761
|
2015-02-12 18:58:16 +00:00 |
IntelOrca
|
392ff7bfea
|
remove expansion packs from title sequence, closes #752
|
2015-02-11 22:18:19 +00:00 |
IntelOrca
|
fadeff9dda
|
fix a few issues with object selection and track manage
|
2015-02-11 21:03:23 +00:00 |
IntelOrca
|
74e1c0923f
|
implement window_editor_object_selection_scrollpaint
|
2015-02-11 19:42:10 +00:00 |
IntelOrca
|
51802aac45
|
fix object order and add object dat name to object selection window, closes #440
|
2015-02-11 18:54:31 +00:00 |
IntelOrca
|
59eff1f572
|
implement window_editor_object_selection_paint
|
2015-02-11 17:50:52 +00:00 |
IntelOrca
|
9c06699dce
|
implement more events for object selection window
|
2015-02-11 16:02:57 +00:00 |
IntelOrca
|
0db1c88f2b
|
refactor window hold down widgets (var_020)
|
2015-02-10 20:40:33 +00:00 |
IntelOrca
|
f6c09b44b6
|
merge in random map generator
|
2015-02-10 20:11:59 +00:00 |
IntelOrca
|
5b3c1b6764
|
finalise placing of trees
|
2015-02-10 19:52:24 +00:00 |
IntelOrca
|
9cc108abbb
|
remove toolbar.c and ignore seperators at the end of the toolbar
|
2015-02-10 14:41:35 +00:00 |
Duncan Frost
|
b388512c4f
|
Remove hack to pass exapanison check
|
2015-02-09 19:02:54 +00:00 |
Duncan Frost
|
edfbd80747
|
Added track_data refactored track_place to use track_data
|
2015-02-09 18:52:01 +00:00 |
Duncan Frost
|
a0775f9ac9
|
Refactor track_place to use new structs
|
2015-02-09 18:51:59 +00:00 |
Duncan Frost
|
bc847628cd
|
Labelled track preview offsets
|
2015-02-09 18:51:58 +00:00 |
Duncan Frost
|
6943c7dce0
|
Finished sub_6D2189
|
2015-02-09 18:51:56 +00:00 |
Duncan Frost
|
df723b871c
|
Added more of 6d2189
|
2015-02-09 18:51:55 +00:00 |
Duncan Frost
|
aeb3764ab5
|
Added load track objects
|
2015-02-09 18:51:53 +00:00 |
IntelOrca
|
9d2abf1925
|
add map generation window
|
2015-02-09 18:32:58 +00:00 |
IntelOrca
|
7ea809492a
|
allow translation of unit and date strings, closes #307
|
2015-02-09 12:53:11 +00:00 |
IntelOrca
|
78e3b1aa95
|
fix a few errors with check-valid-ride
|
2015-02-08 16:53:38 +00:00 |
IntelOrca
|
1ad04a24c4
|
Merge branch 'develop' into set-ride-status
|
2015-02-08 16:53:19 +00:00 |
IntelOrca
|
ee51f31f57
|
fix station-to-station operating tab error on ride window
|
2015-02-08 16:50:49 +00:00 |
IntelOrca
|
a6c95f1f38
|
Merge branch 'develop' into set-ride-status
Conflicts:
src/ride/track.c
src/windows/ride_construction.c
|
2015-02-08 16:04:35 +00:00 |
IntelOrca
|
dfc723573c
|
fix expenditure table issues, fixes #762
|
2015-02-08 14:31:57 +00:00 |
Adrian Wielgosik
|
6380ce63d9
|
Make bottom toolbar panels bigger to hold longer date strings
|
2015-02-07 23:53:17 +01:00 |
Adrian Wielgosik
|
c0b2c79aad
|
Add widget ordering in editor top toolbar
|
2015-02-07 23:50:51 +01:00 |
Adrian Wielgosik
|
cdc8642709
|
Add an artificial separator widget
|
2015-02-07 23:50:51 +01:00 |
Adrian Wielgosik
|
dc4d14b16b
|
Refactor placement of top toolbar items
|
2015-02-07 23:50:50 +01:00 |
Duncan Frost
|
0f6dd51736
|
Added load_palette. Labelled offset for paused and palette effect frame. Fixed fast moving water.
|
2015-02-07 17:40:20 +00:00 |
IntelOrca
|
ce719ef086
|
fix fullscreen issues and add title music option
|
2015-02-06 22:35:08 +00:00 |
Ted John
|
aad90f39ef
|
Merge pull request #719 from IntelOrca/fullscreen-fixes
Fix fullscreen issues
|
2015-02-06 00:19:59 +00:00 |
Duncan Frost
|
cf6f8c417c
|
Fix #747 mistake caused by missing value
|
2015-02-05 18:22:04 +00:00 |
Duncan Frost
|
22c6d500a6
|
Fix #738 ride name now copied into required address
|
2015-02-03 18:39:07 +00:00 |
Duncan Frost
|
1fc525214d
|
Refactor track_load. Relabeled address'
|
2015-02-02 18:52:50 +00:00 |
Duncan Frost
|
fc8728aa9d
|
Refactor of editor window. Added object_selection_close and load_selected_objects. Fix small display bugs.
|
2015-02-02 18:49:07 +00:00 |
Duncan Frost
|
b7470447e8
|
Refactor track_list using TD4 knowledge
|
2015-02-02 18:43:02 +00:00 |
Duncan Frost
|
9367ec8d05
|
Fix price throughout park not always working
|
2015-01-31 12:24:11 +00:00 |
Duncan Frost
|
f6a0fcc255
|
Fix secondary price loss per item
|
2015-01-31 11:46:56 +00:00 |
IntelOrca
|
5b4ec3621a
|
refactor many functions to use rct_xy_element
|
2015-01-30 19:20:19 +00:00 |
IntelOrca
|
debafcf051
|
code set ride status, not yet fixed and tested
|
2015-01-29 00:16:34 +00:00 |
IntelOrca
|
36971b29cb
|
implement game_command_set_park_name and game_command_remove_park_entrance
|
2015-01-27 21:18:41 +00:00 |
Duncan Frost
|
a67815821e
|
Fix crash on map due to EBPSAFE
|
2015-01-27 18:18:26 +00:00 |
IntelOrca
|
1c18f80f07
|
implement game_command_set_ride_name
|
2015-01-27 02:05:54 +00:00 |
Ted John
|
1aee1825d1
|
Merge pull request #723 from duncanspumpkin/peep_update
Peep update
|
2015-01-26 17:38:18 +00:00 |
IntelOrca
|
ba4d9b3975
|
implement game_command_set_park_open
|
2015-01-25 00:20:53 +00:00 |
Duncan Frost
|
43550e2a7b
|
Fix small offset bugs. Label ride offsets
|
2015-01-24 19:48:26 +00:00 |
Duncan Frost
|
495e60a5a7
|
Labeled peep->sub_state and rejiged next_z
|
2015-01-24 19:48:15 +00:00 |
IntelOrca
|
dfb1f055b9
|
implement game_command_set_current_loan
|
2015-01-24 19:07:35 +00:00 |
IntelOrca
|
475c98c540
|
implement game_command_set_research_funding
|
2015-01-24 18:41:55 +00:00 |
IntelOrca
|
eec7e2e458
|
implement marketing_start_campaign
|
2015-01-24 18:22:06 +00:00 |
Ted John
|
84e1d2cdf8
|
Merge pull request #715 from IntelOrca/refactor-map-element-iteration
Refactor map element iteration
|
2015-01-24 17:43:54 +00:00 |
IntelOrca
|
80959b7db7
|
fix fullscreen mode saving
|
2015-01-24 15:06:14 +00:00 |
IntelOrca
|
7cdcb6402e
|
fix fullscreen resolution, fixes #89
|
2015-01-23 20:47:33 +00:00 |
Duncan Frost
|
007817f967
|
Fix bug in vehicle dropdown. Refactor track more
|
2015-01-22 21:08:45 +00:00 |
Duncan Frost
|
4a6b6475fd
|
Fixed track_place crash #713.
|
2015-01-22 21:05:52 +00:00 |
Duncan Frost
|
dd97974741
|
Refactored track_load
|
2015-01-22 21:04:53 +00:00 |
Duncan Frost
|
a57bf368bb
|
Reworked EBPSAFE. Removed EBPSAFE_X. Fixed track list bug #606.
|
2015-01-22 21:01:57 +00:00 |
IntelOrca
|
8774731f03
|
refactor map element iteration
|
2015-01-22 00:19:05 +00:00 |
Duncan Frost
|
4e917de6cc
|
Fix height markers.
|
2015-01-19 18:13:25 +00:00 |
Duncan Frost
|
e7a0b31884
|
Ride locate now uses standard scroll_to_viewport.Fix #705
|
2015-01-19 17:24:39 +00:00 |
IntelOrca
|
c88cde8472
|
fix vehicle type dropdown in ride window and 0% rating modifiers, fixes #696, fixes #699
|
2015-01-17 19:13:05 +00:00 |
Duncan Frost
|
e2b2c94ca1
|
Fix dropdown location at sides of the screen #690
|
2015-01-17 09:14:17 +00:00 |
IntelOrca
|
3a8f85b7d2
|
implement footpath remove and create, bugs exist
|
2015-01-14 23:51:59 +00:00 |
IntelOrca
|
0ff125b9b3
|
move across useful map functions and other bits from footpath branch to develop
|
2015-01-14 23:38:48 +00:00 |
Duncan Frost
|
11be3cd5bd
|
Removed finance button when in no money mode
|
2015-01-12 18:57:03 +00:00 |
Duncan Frost
|
974ecd904c
|
Finish game command 20 change surface style
|
2015-01-12 18:39:53 +00:00 |
Duncan Frost
|
8a4e12a3f4
|
Started game_command_20 raise lower land
|
2015-01-12 18:39:52 +00:00 |
Duncan Frost
|
42383cc192
|
Finished tool_down.
|
2015-01-12 18:39:51 +00:00 |
IntelOrca
|
f4e0f59355
|
fix #606, track names in track select window writing one byte out
|
2015-01-12 18:30:50 +00:00 |
Ted John
|
295b08e0fd
|
Merge pull request #660 from eezstreet/develop
Added 'financial options' button in toolbar, similar to RCT1
|
2015-01-12 12:55:51 +00:00 |
Duncan Frost
|
4346f8c993
|
Fix issues due to comparing no money flag instead of 18
|
2015-01-10 14:15:48 +00:00 |
Duncan
|
3603b5773e
|
fix spelling mistake.
|
2015-01-08 12:17:18 +00:00 |
Duncan Frost
|
1fed6ac32c
|
Added missing btm toolbar functions. Added dirty enum
|
2015-01-07 20:25:48 +00:00 |
Duncan Frost
|
4da2521967
|
Fix dirty money flag.
|
2015-01-05 18:48:55 +00:00 |
Ted John
|
2b267a861b
|
Merge pull request #673 from duncanspumpkin/text_input_unknown_7
Fix #672
|
2015-01-04 17:25:30 +00:00 |
Duncan Frost
|
ef72f66fa7
|
Moved text_input update to unknown7 function in order to force updates when paused.
|
2015-01-04 17:00:36 +00:00 |
Duncan Frost
|
8cd6d51cea
|
Fixed secondary item count. Labeled count offsets
|
2015-01-04 16:28:19 +00:00 |
eezstreet
|
68ada3d06b
|
Added financial options tab to main toolbar
|
2014-12-31 23:28:50 -05:00 |
Duncan Frost
|
4257d0bcc4
|
Labelled offset to redundant max vehicle sounds.
|
2014-12-31 15:04:20 +00:00 |
Duncan Frost
|
cbe49300b8
|
Fixed sounds not playing properly when paused. Labeled max sounds offset. Prevented crash on null dereference
|
2014-12-31 14:54:23 +00:00 |
Duncan Frost
|
c3c8a73225
|
Fixed drawing issues when zoomed.
|
2014-12-28 13:29:26 +00:00 |
Ted John
|
7b8dc291a5
|
Merge pull request #650 from duncanspumpkin/text_input_large
Added multi line text input
|
2014-12-22 19:35:50 +00:00 |
Duncan Frost
|
153196a905
|
Remove redundant define
|
2014-12-22 16:55:17 +00:00 |
Duncan Frost
|
ba93cd337b
|
Added dynamic window resizing on change of text. Fixed cursor display issue
|
2014-12-22 16:50:35 +00:00 |
Duncan Frost
|
f93aeb33c6
|
Added multi line text input
|
2014-12-22 10:40:00 +00:00 |
Duncan Frost
|
acf6ef7b88
|
Fixed construct bug
|
2014-12-20 13:06:17 +00:00 |
Duncan Frost
|
a96bf872bf
|
Added more of demolish. Fixed bug in window_close
|
2014-12-20 11:14:26 +00:00 |
Duncan Frost
|
749bd48f3d
|
Started adding a little bit of ride construct mouse down
|
2014-12-20 10:43:30 +00:00 |
Duncan Frost
|
583cb5118c
|
Added construct dropdown function fixes #638.
|
2014-12-19 18:44:42 +00:00 |
IntelOrca
|
44efbd95ac
|
implement more footpath construction and window
|
2014-12-17 20:45:27 +00:00 |
IntelOrca
|
0209ad080c
|
fix various footpath bugs and refactor, fixes #637
|
2014-12-16 22:03:56 +00:00 |
IntelOrca
|
99b85b2339
|
add manage track design window (UNTESTED)
|
2014-12-16 15:33:32 +00:00 |
IntelOrca
|
a319bb15e2
|
fix compile error for GCC
|
2014-12-16 11:37:46 +00:00 |
IntelOrca
|
d7212c1b14
|
implement inventions list window, fixes #630
|
2014-12-16 01:24:13 +00:00 |
Ted John
|
e47b2c920f
|
Merge pull request #636 from duncanspumpkin/fix_lightning
Fix lightning
|
2014-12-14 21:10:05 +00:00 |
IntelOrca
|
1459263b3c
|
implement editor scenario options window
|
2014-12-14 19:21:06 +00:00 |
Duncan Frost
|
83a7dd5095
|
Fix lightning error caused by buffer overflow in scenery
|
2014-12-14 15:00:22 +00:00 |
Duncan Frost
|
d3de21463a
|
Fix #625 issue caused by unitialised variable
|
2014-12-11 18:26:44 +00:00 |
IntelOrca
|
ff478b8673
|
implement editor objective options window
|
2014-12-10 23:07:11 +00:00 |
IntelOrca
|
e887311219
|
add more cheats to cheat window and a small amount of refactoring
|
2014-12-10 01:44:30 +00:00 |
Duncan Frost
|
eed854ed6f
|
Fixed #621 error caused by signed word expanding incorrectly to an unsigned dword
|
2014-12-08 16:20:02 +00:00 |
Duncan Frost
|
ef0b29d996
|
Fixed issue preventing rides from being destroyed
|
2014-12-03 20:37:38 +00:00 |
Duncan Frost
|
f11f2f270f
|
Added enough of ride_construction to fix #601
|
2014-12-02 18:09:13 +00:00 |
Duncan Frost
|
d1c49ee32b
|
Fix #600. Issue caused by not passing model_type argument
|
2014-12-01 17:16:30 +00:00 |
Duncan Frost
|
a11f7fbd7c
|
Fix #610. Pause toggle display issue.
|
2014-12-01 17:04:47 +00:00 |
IntelOrca
|
d00001fed2
|
remove unnecessary header includes
|
2014-11-30 20:27:14 +00:00 |
IntelOrca
|
31ebf03c30
|
implement enter name on scenario complete, closes #605
|
2014-11-30 02:17:01 +00:00 |
IntelOrca
|
88b425f6a7
|
implement ride open station and ride open vehicle, partial fix for #601
|
2014-11-29 15:55:44 +00:00 |
IntelOrca
|
0492c966d7
|
fix ride shop item colouring in ride window, fixes #602
|
2014-11-29 13:54:53 +00:00 |
IntelOrca
|
aee1b3825e
|
fix object_free_scenario_text problem in window_editor_object_selection
|
2014-11-25 21:49:05 +00:00 |
IntelOrca
|
d9e0f8ff6a
|
implement save scenario and fix various load / save dialog issues, fixes #433
|
2014-11-25 02:06:26 +00:00 |
IntelOrca
|
8e3ee3f7e9
|
implement bare minimum so that close button is implemented on object selection window, partial fix for #433
|
2014-11-24 23:05:35 +00:00 |
Miso Zmiric (Mike Squinter)
|
a7f015669a
|
fix erroneous position calculation due to additional offset
|
2014-11-24 17:37:45 +00:00 |
Miso Zmiric (Mike Squinter)
|
1e6c9ddfd8
|
map cheat window to shortcut, hide fast forward button, fix toolbar autolayout
|
2014-11-24 16:38:19 +00:00 |
IntelOrca
|
73a6b1acea
|
implement editor_read_s6, partial fix for #433
|
2014-11-24 02:58:48 +00:00 |
IntelOrca
|
0e0e9c9840
|
merge qcz editor early to help finish other editor parts
|
2014-11-23 16:28:23 +00:00 |
IntelOrca
|
ca384e0b51
|
fix #278, objective window complete / fail text mis-aligned
|
2014-11-22 23:45:30 +00:00 |
Duncan Frost
|
7252667a25
|
Implemented the same changes to scenario load. Error messages now copied onto cmd prompt
|
2014-11-20 19:02:27 +00:00 |
Ted John
|
af1cd86a35
|
Merge pull request #570 from duncanspumpkin/peep_update
Peep update
|
2014-11-18 13:26:53 +00:00 |
IntelOrca
|
d821456709
|
fix don't save button on quit game prompt, fixes #465
|
2014-11-17 01:20:20 +00:00 |
Duncan Frost
|
135abc90a4
|
Added sub_693b58
|
2014-11-15 19:45:42 +00:00 |
IntelOrca
|
2b7142e49f
|
attempt to fix #566 and other bugs, also refactor some footpath related functions
|
2014-11-15 18:22:06 +00:00 |
Duncan Frost
|
bd06488450
|
Fix peeps sitting. Renamed a function to sprite_move
|
2014-11-12 17:45:39 +00:00 |
Adrian Wielgosik
|
ad2502e4d5
|
- fixed a condition in sub_6939EB that compared against a wrong field
- added a missing break that caused the wrong text to be displayed in ride window
|
2014-11-12 12:30:28 +01:00 |
IntelOrca
|
5a4b940fc2
|
fix and refactor window event calls
|
2014-11-11 20:51:25 +00:00 |
IntelOrca
|
d111c715d6
|
implement viewport_interaction_get_item_left
|
2014-11-10 00:40:59 +00:00 |
Duncan Frost
|
1a857edc21
|
Playing about with viewport setup
|
2014-11-06 21:16:45 +00:00 |
Duncan Frost
|
97abffd4e8
|
Added force sun/thunder cheat.
|
2014-11-05 20:26:27 +00:00 |
Duncan Frost
|
c1ef7ac61f
|
Use reversed peep functions where required
|
2014-11-05 16:45:42 +00:00 |
Duncan Frost
|
481fd08ab5
|
Added update_picked and update_entering_park. Added new entries to peep struct
|
2014-11-05 16:35:22 +00:00 |
Duncan Frost
|
22df12c1c8
|
Added sub_69e9d3 a sprite moving function
|
2014-11-05 16:35:18 +00:00 |
Duncan Frost
|
573fe0c6f7
|
Added peep_decrement_num_riders
|
2014-11-05 16:35:17 +00:00 |
Duncan Frost
|
388b8ec337
|
Added peep_window_state_update
|
2014-11-05 16:35:16 +00:00 |
Duncan Frost
|
95557bc732
|
Added peep_insert_new_thought
|
2014-11-05 16:30:21 +00:00 |
Duncan Frost
|
0624736b47
|
Decompiled PEEP_STATE_QUEUING
|
2014-11-05 16:30:19 +00:00 |
IntelOrca
|
0e223c524e
|
implement sub_6EDE88
|
2014-11-05 16:14:12 +00:00 |
IntelOrca
|
ad84e6d076
|
implement ride_modify and supporting methods
|
2014-11-05 02:55:29 +00:00 |
IntelOrca
|
508ed131f7
|
implement sub_6CC3FB
|
2014-11-04 21:39:03 +00:00 |
IntelOrca
|
39ad49bac9
|
implement find mechanic in ride window
|
2014-11-04 19:33:17 +00:00 |
IntelOrca
|
0104042640
|
Merge branch 'ride-update'
Conflicts:
src/world/map.c
|
2014-11-04 19:01:59 +00:00 |
IntelOrca
|
d92a4d9418
|
implement clear scenery game command, try out removing paths feature
|
2014-11-04 03:34:48 +00:00 |
Duncan Frost
|
70c06d62ef
|
Added zero clearance cheat tool. Warning does not clean itself up
|
2014-11-03 21:15:35 +00:00 |
IntelOrca
|
8ab3188914
|
Merge branch 'master' into ride-update
Conflicts:
projects/openrct2.vcxproj.filters
|
2014-11-03 17:37:08 +00:00 |
Duncan Frost
|
c87e373ced
|
Added window_sign_small
|
2014-11-02 14:16:44 +00:00 |
Duncan Frost
|
49ccea7f26
|
Fix remaining bugs with window_sign(large)
|
2014-11-02 14:16:43 +00:00 |
Duncan Frost
|
828c6ff7a2
|
Added window_sign. Invalidate function to be finished
|
2014-11-02 14:15:18 +00:00 |
Duncan Frost
|
40a26f689f
|
Added demolish ride prompt
|
2014-11-02 08:39:01 +00:00 |
IntelOrca
|
3d40c7e3ee
|
add various ride mechanic functions
|
2014-11-02 01:41:00 +00:00 |
Duncan Frost
|
53e0ebc57c
|
Refactored a bit of tooltip window. Added hack to fix #540 note this should be fixed better
|
2014-11-01 13:10:14 +00:00 |
Duncan Frost
|
605c62f566
|
Window banner complete
|
2014-10-21 17:59:47 +01:00 |
IntelOrca
|
287b614392
|
fix window_map_tooltip using original window events instead of new
|
2014-10-21 11:07:11 +01:00 |
IntelOrca
|
ae85fc265e
|
implement window_map_tooltip
|
2014-10-17 02:01:58 +01:00 |
Duncan Frost
|
04965ae9d2
|
Added home, end key. Now uses host window colours.
|
2014-10-16 21:50:03 +01:00 |
Duncan Frost
|
76caeaf040
|
Fix warning.
|
2014-10-16 21:00:49 +01:00 |
Duncan Frost
|
1c62a0c29d
|
Cleaned up code, renamed variables, added comments. Switched over all existing text boxes to new code
|
2014-10-16 20:58:31 +01:00 |
Duncan Frost
|
edbfb43251
|
Added ok/cancel buttons. Added closing on main.
|
2014-10-16 20:58:30 +01:00 |
Duncan Frost
|
9a3aeed508
|
Added some of the suggested changes
|
2014-10-16 20:58:28 +01:00 |
Duncan Frost
|
9cb03a9d3e
|
Fixed bugs in existing method. Now has correct title and description
|
2014-10-16 20:58:27 +01:00 |
Duncan Frost
|
cad821349b
|
New technique for text input.
|
2014-10-16 20:58:26 +01:00 |
Duncan Frost
|
306310c5d9
|
Fix warning
|
2014-10-16 20:58:26 +01:00 |
Duncan Frost
|
b1721f217d
|
Trying out a new technique for text input
|
2014-10-16 20:58:25 +01:00 |
Ted John
|
0053dd82dc
|
Merge pull request #529 from duncanspumpkin/fix_527
Fix #527
|
2014-10-16 19:44:31 +01:00 |
Duncan Frost
|
0a5e304a92
|
Fixes #527. Error caused by passing a variable a factor of 8 out.
|
2014-10-16 19:35:01 +01:00 |
zsilencer
|
6628a4eace
|
0x006BC3AC, 0x00405199, 0x00404E0D, sort audio functions by address, volume fading
|
2014-10-15 20:03:15 -06:00 |
IntelOrca
|
ece2522273
|
refactor window search functions
|
2014-10-16 02:02:43 +01:00 |
IntelOrca
|
268e7530c2
|
fix #525, creating a ride crashes when footpath window is open
|
2014-10-16 00:35:42 +01:00 |
IntelOrca
|
6fe1bace20
|
refactor input (flags in particular) and add sub_6EA73F
|
2014-10-15 22:59:26 +01:00 |
IntelOrca
|
dda40cb99a
|
add missing breaks in dropdown switch for top toolbar
|
2014-10-14 03:38:46 +01:00 |
IntelOrca
|
f22cc6bbeb
|
Merge branch 'master' into viewport-window
Conflicts:
projects/openrct2.vcxproj.filters
|
2014-10-12 17:28:17 +01:00 |
IntelOrca
|
9ebf6e5550
|
add open extra viewport to map button on top toolbar
|
2014-10-12 15:48:21 +01:00 |
Duncan Frost
|
18db536f87
|
Less magic numbers
|
2014-10-12 15:04:37 +01:00 |
Duncan Frost
|
bab896ad1e
|
Finished staff window.
|
2014-10-12 11:37:07 +01:00 |
Duncan Frost
|
2774c63eba
|
Added first draft of tool update and down
|
2014-10-12 11:37:06 +01:00 |
Duncan Frost
|
5ee4616685
|
Added remaining paint and invalidate functions
|
2014-10-12 11:37:05 +01:00 |
Duncan Frost
|
d02017cb48
|
Refactored widgets. Added staff stats invalidate
|
2014-10-12 11:37:05 +01:00 |
Duncan Frost
|
0ba79d70ab
|
Added remaining widgets
|
2014-10-12 11:37:04 +01:00 |
Duncan Frost
|
950bbccb34
|
Fix bugs introduced by previous commit.
|
2014-10-12 11:37:03 +01:00 |
Duncan Frost
|
10793011c4
|
Fix small mistakes in fire prompt
|
2014-10-12 11:37:02 +01:00 |
Duncan Frost
|
2a3989019b
|
Fix merge fails. Renamed a few functions
|
2014-10-12 11:37:02 +01:00 |
Duncan Frost
|
719ca2ddd2
|
Added start of window_staff_fire. Refactored some of window_staff_peep
|
2014-10-12 11:35:09 +01:00 |
IntelOrca
|
a12c771190
|
add locate button to viewport
|
2014-10-12 03:10:03 +01:00 |
IntelOrca
|
17e9ea1fc4
|
implement the viewport window
|
2014-10-12 02:55:42 +01:00 |
IntelOrca
|
c91c4f7ea0
|
implement mine train coaster rating calculation
|
2014-10-11 23:07:20 +01:00 |
Neranjen
|
9f556549c7
|
fix #516
|
2014-10-09 21:19:29 +05:30 |
IntelOrca
|
3cf28d6ef8
|
refactor config and add window size
|
2014-10-09 15:55:47 +01:00 |
IntelOrca
|
edf2b9c93a
|
refactor openrct2 loop
|
2014-10-09 14:31:51 +01:00 |
IntelOrca
|
93c5bddd4e
|
fix various research issues and improve
|
2014-10-08 22:11:50 +01:00 |
IntelOrca
|
7607468a42
|
Merge branch 'master' into research-update
|
2014-10-08 21:30:20 +01:00 |
zsilencer
|
9df2ee4b77
|
use mixer for title music, crowd noise, rain/thunder, and sound effects
|
2014-10-07 23:00:11 -06:00 |
IntelOrca
|
141f33acf8
|
implement research_next_design
|
2014-10-07 23:42:17 +01:00 |
IntelOrca
|
a32f73d27f
|
Merge branch 'master' into reorganise-src
Conflicts:
projects/openrct2.vcxproj
src/interface/window.h
|
2014-10-07 20:07:15 +01:00 |
IntelOrca
|
1770e82643
|
organise: refactor peep / staff window names
|
2014-10-07 19:39:52 +01:00 |
IntelOrca
|
1d92e3d7ab
|
Merge branch 'master' into reorganise-src
Conflicts:
projects/openrct2.vcxproj
projects/openrct2.vcxproj.filters
src/audio/audio.c
src/audio/mixer.h
src/game.c
src/ride/vehicle.c
src/windows/finances.c
src/windows/research.c
|
2014-10-07 19:10:16 +01:00 |
IntelOrca
|
daf231a2e9
|
organisation: move peep and staff to sub directory of its own
|
2014-10-06 19:41:43 +01:00 |
IntelOrca
|
c8df6174b8
|
organisation: fix includes
|
2014-10-06 17:36:58 +01:00 |
IntelOrca
|
554e1fe70e
|
organisation: move files and update project
|
2014-10-06 10:21:07 +01:00 |