You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Marc Zinnschlag c995533e07 Merge branch 'dialogue' into saving ... Conflicts: apps/opencs/model/world/columnimp.hpp apps/opencs/model/world/columns.cpp apps/opencs/model/world/columns.hpp apps/opencs/model/world/data.cpp components/esm/loaddial.hpp		11 years ago
..
mwbase	Merge remote-tracking branch 'potatoesmaster/DisableLevitation'	11 years ago
mwclass	silenced a warning	11 years ago
mwdialogue	Dialog function 72 is not player-specific	12 years ago
mwgui	Remember pressed message box button longer	11 years ago
mwinput	Add cut, copy & paste of text	11 years ago
mwmechanics	Merge remote-tracking branch 'rainChu/torches'	11 years ago
mwrender	Merge remote-tracking branch 'scrawl/master'	11 years ago
mwscript	Implement Disable/EnableLevitation script functions	11 years ago
mwsound	Slightly randomize time between environment sounds	12 years ago
mwworld	Merge branch 'dialogue' into saving	11 years ago
CMakeLists.txt	Issue #913: Merge --master and --plugin switches	11 years ago
config.hpp.cmake	another minor correction (fixing the previous one)	14 years ago
doc.hpp	first set of additional doxygen comments	14 years ago
engine.cpp	Merge branch 'dialogue' into saving	11 years ago
engine.hpp	Issue #913: Merge --master and --plugin switches	11 years ago
main.cpp	Issue #913: Merge --master and --plugin switches	11 years ago