mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,539 Commits 7 Branches 39 Tags 358 MiB
Commit Graph

1539 Commits

Author SHA1 Message Date
IntelOrca 722976e237 implement music tab for ride window 2014-09-04 15:42:36 +01:00
IntelOrca ae9b91d859 implement tab images 2014-09-03 23:19:13 +01:00
IntelOrca e452ed00fa Merge branch 'master' into ride-window 2014-09-03 23:18:53 +01:00
IntelOrca f639fd6054 refactor ride structure 2014-09-03 23:17:31 +01:00
IntelOrca 76fda20859 implement ride window drawing 2014-09-03 19:13:37 +01:00
IntelOrca 55fc04ae82 Merge branch 'master' into ride-window 2014-09-03 14:01:42 +01:00
Ted John 0af2415d0a Merge pull request #398 from Balletie/master 
Decompile 0x006B4800
 2014-09-02 23:39:17 +01:00
Balletie fb9819f9c6 Merge remote-tracking branch 'upstream/master' 2014-09-02 23:39:21 +02:00
Balletie 91ca6401b5 Fixes the last bug 2014-09-02 23:38:59 +02:00
Balletie 51b377b7b9 Construction window is shown, but with very weird results still 2014-09-02 20:33:23 +02:00
Ted John 7e7531f8d1 Merge pull request #397 from jcdavis/master 
Decompile 6CB70A
 2014-09-02 18:29:30 +01:00
Jackson Davis c6bb6f5809 Move to viewport.c 2014-09-02 19:10:49 +02:00
Jackson Davis 7cc79d95c1 First pass at 6CB70A 2014-09-02 17:56:30 +02:00
Balletie 152f244cdf Merge remote-tracking branch 'upstream/master' 2014-09-02 17:53:00 +02:00
Balletie 4f5dc9b33e Initial crack at decompiling 0x006B4800 2014-09-02 17:52:23 +02:00
IntelOrca a72b879660 implement ride rename for ride window 2014-09-02 14:05:44 +01:00
IntelOrca fc1f28e845 Merge branch 'master' into ride-window 2014-09-02 13:31:23 +01:00
Ted John 07fc15751b Merge pull request #395 from zsilencer/master 
A pull request
 2014-09-02 08:51:11 +01:00
zsilencer a284d446ee Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 
Conflicts:
	src/addresses.h
 2014-09-01 20:20:03 -06:00
zsilencer 6dd4110b89 useless functions decompiled 2014-09-01 19:59:39 -06:00
zsilencer 6de4fa1fcf low-hanging fruit 2014-09-01 15:42:56 -06:00
Ted John 5e7187966a Merge pull request #394 from jcdavis/master 
Decompile 006EE65A
 2014-09-01 21:44:53 +01:00
Jackson Davis 4b3150449a Fix typo 2014-09-01 22:22:54 +02:00
Jackson Davis fc2c3bdb51 Rename 6EE65A to push_others_right + refactor 2014-09-01 22:16:08 +02:00
Jackson Davis f0d4261659 Move 6EE65A to window.c + minor refactor 2014-09-01 17:10:15 +01:00
Jackson Davis ba6d0bee30 First pass at 6EE65A 2014-09-01 16:55:51 +01:00
IntelOrca 1647100b1a implement dropdown behaviour for window ride 2014-09-01 14:06:21 +01:00
IntelOrca 17c4e4937a implement ride window widgets and dropdown lists 2014-09-01 12:04:34 +01:00
zsilencer b02463478b few basic functions decompiled and small bug fix 2014-09-01 00:12:46 -06:00
IntelOrca 78cd7407fa implement construction button 2014-08-31 15:43:07 +01:00
IntelOrca 8e0f1884b9 Merge branch 'master' into ride-window 2014-08-31 15:41:39 +01:00
IntelOrca 2cfb2908de add ride track functions, for window ride branch 2014-08-31 15:40:08 +01:00
IntelOrca 53ac0b971b Merge branch 'master' into ride-window 2014-08-31 12:28:23 +01:00
Ted John ea481d5033 Merge pull request #392 from DutchRPW/master 
Money related stuff
 2014-08-31 12:21:26 +01:00
Patrick Wijnings 094a5083ae Merge remote-tracking branch 'IntelOrca/master' 2014-08-31 13:07:00 +02:00
Patrick Wijnings 9a6537209d Add comment to finance_update_daily_profit(). 2014-08-31 13:06:24 +02:00
Patrick Wijnings b832a7235b More PARK_FLAGS_NO_MONEY updates. Implement finance_update_daily_profit(). 2014-08-31 13:01:50 +02:00
Ted John 39eb35336f Merge pull request #391 from hexdec/master 
Added missing enabled_widgets for window_staff_peep.
 2014-08-31 00:58:44 +01:00
hexdec d2e27c0428 Added Widget enums for window_staff_peep. 2014-08-31 00:16:35 +02:00
hexdec 858be90222 Added the missing enabled_widgets for window_staff_peep. 2014-08-31 00:06:11 +02:00
Ted John 33eaa81e20 Merge pull request #390 from zsilencer/master 
sound routines
 2014-08-30 20:55:08 +01:00
zsilencer 81de6e1234 0x004015E7 2014-08-30 13:44:47 -06:00
Ted John 693358e3e7 Merge pull request #388 from adrian17/widget_is_enabled_fix 
Fix #385
 2014-08-30 16:07:33 +01:00
Ted John 8ae6089111 Merge pull request #389 from hexdec/master 
Fixed typo in window_staff_peep_stats_update
 2014-08-30 15:41:06 +01:00
hexdec b253ad56ce Fixed typo in window_staff_peep_stats_update. 2014-08-30 15:31:44 +02:00
adrian17 4cce2e3883 Fixed some buttons not working after last commit 2014-08-30 15:29:14 +02:00
Patrick Wijnings 81163506e9 Merge remote-tracking branch 'IntelOrca/master' 
Conflicts:
	src/game.c
	src/park.h
 2014-08-30 15:18:31 +02:00
Patrick Wijnings 5e96da6634 Fix definition of PARK_FLAGS_NO_MONEY flag and clean up related code. 2014-08-30 15:11:19 +02:00
adrian17 4d29aaa6bd Fix #385, made widget_is_enabled return 1 if true 2014-08-30 14:31:36 +02:00
Ted John 7d336c440c Merge pull request #386 from wolfreak99/patch-1 
Corrected about window's credits.
 2014-08-30 10:35:27 +01:00