Marisa-Chan
45589950c0
Merge remote-tracking branch 'upstream/master' into zvision
...
Conflicts:
engines/zvision/animation/rlf_animation.cpp
engines/zvision/animation_control.h
engines/zvision/core/console.cpp
engines/zvision/core/events.cpp
engines/zvision/cursors/cursor.cpp
engines/zvision/cursors/cursor_manager.cpp
engines/zvision/cursors/cursor_manager.h
engines/zvision/fonts/truetype_font.cpp
engines/zvision/graphics/render_manager.cpp
engines/zvision/graphics/render_manager.h
engines/zvision/inventory/inventory_manager.h
engines/zvision/inventory_manager.h
engines/zvision/meta_animation.h
engines/zvision/module.mk
engines/zvision/scripting/actions.cpp
engines/zvision/scripting/control.h
engines/zvision/scripting/controls/animation_control.cpp
engines/zvision/scripting/controls/animation_control.h
engines/zvision/scripting/controls/input_control.cpp
engines/zvision/scripting/controls/lever_control.cpp
engines/zvision/scripting/controls/timer_node.cpp
engines/zvision/scripting/controls/timer_node.h
engines/zvision/scripting/puzzle.h
engines/zvision/scripting/scr_file_handling.cpp
engines/zvision/scripting/script_manager.cpp
engines/zvision/scripting/script_manager.h
engines/zvision/sidefx.cpp
engines/zvision/sound/zork_raw.cpp
engines/zvision/sound/zork_raw.h
engines/zvision/video/video.cpp
engines/zvision/video/zork_avi_decoder.h
engines/zvision/zvision.cpp
engines/zvision/zvision.h
2014-06-13 21:43:04 +07:00
Johannes Schickel
aa4c5d46f7
ZVISION: Make GPL headers consistent in themselves.
2014-02-18 02:39:40 +01:00
Strangerke
0b63ea185d
ZVISION: Janitorial - Remove trailing spaces
2014-02-16 18:45:17 +01:00
RichieSams
5842c5098f
ZVISION: Create a folder structure for ZVision source files
...
I personally used filters within my IDE, but since others are now joining the project,
it was brought to my attention that some better organization would be nice.
2013-11-01 02:52:57 -05:00
