krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
1654 commits 35 branches 0 tags 65 MiB
Commit graph

217 commits

Author SHA1 Message Date
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
5a70f28f47 removed a warning 2012-01-29 20:29:02 +01:00
Cris Mihalache
6d4fa9274e Moved OpenEngine systems into their appropriate classes 2012-01-29 17:31:18 +02: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
Jacob Essex
18e4b73a86 Added a more detailed fps counter displaying the triangle and batch count 2012-01-16 15:33:21 +00:00
gugus
9031f62962 The journal is now in the center of the screen. 2012-01-11 12:58:39 +01:00
gugus
428d0ce820 journal formating. Problems with french accents. 2011-12-30 11:39:17 +01:00
gugus
d59284a096 first attempt to read the journal 2011-12-29 17:58:58 +01:00
gugus
28bd9ce362 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into journal 2011-12-11 11:21:57 +01:00
gugus
4087ab3cda correct CMake and add some text formating attempt. 2011-12-01 13:44:34 +01:00
gugus
62946cc79d can now clear text. 2011-11-28 17:00:32 +01:00
gugus
bc51ba5a38 Add the journal window (J key). It's still not in the right position. 2011-11-28 16:51:11 +01:00
Marc Zinnschlag
39af941d6f Issue #19: Moved code from Engine to WindowManager and ScriptManager 2011-10-09 12:05:13 +02:00
k1ll
0ece722ff3 Added handling of quotation marks and search for matches now ignores the case of input and keywords. When completing and there are matching or partly matching uppercase keywords the output will be upercase too. If this is a problem i'll change it. 2011-07-19 18:42:34 +02:00
k1ll
ac43d482c5 Basic tab-completition seems to be finished. It's working like requested in the old thread. 2011-07-18 18:49:38 +02:00
Sebastian Wick
317c920e03 everything works, also the readPressedButton function should do the job 2011-07-12 20:05:04 +02:00
Sebastian Wick
16ed02baeb all MessageBoxes look good; next: make them do something ;) 2011-07-12 19:17:07 +02:00
Sebastian Wick
0fc77dc1c3 everything looks good if buttons are on one line 2011-07-12 18:05:46 +02:00
Sebastian Wick
537b2bf963 set position on interactive MessageBox'es 2011-07-12 17:57:16 +02:00
Sebastian Wick
9c2bb76869 disigned the interactive messagebox. Have to center it and add button events 2011-06-19 22:56:51 +02:00
Sebastian Wick
23194a932f creating the buttons on the fly 2011-06-19 19:41:42 +02:00
Sebastian Wick
5db8e8c449 InterMessageBox game mode 2011-06-19 19:10:44 +02:00
Sebastian Wick
e77240dceb basics for InteractiveMessageBox 2011-06-18 15:50:41 +02:00
Sebastian Wick
d74f834735 make to boxes apear on the correct place even if the oldest is erased 2011-06-16 18:12:50 +02:00
Sebastian Wick
315f4078c6 make them behave like the MessageBox in the original game 2011-06-16 17:11:50 +02:00
Sebastian Wick
b72e9d3b2b non-interactive MessageBox is finished. Didn't find any bugs. 2011-06-16 13:02:49 +02:00
Sebastian Wick
4d1db13c8f MessageBoxmangerTimer is now working properly 2011-06-16 12:12:50 +02:00
Sebastian Wick
a4217f8fb8 Everything should work fine but deleting the existing MessageBox'es. 2011-06-15 22:53:05 +02:00
Sebastian Wick
94e010b790 delete all non-interactive MessageBox'es when creating an interactive MessageBox 2011-06-15 19:53:32 +02:00
Sebastian Wick
6dc35247da Word wrap for MessageBox 2011-06-15 19:42:20 +02:00
Sebastian Wick
9c56031ee2 rudimental implementation of non-interactive MessageBox 2011-06-15 13:58:57 +02:00
Sebastian Wick
fc25ccef4e MW_Dialog set ro right propertys 2011-06-14 22:11:36 +02:00
Sebastian Wick
56dc9ffcf3 now, realy deleted needless code. 2011-06-14 18:29:55 +02:00
Sebastian Wick
5bf5bde946 created new files, conncted MessageBoxManger with WindowManager 2011-06-14 16:41:30 +02:00
Marc Zinnschlag
80691250ec don't create a new virtual machine for each script and frame 2011-05-18 16:01:19 +02:00
Marc Zinnschlag
5b6ec405e3 Merge branch 'script' 2011-04-28 10:30:32 +02:00
Marc Zinnschlag
125319c441 splitting off console output from messageBox channel 2011-04-26 21:48:13 +02:00
Marc Zinnschlag
717b5e1784 fixed a constness problem 2011-04-21 10:49:45 +02:00
Marc Zinnschlag
a70e582ae2 removed debugging leftovers from the tab_complition branch 2011-03-23 23:03:41 +01:00
Marc Zinnschlag
d7226fc9c2 Merge branch 'tab_completion' 2011-03-23 17:08:52 +01:00
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