mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-28 09:14:58 +01:00
Code Issues Releases Wiki Activity
353 Commits 8 Branches 59 Tags
3792b2b72e4cfb5dcfb4d45815bd797282dd3ce4
Commit Graph

47 Commits

Author SHA1 Message Date
lnz
169a3b6b72 Implement Peep problem warnings update. 2014-05-07 16:24:36 +02:00
IntelOrca
726c1a2312 fix peep structure 2014-05-05 20:16:27 +01:00
IntelOrca
73d9be16ab Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-master 2014-05-05 20:14:53 +01:00
Duncan Frost
ce14d72d16 Labeled ride photo 1-4 and time in park offsets. 2014-05-05 19:35:47 +01:00
Maciek Baron
f20311ec6c Fixing typo 2014-05-05 18:26:55 +01:00
Maciek Baron
1c51c81622 Reverting struct changes 2014-05-05 16:52:19 +01:00
Maciek Baron
29459fb9bb Adding item flags, time in thought struct 2014-05-05 16:41:29 +01:00
Duncan Frost
b63c7c41f0 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-05-04 21:18:41 +01:00
Duncan Frost
c4b7dd8a5a Added PEEP_NAUSEA_TOLERANCE enum 2014-05-04 21:14:30 +01:00
Ted John
eedab37993 Merge pull request #61 from MakaHost/master 
Fixed spelling in peep thought types
 2014-05-04 20:52:21 +01:00
Duncan Frost
d0203aaeda Labelled more peep offsets 2014-05-04 20:48:47 +01:00
MakaHost
bab2790027 Fixed spelling in peep thought types 2014-05-04 21:45:40 +02:00
Maciek Baron
d18ff2bb1b Adding peep thought types 2014-05-04 18:49:29 +01:00
IntelOrca
456ddebc1f clean peep.h 2014-05-03 16:14:16 +01:00
Maciek Baron
49affa9c75 Adding enum with trigger flags for peeps 2014-05-03 16:04:14 +01:00
IntelOrca
c6c44b5df2 Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-master 2014-05-03 10:38:45 +01:00
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
51fa837caf add more peep fields 2014-05-03 00:31:53 +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
a872065a83 Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master 2014-05-02 22:22:38 +01:00
Duncan Frost
c87ec51c28 Labelled some of the peep financial offsets. 2014-05-02 21:54:19 +01:00
Maciek Baron
ca81c5e06d Adding enum with peep states 2014-05-02 21:07:48 +01:00
ZedThree
db6374dfda Merge remote-tracking branch 'refs/remotes/upstream/master' 
* refs/remotes/upstream/master: (22 commits)
  fix bug with game_do_command
  add game_do_command
  add more info. to scenario_load_and_play
  set default screenshot format to PNG
  reorganise addresses
  fix peep structure
  Identified monthly ride income location.
  Label energy, thirst, hunger with offsets
  allow BMP to still be saved with PNG as default
  label nausea with offset
  Found nausea peep variable
  finish scenario start and add park size calculate
  Changed screenshot format from BMP to PNG (using LodePNG)
  add game flag for development only below tree height
  rename current day to current month ticks
  fix case and add author to source code header
  Fix comments
  Add rct_car sprite and tidy up news locator
  Change peep news item enum names
  Fix finding peep on ride news items
  ...

Conflicts:
	src/peep.h
 2014-05-02 14:01:04 +02:00
Duncan Frost
37dd73d166 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-05-01 22:55:51 +01:00
Duncan Frost
95649ba942 Added happy peeps cheat. Labeled Bathroom peep offset. 2014-05-01 22:55:26 +01:00
IntelOrca
5c387dfc13 Merge branch 'master' of https://github.com/lnz/OpenRCT2 into lnz-master 2014-05-01 21:41:01 +01:00
IntelOrca
373249dfe3 fix peep structure 2014-05-01 21:37:01 +01:00
Matthias Lanzinger
66f7a0bcdc Merge remote-tracking branch 'upstream/master' 
Conflicts:
	src/rct2.h
	src/window_game_bottom_toolbar.c
 2014-05-01 22:30:44 +02:00
Duncan Frost
15d5eb4e43 Label energy, thirst, hunger with offsets 2014-05-01 21:13:19 +01:00
IntelOrca
7e26477b3c label nausea with offset 2014-05-01 20:42:07 +01:00
Duncan Frost
29cb428368 Found nausea peep variable 2014-05-01 19:53:58 +01:00
IntelOrca
89edc7693c fix case and add author to source code header 2014-05-01 16:55:01 +01:00
IntelOrca
ae637f6291 fix case and add author to source code header 2014-05-01 14:17:00 +01:00
ZedThree
63df868422 Add rct_car sprite and tidy up news locator 
Also add (x,y,z) coordinate variables for rct_peep
 2014-05-01 14:16:59 +01:00
ZedThree
d5ff2f2781 Fix finding peep on ride news items 
Peep's current_* variables were offset by 1. Also fixed comparison
between 32-bit and 16-bit ints.
 2014-05-01 14:16:58 +01:00
ZedThree
8c28dbaaef Name peep variables for current train and car 2014-05-01 14:16:58 +01:00
ZedThree
7d38432796 Add rct_car sprite and tidy up news locator 
Also add (x,y,z) coordinate variables for rct_peep
 2014-05-01 14:02:28 +02:00
ZedThree
ecc51e2f4b Fix finding peep on ride news items 
Peep's current_* variables were offset by 1. Also fixed comparison
between 32-bit and 16-bit ints.
 2014-05-01 13:16:41 +02:00
ZedThree
1255d24be6 Name peep variables for current train and car 2014-05-01 13:03:43 +02:00
Matthias Lanzinger
9f321fa339 Identified peep.staff_type and days_in_month table. 2014-04-29 22:51:51 +02:00
Kevin Burke
e5a925e26c Add newlines to the end of every file (sed/unix do this) 2014-04-21 14:57:48 +05:30
IntelOrca
eba4b6da9d add other pages to park window 2014-04-16 02:05:49 +01:00
IntelOrca
f2f1f46880 add news item subject locating 2014-04-12 02:14:31 +01:00
IntelOrca
3a6a55147f add window functions and title screen windows 2014-04-03 03:08:06 +01:00
IntelOrca
0a12f15a25 add peep updating 2014-04-03 00:22:33 +01:00