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
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
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
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
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
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
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
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
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
Jason Hooks
3a9007849d
Windows fix
2011-06-08 00:35:30 -04:00
Jason Hooks
4d31ca2c86
Leading slashes now work, efficiency changes
2011-06-07 17:17:25 -04: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
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
Marc Zinnschlag
7d2956329a
some cleanup
2011-05-30 14:27:04 +02:00
Marc Zinnschlag
bed45a936e
fixed cell change crash
2011-05-30 14:21:55 +02:00
Jason Hooks
51b74c2f05
starting
2011-05-23 19:01:36 -04:00
Jason Hooks
b945ce61a5
Merge remote branch 'upstream/master'
2011-05-23 15:01:47 -04:00
gugus
c7fb27e801
Clean up wasn't done properly when deleting a Cell.
2011-05-23 20:22:12 +02:00
gugus
faaa08d6d0
removed this stupide methode to generate unique ID.
2011-05-23 19:47:27 +02:00
gugus
4546ca3863
static Objects goes inside the static geometry
2011-05-23 19:39:10 +02:00
gugus
cd79df1d8b
Merge branch 'static' of git@github.com:zinnschlag/openmw.git into optimisation
...
Conflicts:
apps/openmw/mwrender/exterior.cpp
2011-05-23 19:27:40 +02:00
Marc Zinnschlag
7192bc4f89
added static flag
2011-05-23 19:12:28 +02:00
gugus
41d283a3aa
very experimental: static geometry.
2011-05-23 15:00:01 +02:00
Marc Zinnschlag
64d6ee26bd
changed OGRE framelistener function from frameStarted to frameRenderingQueued
2011-05-18 16:37:09 +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
8829398bfc
added --fs-strict switch
2011-05-05 19:56:16 +02:00
Marc Zinnschlag
ef1e986a87
added --data-local switch
2011-05-05 19:50:28 +02:00
Marc Zinnschlag
e60f0e3b38
--data switch accepts multiple directories now
2011-05-05 19:39:11 +02:00
Marc Zinnschlag
6e880cffb2
changed engine class to support multiple data directories for esm files
2011-05-05 19:32:42 +02:00
Marc Zinnschlag
5b6ec405e3
Merge branch 'script'
2011-04-28 10:30:32 +02:00