gugus 0fb2107265 Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions ...

Conflicts:
	apps/openmw/mwclass/npc.cpp

2011-03-15 13:36:25 +01:00

..

birth.cpp

Move eventDone to WindowBase and make it tell which window is done

2011-03-12 10:56:10 +01:00

birth.hpp

Move eventDone to WindowBase and make it tell which window is done

2011-03-12 10:56:10 +01:00

class.cpp

Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions

2011-03-15 13:36:25 +01:00

class.hpp

Move eventDone to WindowBase and make it tell which window is done

2011-03-12 10:56:10 +01:00

console.cpp

removed custom messageBox implementation for console

2010-08-22 11:17:19 +02:00

console.hpp

added script interpreter for console

2010-07-21 10:08:38 +02:00

dialogue_history.cpp

Decrease number of classes that need to know about other components

2011-03-12 10:56:10 +01:00

dialogue_history.hpp

Added dialouge window

2010-11-06 01:09:37 +01:00

dialogue.cpp

Decrease number of classes that need to know about other components

2011-03-12 10:56:10 +01:00

dialogue.hpp

Decrease number of classes that need to know about other components

2011-03-12 10:56:10 +01:00

layouts.cpp

Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions

2011-03-15 13:36:25 +01:00

layouts.hpp

Decrease number of classes that need to know about other components

2011-03-12 10:56:10 +01:00

mode.hpp

Implemented the Class Choice dialog which allows the player to choose between three ways to define a class.

2010-10-10 01:50:19 +02:00

race.cpp

Move eventDone to WindowBase and make it tell which window is done

2011-03-12 10:56:10 +01:00

race.hpp

Move eventDone to WindowBase and make it tell which window is done

2011-03-12 10:56:10 +01:00

review.cpp

Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions

2011-03-15 13:36:25 +01:00

review.hpp

Get rid of deprecated warning for eventWindowChangeCoord

2011-03-12 13:54:00 +01:00

stats_window.cpp

Get rid of deprecated warning for eventWindowChangeCoord

2011-03-12 13:54:00 +01:00

stats_window.hpp

Get rid of deprecated warning for eventWindowChangeCoord

2011-03-12 13:54:00 +01:00

text_input.cpp

Move eventDone to WindowBase and make it tell which window is done

2011-03-12 10:56:10 +01:00

text_input.hpp

Move eventDone to WindowBase and make it tell which window is done

2011-03-12 10:56:10 +01:00

widgets.cpp

Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions

2011-03-15 13:36:25 +01:00

widgets.hpp

Decrease number of classes that need to know about other components

2011-03-12 10:56:10 +01:00

window_base.cpp

Decrease number of classes that need to know about other components

2011-03-12 10:56:10 +01:00

window_base.hpp

Move eventDone to WindowBase and make it tell which window is done

2011-03-12 10:56:10 +01:00

window_manager.cpp

Move eventDone to WindowBase and make it tell which window is done

2011-03-12 10:56:10 +01:00

window_manager.hpp

Move eventDone to WindowBase and make it tell which window is done

2011-03-12 10:56:10 +01:00