teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
1675 commits 34 branches 0 tags 66 MiB
Commit graph

896 commits

Author SHA1 Message Date
Marc Zinnschlag
d9945a976d Merge remote branch 'gus/DialogueSystem' into dialogue 2012-02-12 13:47:04 +01:00
gugus
4d4ae41a4a greetings are working now 2012-02-11 12:19:02 +01:00
gugus
4658ec276f increased the max size of the text of the dialogue 2012-02-11 12:18:47 +01:00
gugus
eee5d20809 a little fix 2012-02-10 22:54:17 +01:00
gugus
f1dc360720 added the script instruction addTopic 2012-02-10 22:02:24 +01:00
gugus
554bf8e586 Improvement in the dialogue manager 2012-02-10 22:01:31 +01:00
gugus
94ab65f8bb fixe a compiling error? 2012-02-10 16:21:04 +01:00
gugus
ea8335a393 addTopic function 2012-02-10 16:09:43 +01:00
Marc Zinnschlag
00ac2deefb Merge remote branch 'pvdk/cmakeogre' into cmakeogre 2012-02-10 14:36:34 +01:00
gugus
e7ef39cabc more improvements to dialogue filters. Some of them are still missing. 2012-02-09 19:27:15 +01:00
gugus
f76e0e1941 corrected the light problem 2012-02-08 00:32:22 +01:00
Marc Zinnschlag
c4e028effe fixing a faulty include 2012-02-06 10:48:58 +01:00
Marc Zinnschlag
0b0254d30e spelling fix 2012-02-06 10:48:14 +01:00
gugus
c65c160e7b finished connecting the dialogue GUI and the dialogue manager 2012-02-05 12:25:23 +01:00
gugus
abe38e5f87 Started to weire the dialogue manager and the dialogue GUI 2012-02-05 10:54:56 +01:00
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
 2012-02-03 11:24:28 +01:00
Cris Mihalache
4bc7051741 Finished refactoring, brought CharacterCreation up to standards 2012-02-02 18:31:28 +02:00
Cris Mihalache
ed5892eb5c Finished moving the bulk of character creation code 2012-01-30 21:53:17 +02:00
Cris Mihalache
d17ba6ce19 Forgot the CharacterCreation files 2012-01-30 19:27:49 +02:00
Cris Mihalache
4b758376be Created a class for char gen, and starting moving code to it 2012-01-30 16:38:43 +02:00
Marc Zinnschlag
e19cea3e7b Merge branch 'refdata' into next 2012-01-30 12:38:35 +01:00
Marc Zinnschlag
a4785ffc4f minor fix 2012-01-30 12:38:13 +01:00
Marc Zinnschlag
5a70f28f47 removed a warning 2012-01-29 20:29:02 +01:00
Marc Zinnschlag
81d0d58346 Merge remote branch 'mirc/master' into openengine 2012-01-29 20:25:11 +01:00
Cris Mihalache
daa8fb15ce Removed all physics-related code from Engine 2012-01-29 20:51:20 +02:00
Cris Mihalache
6d4fa9274e Moved OpenEngine systems into their appropriate classes 2012-01-29 17:31:18 +02:00
gugus
5cbd256e1c "full" question support. Now needs to be linked with the dialogue Manager. 2012-01-28 16:16:49 +01:00
gugus
debec44b51 better colors (not perfect yet), and some basic question support (not finished yet). 2012-01-28 16:08:22 +01:00
Marc Zinnschlag
0d7f39fcb5 Merge branch 'refdata' into next 2012-01-28 11:46:34 +01:00
Pieter van der Kloet
ea241d85ef Fixed some issues with the CMake files 2012-01-28 01:36:17 +01:00
Marc Zinnschlag
8de6761a79 general cleanup 2012-01-27 15:11:02 +01:00
Marc Zinnschlag
c081160591 replaced container store in ref data with new custom data implementation 2012-01-27 14:55:58 +01:00
gugus
f7cf5f9bef improved the dialogue GUI. Questions are still missing. 2012-01-27 14:50:13 +01:00
Marc Zinnschlag
b0256cea34 replaced movement settings in ref data with new custom data implementation 2012-01-27 13:17:30 +01:00
Marc Zinnschlag
aa87bd4030 replaced creature stats in ref data with new custom data implementation 2012-01-26 11:35:47 +01:00
Marc Zinnschlag
c6761e3470 replaced NPC stats in ref data with new custom data implementation 2012-01-25 16:56:49 +01:00
Marc Zinnschlag
baf9cff21d added customdata base class (issue #185) 2012-01-24 11:24:05 +01:00
Marc Zinnschlag
4b6cd582a7 removed some redundant (and misplaced) functions 2012-01-24 10:45:40 +01:00
Marc Zinnschlag
26c328e73f added some more comments to avoid further confusion 2012-01-23 14:55:00 +01:00
Marc Zinnschlag
16bc374921 animation updates were hooked up to the wrong update function 2012-01-23 14:33:06 +01:00
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.
 2012-01-22 11:22:12 +01:00
Marc Zinnschlag
6a88133178 Split refdata.hpp in a hpp and a cpp file 
Prerequisite for the ContainerStore rewrite, which is a prerequisite for issue #117.
 2012-01-22 11:00:40 +01:00
Marc Zinnschlag
0c2de2c00c Merge branch 'animation2' 2012-01-17 15:37:51 +01:00
Marc Zinnschlag
9b910dda94 clean up 2012-01-17 15:10:53 +01:00
Marc Zinnschlag
e3631003e9 Merge remote branch 'yacoby/detailed_fps' 2012-01-17 14:04:00 +01:00
Marc Zinnschlag
f5a82931b6 some cleanup 2012-01-17 13:53:27 +01:00
Jacob Essex
e73640e720 Improved code, added labels to the counter 2012-01-17 11:58:06 +00:00
gugus
484b8a95f0 removed useless std::cout 2012-01-16 21:58:18 +01:00
Jacob Essex
3b15170d09 Cleaned up and simplified the code relating to the fps display 2012-01-16 18:16:33 +00:00
gugus
eb4dea3d87 Previous/Next button implemented 2012-01-16 17:46:25 +01:00