gugus
07d8d654cd
one step toward function filters and end choices.
2012-03-14 18:47:29 +01:00
gugus
6f7752633a
there was no extension in the compiler context. Corrected. But Choice doesn't work.
2012-03-07 18:44:09 +01:00
Marc Zinnschlag
65756db49e
Merge remote branch 'gus/DialogueSystem' into dialogue
2012-03-05 11:34:16 +01:00
Marc Zinnschlag
4bdfbb6d4f
Merge branch 'master' into dialogue
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2012-03-05 11:34:06 +01:00
Marc Zinnschlag
e02cba58b1
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwclass/light.cpp
2012-02-20 14:34:27 +01:00
gugus
232e478768
Fix for prefix/suffix stuff
2012-02-15 13:23:59 +01:00
gugus
bc72b2d535
fixed text color
2012-02-12 22:24:23 +01:00
Lukasz Gromanowski
8829d46bda
Clean up compilation warnings.
...
Clan up compilation warnings like "variable ... set but not used" introduced
in some older and recent commits.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-02-12 15:45:08 +01:00
Marc Zinnschlag
d9945a976d
Merge remote branch 'gus/DialogueSystem' into dialogue
2012-02-12 13:47:04 +01:00
gugus
4658ec276f
increased the max size of the text of the dialogue
2012-02-11 12:18:47 +01:00
gugus
94ab65f8bb
fixe a compiling error?
2012-02-10 16:21:04 +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
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
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
gugus
f7cf5f9bef
improved the dialogue GUI. Questions are still missing.
2012-01-27 14:50:13 +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
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
