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

..

addresses.h

add game_do_command

2014-05-02 02:12:14 +01:00

audio.c

Add newlines to the end of every file (sed/unix do this)

2014-04-21 14:57:48 +05:30

audio.h

Add newlines to the end of every file (sed/unix do this)

2014-04-21 14:57:48 +05:30

climate.c

add author credit to source code header

2014-04-29 12:39:18 +01:00

climate.h

add author credit to source code header

2014-04-29 12:39:18 +01:00

config.c

implement keyboard shortcuts

2014-04-26 01:16:32 +01:00

config.h

implement keyboard shortcuts

2014-04-26 01:16:32 +01:00

date.c

Merge remote-tracking branch 'upstream/master'

2014-05-01 22:30:44 +02:00

date.h

Identified peep.staff_type and days_in_month table.

2014-04-29 22:51:51 +02:00

editor.c

add game_do_command

2014-05-02 02:12:14 +01:00

editor.h

Add newlines to the end of every file (sed/unix do this)

2014-04-21 14:57:48 +05:30

game.c

fix bug with game_do_command

2014-05-02 03:05:18 +01:00

game.h

add game_do_command

2014-05-02 02:12:14 +01:00

gfx.c

Replace variable addresses with named constants

2014-04-28 22:00:54 +02:00

gfx.h

add bitmap screenshot saving

2014-04-26 03:17:32 +01:00

intro.c

Add newlines to the end of every file (sed/unix do this)

2014-04-21 14:57:48 +05:30

intro.h

Add newlines to the end of every file (sed/unix do this)

2014-04-21 14:57:48 +05:30

map.c

add more input logic and tooltip window

2014-04-24 18:53:42 +01:00

map.h

Add newlines to the end of every file (sed/unix do this)

2014-04-21 14:57:48 +05:30

news_item.c

Fix comments

2014-05-01 14:17:00 +01:00

news_item.h

Change peep news item enum names

2014-05-01 14:16:59 +01:00

object.c

Add newlines to the end of every file (sed/unix do this)

2014-04-21 14:57:48 +05:30

object.h

Add newlines to the end of every file (sed/unix do this)

2014-04-21 14:57:48 +05:30

osinterface.c

credit author in source code header

2014-04-28 22:03:52 +02:00

osinterface.h

Add separate key buffer for shortcuts to fix misbehaving panning with keyboard

2014-04-28 22:03:52 +02:00

park.c

finish scenario start and add park size calculate

2014-05-01 19:35:47 +01:00

park.h

finish scenario start and add park size calculate

2014-05-01 19:35:47 +01:00

peep.c

Replace variable addresses with named constants

2014-04-28 22:00:54 +02:00

peep.h

Merge remote-tracking branch 'refs/remotes/upstream/master'

2014-05-02 14:01:04 +02:00

rct2.c

Replace variable addresses with named constants

2014-04-28 22:00:54 +02:00

rct2.h

finish scenario start and add park size calculate

2014-05-01 19:35:47 +01:00

ride.c

Add newlines to the end of every file (sed/unix do this)

2014-04-21 14:57:48 +05:30

ride.h

fix case and add author to source code header

2014-05-01 16:55:01 +01:00

sawyercoding.c

Add newlines to the end of every file (sed/unix do this)

2014-04-21 14:57:48 +05:30

sawyercoding.h

Add newlines to the end of every file (sed/unix do this)

2014-04-21 14:57:48 +05:30

scenario.c

add game_do_command

2014-05-02 02:12:14 +01:00

scenario.h

Add newlines to the end of every file (sed/unix do this)

2014-04-21 14:57:48 +05:30

screenshot.c

set default screenshot format to PNG

2014-05-01 22:53:44 +01:00

screenshot.h

allow BMP to still be saved with PNG as default

2014-05-01 20:55:53 +01:00

sprite.h

fix case and add author to source code header

2014-05-01 16:55:01 +01:00

sprites.h

Add newlines to the end of every file (sed/unix do this)

2014-04-21 14:57:48 +05:30

strings.c

Add newlines to the end of every file (sed/unix do this)

2014-04-21 14:57:48 +05:30

strings.h

add about window

2014-04-28 22:03:52 +02:00

title.c

draw OpenRCT2 text and version on title screen

2014-04-30 14:31:52 +01:00

title.h

Add newlines to the end of every file (sed/unix do this)

2014-04-21 14:57:48 +05:30

track.c

add additional authors in source code headers

2014-04-27 20:21:55 +01:00

track.h

add track definitions

2014-04-23 01:50:40 +01:00

tutorial.c

add title options and block tutorial

2014-04-26 16:53:21 +01:00

tutorial.h

implement keyboard shortcuts

2014-04-26 01:16:32 +01:00

util.c

Corrected typo in comment.

2014-04-24 18:19:58 -04:00

util.h

Add newlines to the end of every file (sed/unix do this)

2014-04-21 14:57:48 +05:30

viewport.c

Add newlines to the end of every file (sed/unix do this)

2014-04-21 14:57:48 +05:30

viewport.h

Add newlines to the end of every file (sed/unix do this)

2014-04-21 14:57:48 +05:30

widget.c

add more input logic and tooltip window

2014-04-24 18:53:42 +01:00

widget.h

add more input logic and tooltip window

2014-04-24 18:53:42 +01:00

window_about.c

add about window

2014-04-28 22:03:52 +02:00

window_cheats.c

Add newlines to the end of every file (sed/unix do this)

2014-04-21 14:57:48 +05:30

window_clear_scenery.c

Replace variable addresses with named constants

2014-04-28 22:00:54 +02:00

window_dropdown.c

Replace variable addresses with named constants

2014-04-28 22:00:54 +02:00

window_dropdown.h

add more input logic and tooltip window

2014-04-24 18:53:42 +01:00

window_error.c

add screenshot and error window base functions

2014-04-25 18:25:34 +01:00

window_error.h

add screenshot and error window base functions

2014-04-25 18:25:34 +01:00

window_game_bottom_toolbar.c

Merge remote-tracking branch 'upstream/master'

2014-05-01 22:30:44 +02:00

window_game_top_toolbar.c

add game_do_command

2014-05-02 02:12:14 +01:00

window_land.c

Replace variable addresses with named constants

2014-04-28 22:00:54 +02:00

window_main.c

Replace variable addresses with named constants

2014-04-28 22:00:54 +02:00

window_park.c

add game_do_command

2014-05-02 02:12:14 +01:00

window_ride_list.c

add game_do_command

2014-05-02 02:12:14 +01:00

window_title_exit.c

add game_do_command

2014-05-02 02:12:14 +01:00

window_title_logo.c

Use colour defines over magic numbers

2014-04-29 22:12:04 +01:00

window_title_menu.c

add game_do_command

2014-05-02 02:12:14 +01:00

window_title_scenarioselect.c

refactor window flags

2014-04-24 20:26:05 +01:00

window_tooltip.c

add screenshot and error window base functions

2014-04-25 18:25:34 +01:00

window_tooltip.h

add more input logic and tooltip window

2014-04-24 18:53:42 +01:00

window_water.c

Replace variable addresses with named constants

2014-04-28 22:00:54 +02:00

window.c

decompile window mouse wheel input

2014-04-26 15:50:01 +01:00

window.h

add more info. to scenario_load_and_play

2014-05-02 00:18:49 +01:00