Marc Zinnschlag
aded4608c0
added GetButtonPressed function
2011-07-12 21:26:58 +02:00
Marc Zinnschlag
058822b676
Merge branch 'next' into MessageBox
2011-07-12 21:18:27 +02:00
Marc Zinnschlag
c4177698d0
Merge remote branch 'swick/MessageBox' into MessageBox
2011-07-12 21:18:21 +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
Marc Zinnschlag
dd41bb74bd
Merge branch 'storefix' into next
2011-07-11 13:00:56 +02:00
Marc Zinnschlag
d9a25427c5
added --version command line option
2011-07-08 16:16:20 +02:00
Marc Zinnschlag
a7b266c4d2
another minor correction (fixing the previous one)
2011-07-08 16:16:06 +02:00
Marc Zinnschlag
6ddf9e4cc5
minor correction
2011-07-08 14:53:01 +02:00
Marc Zinnschlag
d5e4635198
state OpenMW version on doxygen main page
2011-07-08 14:52:34 +02:00
Marc Zinnschlag
27cba6c624
created config.hpp file for appps/openmw
2011-07-08 14:39:23 +02:00
Marc Zinnschlag
f07f363a21
declare OpenMW version in CMakeLists.txt
2011-07-08 14:24:09 +02:00
Marc Zinnschlag
2b5dc0042b
fix for issue 138 (record loading failed for some NPCs)
2011-07-04 23:36:22 +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
Marc Zinnschlag
8446619ac4
Merge branch 'components_namespaces' into next
...
Conflicts:
apps/openmw/mwrender/interior.cpp
components/bsa/bsa_archive.cpp
2011-06-19 20:22:29 +02:00
Sebastian Wick
23194a932f
creating the buttons on the fly
2011-06-19 19:41:42 +02:00
Lukasz Gromanowski
57972eb042
Mantis: #18 - Move components from global namespace into their own namespace.
...
Added namespace around generated win_1252 table.
Added generation of header guard and ToUTF8 namespace in gen_iconv.
Small corrections in Makefile.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-06-19 19:33:30 +02:00
Lukasz Gromanowski
e9ff9a446b
Mantis: #18 - Move components from global namespace into their own namespace.
...
Moving classes from components/nifogre into NifOgre namespace.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-06-19 19:14:14 +02:00
Sebastian Wick
5db8e8c449
InterMessageBox game mode
2011-06-19 19:10:44 +02:00
Lukasz Gromanowski
2ddd5dba11
Mantis: #18 - Move components from global namespace into their own namespace.
...
Moving classes from components/nifbullet into NifBullet namespace.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-06-19 18:45:23 +02:00
Lukasz Gromanowski
514b55766f
Mantis: #18 - Move components from global namespace into their own namespace.
...
Updated components/misc tests.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-06-19 18:25:09 +02:00
Lukasz Gromanowski
90985e849e
Mantis: #18 - Move components from global namespace into their own namespace.
...
Moving classes from components/misc into Misc namespace.
Note: Misc namespace introduced conflict with ESM::Misc and MWClass::Misc
classes, so both of them are renamed to ESM::Miscellaneous
and MWClass::Miscellaneous.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-06-19 18:14:03 +02:00
Lukasz Gromanowski
8a84201ba2
Mantis: #18 - Move components from global namespace into their own namespace.
...
Moving classes from components/bsa into Bsa namespace.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-06-19 16:46:34 +02:00
Sebastian Wick
e77240dceb
basics for InteractiveMessageBox
2011-06-18 15:50:41 +02:00
Marc Zinnschlag
beeaa2cf7f
Merge remote branch 'swick/MessageBox' into MessageBox
2011-06-17 09:22:15 +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
5198de53b8
add the new header to the cmake script
2011-06-16 15:16:35 +02:00
Marc Zinnschlag
e3d05e90d4
Merge remote branch 'swick/MessageBox' into MessageBox
2011-06-16 14:11:53 +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
Marc Zinnschlag
bc92b7b1fa
Merge branch 'directories' into next
...
Conflicts:
components/files/multidircollection.hpp
components/nifogre/ogre_nif_loader.hpp
2011-06-15 22:40:24 +02:00
Marc Zinnschlag
0f2df4e2b8
more cleanup
2011-06-15 22:33:31 +02:00
Marc Zinnschlag
bdd995ec91
Merge remote branch 'jhooks/directories' into directories
2011-06-15 21:49:19 +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
Jason Hooks
2132488408
merge
2011-06-15 13:24:37 -04:00
Jason Hooks
56affd018a
Some cleanup
2011-06-15 13:09:47 -04: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
aab07f379e
added openmw_messagebox_layout.xml to CMakeLists.txt
2011-06-14 18:55:07 +02:00
Sebastian Wick
56dc9ffcf3
now, realy deleted needless code.
2011-06-14 18:29:55 +02:00
Sebastian Wick
84c19a90ad
deleted needless code
2011-06-14 18:29:20 +02:00
Sebastian Wick
2d93705baa
created xml file for the layout; MessageBox class
2011-06-14 18:25:07 +02:00
Sebastian Wick
5bf5bde946
created new files, conncted MessageBoxManger with WindowManager
2011-06-14 16:41:30 +02:00
Marc Zinnschlag
a6e83f5b9b
case-handling fix for references in cells
2011-06-13 13:47:59 +02:00
Jason Hooks
2fe66319fe
streammusic strict
2011-06-12 16:36:18 -04:00
