27657 Commits

Author SHA1 Message Date
Duncan Frost
57cff462c4 Fixed offset locations due to missing byte. 2014-05-03 10:32:17 +01:00
IntelOrca
289b7d2811 Merge branch 'element_height' of https://github.com/ZedThree/OpenRCT2 into ZedThree-element_height 2014-05-03 10:30:11 +01:00
IntelOrca
9b46c74279 add load game and landscape dialog 2014-05-03 10:27:48 +01:00
ZedThree
3cd254fbbb Change formatting to VS style, improve comments 2014-05-03 10:24:25 +02:00
ZedThree
d4583339f4 squash! Add map_element_height (finishes sub_662783) 2014-05-03 10:22:20 +02:00
IntelOrca
5f8db5e115 add pause toggle game command 2014-05-03 09:00:49 +01:00
Duncan Frost
2cc3a56ffc Slowed down the cheat guests tab animation 2014-05-03 08:37:07 +01:00
IntelOrca
634ae0dbeb allow new quit game or load code to run 2014-05-03 02:33:01 +01:00
IntelOrca
51fa837caf add more peep fields 2014-05-03 00:31:53 +01:00
IntelOrca
59d0e94f06 use written cancel tool function 2014-05-02 22:38:16 +01:00
IntelOrca
b9925cd5a0 Merge branch 'master' into path-window 2014-05-02 22:36:04 +01:00
IntelOrca
9e3fedad59 add more peep fields 2014-05-02 22:34:14 +01:00
IntelOrca
74283010c8 Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 2014-05-02 22:26:43 +01:00
IntelOrca
1fdab25cb8 Merge branch 'MaciekBaron-master' 2014-05-02 22:24:29 +01:00
IntelOrca
a872065a83 Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master 2014-05-02 22:22:38 +01:00
IntelOrca
af5ef5e75d add game_load_or_quit function 2014-05-02 22:21:08 +01:00
Duncan Frost
c87ec51c28 Labelled some of the peep financial offsets. 2014-05-02 21:54:19 +01:00
ZedThree
297043fecd Add map_element_height (finishes sub_662783)
Possibly wrong for some slopes...
2014-05-02 22:15:53 +02:00
Maciek Baron
d4b5a05307 Merge remote-tracking branch 'upstream/master' 2014-05-02 21:15:20 +01:00
Maciek Baron
ca81c5e06d Adding enum with peep states 2014-05-02 21:07:48 +01:00
Maciek Baron
8da8519b6f Capping money in cheats 2014-05-02 21:07:20 +01:00
Matthias Lanzinger
fcd3daec57 Merge remote-tracking branch 'upstream/master' into update_objective 2014-05-02 16:17:51 +02:00
Matthias Lanzinger
002e914122 Reset a accidental change to the project file during a merge. 2014-05-02 16:16:32 +02:00
Matthias Lanzinger
039c398f20 Implement news_item_add_to_queue and some bugfixes. 2014-05-02 16:09:07 +02:00
Matthias Lanzinger
8915f5982c Leftover debug call 2014-05-02 15:06:58 +02:00