mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-22 09:23:54 +00:00
Code Issues Releases Wiki Activity
3658 commits 108 branches 66 tags 133 MiB
Commit graph

3658 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marc Zinnschlag
d29b3c4709 Merge remote branch 'scrawl/shadersystem' 2012-07-23 15:56:57 +02:00
scrawl
d5384403f3 forgot something else 2012-07-23 15:46:18 +02:00
scrawl
5572421576 submodule update for "fix a typo" 2012-07-23 15:40:10 +02:00
Marc Zinnschlag
a24e7c9de2 Merge remote branch 'scrawl/shadersystem' 2012-07-23 15:25:11 +02:00
scrawl
ac5bd38df9 some cmake fixes 2012-07-23 14:59:57 +02:00
scrawl
2eca27bba9 fix horizon color of the sky reflection 2012-07-23 14:21:40 +02:00
Marc Zinnschlag
2c5d3d8df9 Merge remote branch 'scrawl/shadersystem' into shadersystem 
Attention: We have submodules again. Don't forget to update!

Conflicts:
	components/files/configurationmanager.cpp
 2012-07-23 14:12:21 +02:00
scrawl
afe7c41729 removed some unused code 2012-07-23 13:47:51 +02:00
scrawl
bc7876e980 use alpha map for moons 2012-07-23 13:04:48 +02:00
scrawl
268987835d fix the crash 2012-07-23 12:19:53 +02:00
scrawl
f0b3142966 switch to glsl 1.2 2012-07-23 02:54:50 +02:00
Marc Zinnschlag
df70b2dc9f updated credits.txt 2012-07-22 21:25:37 +02:00
Marc Zinnschlag
e1bb98e71f Merge remote branch 'greye/master' 2012-07-22 17:07:04 +02:00
greye
32b1350b63 CreatureStats class 2012-07-22 18:29:54 +04:00
scrawl
b2dcf5adcd support system install for boost wave 2012-07-22 14:41:23 +02:00
Lukasz Gromanowski
1dde806add Fixes #313: openmw without a ~/.config/openmw folder segfault. 
Added creation of $HOME/.config/openmw directory.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2012-07-22 14:52:55 +03:00
scrawl
6bfcf2bc1b - exchanged the preprocessor again, no warnings now 
- disable line directives for now, causing some trouble
 2012-07-22 02:45:39 +02:00
scrawl
e7ab3544ac removed some redundant code 2012-07-21 13:52:12 +02:00
scrawl
17a5c22c8f don't use globbing 2012-07-20 23:31:49 +02:00
scrawl
acc5c3bbbf some fixes 2012-07-20 17:08:15 +02:00
scrawl
41791ccaa2 add file 2012-07-20 16:44:40 +02:00
scrawl
014396e80c remove the plugins.cfg files, do not enforce CG plugin 2012-07-20 16:44:03 +02:00
scrawl
21728020f6 fixed the water on local map 2012-07-20 14:45:42 +02:00
scrawl
f5ffea4d4b new button, water timescale 2012-07-19 23:30:41 +02:00
scrawl
e077814a8c water 2012-07-19 22:23:07 +02:00
scrawl
9d7470e14c temp commit 2012-07-19 20:18:34 +02:00
scrawl
739455e6f8 new water WIP, caustics, chromatic abberation, accurate fresnel, underwater reflection, etc 2012-07-19 16:23:30 +02:00
scrawl
4434fb640e Merge branch 'master' into shadersystem 2012-07-17 19:12:02 +02:00
Marc Zinnschlag
483b125aad avoid locking up in case actor updates repeatedly throw exceptions 2012-07-17 18:37:20 +02:00
Marc Zinnschlag
6744375636 fixed a logic error in the auto equip code 2012-07-17 18:35:01 +02:00
Marc Zinnschlag
beb18282bb Issue #342: various fixes 2012-07-17 16:44:55 +02:00
Marc Zinnschlag
76de2f7360 Issue #342: handle magic effects 79-82 and 17-20 2012-07-17 15:49:37 +02:00
Marc Zinnschlag
a3652f16ce Issue #342: factored out dynamic stats calculation into a separate function 2012-07-17 12:18:43 +02:00
Marc Zinnschlag
2c70a93553 Merge branch 'master' into potions 
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
 2012-07-17 10:32:18 +02:00
Marc Zinnschlag
0d3a7d482e Merge remote branch 'modred11/master' 2012-07-17 10:21:46 +02:00
Marc Zinnschlag
4bfed952bc Merge remote branch 'guidoj/master' 2012-07-17 10:17:06 +02:00
Marc Zinnschlag
47ec8f68ee Merge branch 'fix' 2012-07-17 09:50:23 +02:00
Marc Zinnschlag
e9b95d55cd Revert "Proper way to find and use libtbb" 
This reverts commit d6bf2b7d29.
 2012-07-17 09:49:52 +02:00
guidoj
a021165d9f Changed standard C lib includes to C++ format 2012-07-17 09:44:24 +02:00
guidoj
0549e949ba Mostly removal of unnecessary #include's and a little clean up 2012-07-17 09:27:12 +02:00
Chris Robinson
ada88596dc Fix an abort at shutdown 
Ogre uses a special method to delete the stream object, so it needs to be
allocated properly.
 2012-07-16 15:30:09 -07:00
Dmitry Marakasov
d6bf2b7d29 Proper way to find and use libtbb 2012-07-17 00:11:56 +04:00
Dmitry Marakasov
0e934a52ca Include soundmanager.hpp for Play_Normal enum 2012-07-16 23:54:24 +04:00
Dmitry Marakasov
1c53add6c4 Include boost/shared_ptr.hpp for boost:shared_ptr 2012-07-16 23:54:21 +04:00
Dmitry Marakasov
e862b6b5a5 Fix comparison in cmake 2012-07-16 15:53:02 +04:00
scrawl
509e9d7034 Merge branch 'master' into shadersystem 2012-07-15 21:58:45 +02:00
scrawl
fb1f8082d2 fix link error with recent glibc versions 2012-07-15 21:27:57 +02:00
Marc Zinnschlag
da916cecfb fixed a bug in a cmake script that resulted in some files being compiled twice 2012-07-15 19:29:09 +02:00
Marc Zinnschlag
871b1d1c9b silenced a warning 2012-07-15 19:20:59 +02:00
Chris Robinson
bc0a6bffcf Remove outdated comment 2012-07-15 09:03:35 -07:00