9768 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Duncan Frost	72d9d17bf7	Added some more sprites and changed get_guest_face to use them	2014-05-12 21:06:02 +01:00
adrian17	0e02787bf3	Prefer the RCT2_GLOBAL macro	2014-05-12 22:03:24 +02:00
ddevrien	4550a1de68	More work on options window ... dropdown function	2014-05-12 21:18:27 +02:00
IntelOrca	9dd5e59f55	Merge branch 'ddevrien-master'	2014-05-12 18:54:32 +01:00
Jørn Lomax	6b7cdf539b	added missing file from commit	2014-05-12 17:31:57 +02:00
Jørn Lomax	fcfe5f271d	Merge remote-tracking branch 'upstream/master' ... Conflicts: src/config.c	2014-05-12 17:31:25 +02:00
Jørn Lomax	3382be1430	intermidiate comit	2014-05-12 17:29:16 +02:00
ddevrien	942b722b28	some work on options window	2014-05-12 16:59:20 +02:00
ddevrien	df97c22dae	some strings added	2014-05-12 16:56:28 +02:00
ddevrien	c6fc8c634b	celsius fix	2014-05-12 16:51:40 +02:00
ddevrien	85a1e4aa6d	config addresses ... test	2014-05-12 16:50:13 +02:00
IntelOrca	7c6a193b42	remove all remaining warnings	2014-05-12 02:18:08 +01:00
IntelOrca	8dcca91092	mass clean up and reduce warnings	2014-05-12 01:45:45 +01:00
IntelOrca	8f1bde0f7f	Merge branch 'lnz-scenario_stuff'	2014-05-12 00:30:36 +01:00
lnz	bb12fc1a42	Implement update for ride favourited numbers	2014-05-11 23:21:26 +02:00
lnz	19a475f05a	Implement ride upkeep payments	2014-05-11 23:17:20 +02:00
IntelOrca	1cead7ad38	Merge branch 'master' into gfx_unstable	2014-05-11 21:29:07 +01:00
IntelOrca	b2a7d55bcd	Merge branch 'duncanspumpkin-gfx_draw_line'	2014-05-11 21:27:53 +01:00
IntelOrca	e4aaeded5f	Merge branch 'gfx_draw_line' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-gfx_draw_line	2014-05-11 21:27:27 +01:00
Duncan Frost	84342b07d2	Replaced decompiled code with bresenhams algorithm. Gfx_draw_line finished.	2014-05-11 21:25:18 +01:00
IntelOrca	5b77247226	Merge branch 'ZedThree-gfx_fill_rect' into gfx_unstable	2014-05-11 21:24:57 +01:00
ZedThree	ea83381e4c	Add author	2014-05-11 22:19:01 +02:00
ZedThree	7f4e21f334	Bug fix: cross-hatch loop was wrong ... Also rename and tidy up a bunch of variables	2014-05-11 21:31:31 +02:00
Duncan Frost	45532da9c6	Rewrote gfx_draw_line_on_buffer after realising how it works	2014-05-11 20:10:32 +01:00
IntelOrca	9eb48ecc84	Merge branch 'ddevrien-window_options'	2014-05-11 19:25:27 +01:00
IntelOrca	01fb20e397	Merge branch 'window_options' of https://github.com/ddevrien/OpenRCT2 into ddevrien-window_options	2014-05-11 19:23:57 +01:00
ZedThree	1e8f80fa5c	Bug fix - memset doesn't increase pointer	2014-05-11 18:42:28 +02:00
ZedThree	ba6263d2bd	Cross-hatching branch	2014-05-11 18:42:27 +02:00
ZedThree	ce0df83298	Formatting	2014-05-11 18:42:27 +02:00
ZedThree	6f1421117b	Some tidying up. Scrollbars don't work	2014-05-11 18:42:27 +02:00
ZedThree	705af9377b	Start decompiling gfx_fill_rect ... Section starting 0x00678C83 complete and works, but needs better comments/names	2014-05-11 18:42:26 +02:00
ddevrien	81f2bfed35	Implemented checkbox widget draw function	2014-05-11 18:42:26 +02:00
IntelOrca	bf8a032553	fix dropdown argument arrays	2014-05-11 16:50:29 +01:00
ddevrien	0ba23fe886	Some work on options window	2014-05-11 17:24:52 +02:00
Duncan Frost	cd8587243c	Initial rewrite of gfx_draw_line	2014-05-11 13:14:43 +01:00
IntelOrca	0fb43244d1	Merge branch 'ddevrien-window_options'	2014-05-11 11:57:11 +01:00
IntelOrca	8a6ad40c5d	Merge branch 'window_options' of https://github.com/ddevrien/OpenRCT2 into ddevrien-window_options	2014-05-11 11:56:35 +01:00
IntelOrca	7a3e151b86	Merge branch 'duncanspumpkin-gfx_draw_sprite' into gfx_unstable	2014-05-11 11:51:19 +01:00
IntelOrca	5a26d064d6	Merge branch 'gfx_draw_sprite' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-gfx_draw_sprite	2014-05-11 11:49:21 +01:00
IntelOrca	6440302617	Merge branch 'ddevrien-window_options'	2014-05-11 11:44:51 +01:00
IntelOrca	081a88d069	Merge branch 'window_options' of https://github.com/ddevrien/OpenRCT2 into ddevrien-window_options	2014-05-11 11:40:46 +01:00
Duncan Frost	a70de652ec	Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2	2014-05-11 10:19:38 +01:00
Duncan Frost	6d97593093	Bug in main draw_sprite func for now skipping code	2014-05-11 10:14:38 +01:00
ddevrien	52c95e4154	little addition to checkbox widget	2014-05-11 10:57:56 +02:00
ddevrien	5c5c5373cd	Implemented checkbox widget draw function	2014-05-11 10:51:05 +02:00
ddevrien	580035fdef	Fix groupbox widget draw issue (issue #91)	2014-05-11 09:45:03 +02:00
ddevrien	977fe5f485	forgot debug code	2014-05-11 09:04:25 +02:00
ddevrien	b39cf4d1af	Started work on options window	2014-05-11 09:01:01 +02:00
IntelOrca	70e7660d0b	add park_reset_awards_and_history	2014-05-11 01:18:56 +01:00
IntelOrca	f8363e098b	add park_init	2014-05-11 00:35:45 +01:00