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 |
|
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 |
|
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 |
|
Jason Hooks
|
2fe66319fe
|
streammusic strict
|
2011-06-12 16:36:18 -04:00 |
|
Jason Hooks
|
9eefee7168
|
Say strict
|
2011-06-11 20:01:21 -04:00 |
|
Jason Hooks
|
93f41e25a4
|
fs-strict
|
2011-06-08 17:29:28 -04:00 |
|
Jason Hooks
|
65cc0e8317
|
trying strict
|
2011-06-08 17:15:13 -04:00 |
|
Marc Zinnschlag
|
18a9dfd2b6
|
Merge remote branch 'jhooks/directories' into directories
|
2011-06-08 10:22:55 +02:00 |
|
Jason Hooks
|
3a9007849d
|
Windows fix
|
2011-06-08 00:35:30 -04:00 |
|
Jason Hooks
|
a719a6b468
|
Getting rid of animation code in nif loader
|
2011-06-07 18:57:24 -04:00 |
|
Marc Zinnschlag
|
d59856af5c
|
minor performance improvement
|
2011-06-08 00:52:25 +02:00 |
|
Marc Zinnschlag
|
4f304cfff2
|
Merge remote branch 'jhooks/directories' into directories
|
2011-06-08 00:29:12 +02:00 |
|
Jason Hooks
|
4d31ca2c86
|
Leading slashes now work, efficiency changes
|
2011-06-07 17:17:25 -04:00 |
|
Marc Zinnschlag
|
5fb3dc854b
|
Merge branch 'optimisation'
|
2011-06-07 10:21:29 +02:00 |
|
Marc Zinnschlag
|
ac4af583b7
|
Merge remote branch 'jhooks/directories' into directories
|
2011-06-07 09:22:58 +02:00 |
|
Jason Hooks
|
45453fd7a9
|
Case insensitive external loader working
|
2011-06-06 20:11:23 -04:00 |
|
Jason Hooks
|
f2a0fa8af2
|
Adding files to directory map
|
2011-06-05 23:46:18 -04:00 |
|
Marc Zinnschlag
|
a95a0f821b
|
Merge remote branch 'jhooks/directories' into directories
Conflicts:
components/files/multidircollection.hpp
|
2011-06-04 10:27:16 +02:00 |
|
Jason Hooks
|
2aaa0f4578
|
Backslash working in linux
|
2011-06-04 01:29:57 -04:00 |
|
Jason
|
b92955763a
|
Introducing Dir Archive
|
2011-06-03 20:28:47 -04:00 |
|
athile
|
231be8f381
|
Add BULLET_ROOT for the prebuilt binaries. Fix a minor VS2010 compile issue (missing header file).
|
2011-05-31 21:55:08 -06:00 |
|
Marc Zinnschlag
|
7d2956329a
|
some cleanup
|
2011-05-30 14:27:04 +02:00 |
|