mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +01:00
Code Issues Releases Wiki Activity
439 Commits 8 Branches 59 Tags
fcfe5f271d54a53cdcb3fa77d923e65376eb48ac
Commit Graph

439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
ddevrien
5f690ac134 Added basic code for banner window 2014-05-10 09:27:19 +02:00
Duncan Frost
45bd2d789c Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-05-10 07:14:44 +01:00
IntelOrca
61ceee26a7 remove extra scenario name address macro 2014-05-10 00:40:47 +01:00
IntelOrca
bfbb5b810b Merge branch 'MaciekBaron-master' 2014-05-10 00:38:42 +01:00
Maciek Baron
d3382e3a38 Renaming ride construction content 2014-05-09 23:43:10 +01:00
Maciek Baron
73d06418b6 Adding ride build date, reset function 2014-05-09 23:40:38 +01:00
IntelOrca
3b8f0d685b convert handling shortcut keys to switch 2014-05-09 23:05:50 +01:00
IntelOrca
9d07c4a508 Merge branch 'ZedThree-shortcuts' 2014-05-09 22:28:53 +01:00
IntelOrca
10b4c3cfab Merge branch 'shortcuts' of https://github.com/ZedThree/OpenRCT2 into ZedThree-shortcuts 2014-05-09 22:28:26 +01:00
IntelOrca
4e50980b61 Merge branch 'ddevrien-window_banner' 2014-05-09 22:26:59 +01:00
IntelOrca
b8dd77c1d7 Merge branch 'window_banner' of https://github.com/ddevrien/OpenRCT2 into ddevrien-window_banner 2014-05-09 22:25:10 +01:00
ZedThree
2523b1f328 Fix a couple of window bugs 2014-05-09 23:10:26 +02:00
ZedThree
93d062704d Add code to handle shortcuts 2014-05-09 23:10:25 +02:00
ZedThree
bc413fede9 Add helper function for calling widget events 
Add window_event_helper
 2014-05-09 23:10:13 +02:00
ZedThree
b2d1f0dfd6 Add functions for closing top/all window(s) 2014-05-09 22:53:26 +02:00
ddevrien
b280675ab5 cleanup 2014-05-09 21:03:00 +02:00
ddevrien
6ddeb610f0 Some additions to window_banner 2014-05-09 20:59:41 +02:00
Duncan Frost
0ea838358b Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-05-09 19:47:54 +01:00
IntelOrca
1bedba626d Merge branch 'atmaxinger-os-specific' 2014-05-09 14:41:02 +01:00
IntelOrca
f813a70cd6 Merge branch 'os-specific' of https://github.com/atmaxinger/OpenRCT2 into atmaxinger-os-specific 2014-05-09 14:39:27 +01:00
IntelOrca
1f6d7353c1 Merge branch 'mzmiric5-master' 2014-05-09 14:37:40 +01:00
IntelOrca
f315013e76 Merge branch 'master' of https://github.com/mzmiric5/OpenRCT2 into mzmiric5-master 2014-05-09 14:36:49 +01:00