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
71e6f90e08
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
2014-10-07 18:48:46 +01:00
IntelOrca
f9f7dcfe32
Merge branch 'research-update'
2014-10-07 18:46:57 +01:00
Ted John
0c90265da2
Merge pull request #507 from zsilencer/master
...
vehicle sounds now using Mixer
2014-10-07 14:22:56 +01:00
zsilencer
b0f5271985
vehicle sounds now using Mixer
...
Fixed bug that caused widgets to miss draw. Fix #335
Merge pull request #505 from duncanspumpkin/gfx_rect
Fixed bug that caused widgets to miss draw.
fix #506 Paths can no longer be placed
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
vehicle sounds now using Mixer
Fixed bug that caused widgets to miss draw. Fix #335
Merge pull request #505 from duncanspumpkin/gfx_rect
Fixed bug that caused widgets to miss draw.
fix #506 Paths can no longer be placed
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
Merge branch 'master' of https://github.com/zsilencer/OpenRCT2
Fixed bug that caused widgets to miss draw. Fix #335
Merge pull request #505 from duncanspumpkin/gfx_rect
Fixed bug that caused widgets to miss draw.
fix #506 Paths can no longer be placed
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
vehicle sounds now using Mixer
Fixed bug that caused widgets to miss draw. Fix #335
Merge pull request #505 from duncanspumpkin/gfx_rect
Fixed bug that caused widgets to miss draw.
fix #506 Paths can no longer be placed
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
Merge branch 'master' of https://github.com/zsilencer/OpenRCT2
vehicle sounds now using Mixer
Fixed bug that caused widgets to miss draw. Fix #335
Merge pull request #505 from duncanspumpkin/gfx_rect
Fixed bug that caused widgets to miss draw.
fix #506 Paths can no longer be placed
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
Merge branch 'master' of https://github.com/zsilencer/OpenRCT2
2014-10-06 20:21:55 -06:00
IntelOrca
4733089bf4
fix #506 Paths can no longer be placed
2014-10-07 00:08:32 +01:00
IntelOrca
daf231a2e9
organisation: move peep and staff to sub directory of its own
2014-10-06 19:41:43 +01:00
IntelOrca
dd6247f6ee
organisation: fix real name array sizes
2014-10-06 18:53:33 +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
IntelOrca
f4b2d4b0b5
implement research_update_uncompleted_types and refactor research
2014-10-05 19:18:36 +01:00
IntelOrca
79ad5c0702
implement research_calculate_expected_date
2014-10-05 17:53:08 +01:00
IntelOrca
95a9b1ca2e
implement research_update
2014-10-05 15:23:52 +01:00
Ted John
95027654fc
Merge pull request #505 from duncanspumpkin/gfx_rect
...
Fixed bug that caused widgets to miss draw.
2014-10-05 13:28:56 +01:00
Duncan Frost
068e0c3396
Fixed bug that caused widgets to miss draw. Fix #335
2014-10-05 12:24:14 +01:00
IntelOrca
7869b8efd8
implement window_error
2014-10-05 02:51:17 +01:00
Ted John
f6bdab1eea
Merge pull request #498 from duncanspumpkin/renable_cso
...
Renable cso
2014-10-04 12:23:42 +01:00
Duncan Frost
bfb132146d
Fixed bugs in RLE code. Loading now works
2014-10-04 11:41:16 +01:00
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
Duncan Frost
45f9f585f1
Added encode functions. Missing check sum calc for end of chunk
2014-10-03 20:07:21 +01: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
Duncan Frost
2ea8d9e4b2
Added start of sawyer write chunk
2014-10-01 21:49:37 +01:00
Duncan Frost
e2c78f236c
Fix travis errors
2014-10-01 20:08:40 +01:00
Duncan Frost
593acfc867
Added code for writing new packed file.
2014-10-01 18:52:59 +01:00
Duncan Frost
bbc06c9ed7
Added code for finding next avaliable file name
2014-10-01 18:52:58 +01:00
Duncan Frost
a1a3df8158
Added more of load packed
2014-10-01 18:52:57 +01:00
Duncan
44a4862466
Small refactoring of load packed
2014-10-01 18:52:57 +01:00
Duncan
760ecf1525
Switched to main version of chunk read.
2014-10-01 18:52:56 +01:00
Duncan
85ccec4885
Switched to main version of chunk read.
2014-10-01 18:52:55 +01:00
Duncan
1133f7b609
Removed redundant function
2014-10-01 18:52:54 +01:00
Duncan
72c1acf207
Integrated fix of read chunk into main code
2014-10-01 18:52:54 +01:00
Duncan Frost
335aca4164
Cso now partially working.
2014-10-01 18:52:53 +01:00
Duncan Frost
a63ad06e76
Fixed remaining bugs caused by not using rct2 malloc.
2014-10-01 18:52:52 +01:00
Duncan Frost
5cf517c789
Added a fixed version of read_chunk requires more testing before joining
2014-10-01 18:52:51 +01:00
Duncan Frost
81121db634
Still trying to find bug
2014-10-01 18:52:50 +01:00
Duncan Frost
387ce00ae2
Added more of object load. Remember to change the openedEntry code
2014-10-01 18:52:50 +01:00
Duncan Frost
d2910392a4
Started reverse of load_object
2014-10-01 18:52:49 +01:00
Duncan Frost
928a61e167
Still searching for bug
2014-10-01 18:52:48 +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