mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 04:23:20 +01:00
Code Issues Releases Wiki Activity
1,821 Commits 8 Branches 59 Tags
ff2dad17a0d3e23003ffe34414edfc99641eddae
Commit Graph

1821 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
IntelOrca
ff2dad17a0 Merge branch 'track-list-window' 2014-10-04 00:53:44 +01:00
Ted John
2b69e9e914 Merge pull request #501 from zsilencer/master 
0x006838BD, 0x006BA8E0
 2014-10-04 00:53:12 +01:00
IntelOrca
7c79a0199f implement window_track_place_draw_mini_preview 2014-10-04 00:28:43 +01:00
zsilencer
bfbcbbc996 small fixes 
palette effects

small fixes

palette effects

small fixes

Merge branch 'test'

Conflicts:
	src/window_music_credits.c

palette effects

palette effects

small fixes

Merge branch 'test'

Conflicts:
	src/window_music_credits.c

palette effects

small fixes

Merge branch 'test'

Conflicts:
	src/window_music_credits.c

Merge branch 'master' of https://github.com/zsilencer/OpenRCT2

Merge branch 'master' of https://github.com/zsilencer/OpenRCT2

Merge branch 'master' of https://github.com/zsilencer/OpenRCT2

Merge branch 'master' of https://github.com/zsilencer/OpenRCT2

Merge branch 'master' of https://github.com/zsilencer/OpenRCT2

Merge branch 'master' of https://github.com/zsilencer/OpenRCT2

Merge branch 'master' of https://github.com/zsilencer/OpenRCT2

Merge branch 'master' of https://github.com/zsilencer/OpenRCT2

added window_music_credits.c

added window_music_credits.c

Merge branch 'master' of https://github.com/zsilencer/OpenRCT2
 2014-10-03 16:43:52 -06:00
IntelOrca
db8b9439b8 refactor window_track_place.c 2014-10-03 18:15:20 +01:00
Ted John
666fe7211c Merge pull request #484 from marcotc/work 
Basic analysis of window_map_mousedown
 2014-10-03 17:51:11 +01:00
IntelOrca
24a6f27551 fix path bug and implement tooldown for place track 2014-10-03 17:50:09 +01:00
IntelOrca
67512d7cd7 Merge branch 'master' into track-list-window 2014-10-03 16:53:20 +01:00
zsilencer
f2e501134e palette effects 2014-10-02 19:04:29 -06:00
IntelOrca
811587515a Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-10-02 21:55:22 +01:00
IntelOrca
44c2e29b51 add zoom touch gesture support 2014-10-02 21:55:04 +01:00
IntelOrca
f761306beb implement window_track_place_toolupdate 2014-10-01 02:03:36 +01:00
Ted John
a01e358ece Merge pull request #497 from JarnoVgr/master 
Update readme.md
 2014-10-01 00:19:41 +01:00
JarnoVgr
1aeb75398f Update readme.md 
Hope this small change will give the project more attention by adding a link to the OpenRCT2.com precompiled builds.
 2014-09-30 23:24:02 +02:00
Ted John
cf8553d312 Merge pull request #495 from kevinburke/symbolic-link 
Add symbolic link if it is not present
 2014-09-30 20:41:42 +01:00
Kevin Burke
7e1161a0c4 Add symbolic link if it is not present 2014-09-30 11:11:44 -07:00
IntelOrca
2b9aa8a2b7 start implementing window_track_place 2014-09-30 18:56:30 +01:00
IntelOrca
64898b2858 Merge branch 'track-list-window' 2014-09-28 17:58:40 +01:00
IntelOrca
4aff83e508 implement sub_67726A, track loading function 2014-09-28 17:57:25 +01:00
IntelOrca
b7162b6979 implement track_get_info 2014-09-28 00:58:05 +01:00
IntelOrca
f246b97c69 implement window_track_list_select 2014-09-27 23:48:42 +01:00
IntelOrca
a0bdde2525 implement track list window paint 2014-09-27 20:26:04 +01:00
IntelOrca
70ebc89c37 implement scrollmouseover and scrollpaint for track list window 2014-09-27 01:49:47 +01:00
IntelOrca
f026f92d1e start implementation of track list window 2014-09-27 00:41:24 +01:00
Ted John
b65554e669 Merge pull request #489 from hexdec/window_publisher_credits 
Decompiled publisher credits window.
 2014-09-26 21:22:04 +01:00
hexdec
6973b6586b Decompiled published credits window. 
Renamed window_credits to window_music_credits.
Added draw_string_centred_underline to gfx.c.
 2014-09-26 22:19:48 +02:00
Ted John
733c74a389 Merge pull request #486 from duncanspumpkin/fix_482 
Fix #482
 2014-09-24 19:18:48 +01:00
Duncan Frost
ddc047241e Added some checks on object loading to eventualy fix #225 2014-09-24 17:47:19 +01:00
Duncan Frost
4d41118be7 Fixes #482 caused by not passing the widgetIndex and x and y coordinates. 2014-09-24 17:12:07 +01:00
Marco Costa
9d2ceec196 Basic analysis of window_map_mousedown 
* This function doesn't appear to relevant for the normal map window, as
it doesn't have the required widgets. Considering that the Scenario
Editor has a more complex map window, I assume that this function does
processing referred to that instance instead.
 2014-09-23 21:52:50 -04:00
IntelOrca
91bfc392c9 implement window_dropdown_show_colour 2014-09-23 21:22:14 +01:00
Ted John
912c80f867 Merge pull request #477 from zsilencer/master 
window_scroll_to_location
 2014-09-23 12:57:14 +01:00
Ted John
9124549b65 Merge pull request #480 from duncanspumpkin/fix_window_ride 
Fix window ride
 2014-09-23 12:57:07 +01:00
Ted John
2ff6d533e8 Merge pull request #481 from marcotc/work 
Fix errors/warnings in VS build
 2014-09-23 12:52:38 +01:00
Marco Costa
58cea29223 Fix errors/warnings in VS build 
* Added libspeex to 'Debug' target, previously only 'Release' had it.
* Initialize some pointers with NULL when an uninitialized code path is
unlikely, but possible.
 2014-09-22 20:37:35 -04:00
zsilencer
10f60d205d #479 2014-09-22 12:35:47 -06:00
Duncan Frost
69e13758d0 Move cursor location fix #476 2014-09-22 17:57:46 +01:00
Duncan Frost
e0a7d4533d Use new ride window when clicking on ride 2014-09-22 17:46:14 +01:00
Duncan Frost
b1886a53e4 Finished viewport_create for window_ride 2014-09-22 17:39:24 +01:00
zsilencer
d4734c9ac2 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-09-22 02:15:47 -06:00
zsilencer
f7cc9e4501 window_scroll_to_location 2014-09-22 02:04:10 -06:00
Duncan Frost
63280b200c Fix compile error 2014-09-21 17:44:22 +01:00
Duncan Frost
0f7ca91caf Started adding init_viewport 2014-09-21 17:44:22 +01:00
Duncan Frost
3c1a18e506 Fixes issues with colour drop down. 2014-09-21 17:44:21 +01:00
IntelOrca
8017bc8d27 fixes #472, invalid vehicle status' 2014-09-21 17:42:00 +01:00
IntelOrca
0164a1822a implement ride_get_measurement 2014-09-21 17:26:20 +01:00
IntelOrca
fa8fca8dff remove warnings from audio.c 2014-09-21 15:40:39 +01:00
IntelOrca
2f8402e461 refactor peep easter egg names 2014-09-21 15:38:55 +01:00
IntelOrca
42ef09253e implement ride measurement update 2014-09-21 13:50:35 +01:00
IntelOrca
f60b4d8f62 fix scroll flags not reset bug 2014-09-21 11:31:13 +01:00