Commit Graph

1675 Commits (d9945a976d8dfb08ecc79982e8b7280910d628ca)
 

Author SHA1 Message Date
Marc Zinnschlag d9945a976d Merge remote branch 'gus/DialogueSystem' into dialogue 13 years ago
gugus 4d4ae41a4a greetings are working now 13 years ago
gugus 4658ec276f increased the max size of the text of the dialogue 13 years ago
gugus eee5d20809 a little fix 13 years ago
gugus f1dc360720 added the script instruction addTopic 13 years ago
gugus 554bf8e586 Improvement in the dialogue manager 13 years ago
gugus 94ab65f8bb fixe a compiling error? 13 years ago
gugus ea8335a393 addTopic function 13 years ago
Marc Zinnschlag 00ac2deefb Merge remote branch 'pvdk/cmakeogre' into cmakeogre 13 years ago
gugus e7ef39cabc more improvements to dialogue filters. Some of them are still missing. 13 years ago
gugus f76e0e1941 corrected the light problem 13 years ago
Pieter van der Kloet 7bf8497215 Fixed CMake problem with Ogre plugins path 13 years ago
Pieter van der Kloet efe3a3fcbe Merge branch 'master' of https://github.com/zinnschlag/openmw into cmakeogre 13 years ago
Marc Zinnschlag c4e028effe fixing a faulty include 13 years ago
Marc Zinnschlag 0b0254d30e spelling fix 13 years ago
gugus c65c160e7b finished connecting the dialogue GUI and the dialogue manager 13 years ago
gugus abe38e5f87 Started to weire the dialogue manager and the dialogue GUI 13 years ago
Marc Zinnschlag 52a6605f10 Merge remote branch 'mirc/refactor_wm' into refactor_wm
- changed the way dynamics stats are passed to the character creation object
- some more clean up

Conflicts:
	.gitignore
	apps/openmw/mwgui/window_manager.cpp
	apps/openmw/mwgui/window_manager.hpp
13 years ago
Marc Zinnschlag c447ea073c Merge branch 'cmakefix' into next 13 years ago
Cris Mihalache 4bc7051741 Finished refactoring, brought CharacterCreation up to standards 13 years ago
Pieter van der Kloet c255c519e4 Replaced FindOGRE.cmake, this one looks for debug libraries too 13 years ago
Cris Mihalache ed5892eb5c Finished moving the bulk of character creation code 13 years ago
Cris Mihalache d17ba6ce19 Forgot the CharacterCreation files 13 years ago
Cris Mihalache 4b758376be Created a class for char gen, and starting moving code to it 13 years ago
Marc Zinnschlag e19cea3e7b Merge branch 'refdata' into next 13 years ago
Marc Zinnschlag a4785ffc4f minor fix 13 years ago
Marc Zinnschlag 5a70f28f47 removed a warning 13 years ago
Marc Zinnschlag 81d0d58346 Merge remote branch 'mirc/master' into openengine 13 years ago
Cris Mihalache daa8fb15ce Removed all physics-related code from Engine 13 years ago
Cris Mihalache 6d4fa9274e Moved OpenEngine systems into their appropriate classes 13 years ago
gugus 5cbd256e1c "full" question support. Now needs to be linked with the dialogue Manager. 13 years ago
gugus debec44b51 better colors (not perfect yet), and some basic question support (not finished yet). 13 years ago
Marc Zinnschlag 61dd1922b0 more specific cmake source file GLOBing 13 years ago
Marc Zinnschlag 0d7f39fcb5 Merge branch 'refdata' into next 13 years ago
Marc Zinnschlag a17c193f56 Merge remote branch 'pvdk/cmake' into cmake 13 years ago
Pieter van der Kloet ea241d85ef Fixed some issues with the CMake files 13 years ago
Marc Zinnschlag 8de6761a79 general cleanup 13 years ago
Marc Zinnschlag c081160591 replaced container store in ref data with new custom data implementation 13 years ago
gugus f7cf5f9bef improved the dialogue GUI. Questions are still missing. 13 years ago
Marc Zinnschlag b0256cea34 replaced movement settings in ref data with new custom data implementation 13 years ago
Marc Zinnschlag aa87bd4030 replaced creature stats in ref data with new custom data implementation 13 years ago
Marc Zinnschlag c6761e3470 replaced NPC stats in ref data with new custom data implementation 13 years ago
Marc Zinnschlag 6ada405af0 removing last bits of old D code 13 years ago
Marc Zinnschlag baf9cff21d added customdata base class (issue #185) 13 years ago
Marc Zinnschlag f14dc90b34 Merge branch 'animationfix' 13 years ago
Marc Zinnschlag 4b6cd582a7 removed some redundant (and misplaced) functions 13 years ago
Marc Zinnschlag 258ab0218a submodule update (issue #131) 13 years ago
Marc Zinnschlag 26c328e73f added some more comments to avoid further confusion 13 years ago
Marc Zinnschlag 16bc374921 animation updates were hooked up to the wrong update function 13 years ago
Marc Zinnschlag 7439c83623 Added custom copy-constructor, assignment-operator and destructor for RefData
Prerequisite for the ContainerStore rewrite, which is a prerequisite for issue #117.
13 years ago