teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
3671 commits 34 branches 0 tags 66 MiB
Commit graph

3671 commits

This branch
This branch
All branches
Author SHA1 Message Date
greye
607c7cceee Merge branch 'master' of https://github.com/zinnschlag/openmw 2012-07-24 00:03:39 +04:00
greye
b760225179 wrong branch 
This reverts commit d36d6aacf4.
 2012-07-24 00:00:10 +04:00
greye
d36d6aacf4 move Scene::insertObject to CellStore::insertObject, part 1 2012-07-23 23:56:20 +04:00
Marc Zinnschlag
2d080ce4ef compile fix 2012-07-23 21:47:53 +02:00
Marc Zinnschlag
483a6d8605 Merge remote branch 'scrawl/shadersystem' 2012-07-23 21:46:06 +02:00
scrawl
02a52c0ff1 fixed some more settings bugs 2012-07-23 21:39:22 +02:00
greye
9a2690f849 Revert "wrong" 
This reverts commit 3aa53fea32.
 2012-07-23 23:07:28 +04:00
greye
3aa53fea32 wrong 2012-07-23 23:06:53 +04:00
scrawl
3ebc6fd590 fixed a settings window bug 2012-07-23 20:50:56 +02:00
scrawl
a70f93b024 fix "Crash when running openmw with --start="XYZ", remove HLSL for windows 2012-07-23 20:12:42 +02:00
greye
a62c684222 Merge branch 'master' of https://github.com/zinnschlag/openmw 2012-07-23 20:44:03 +04:00
scrawl
9f9183ff73 depth bias 2012-07-23 18:25:20 +02:00
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
436152dd0e Merge remote branch 'upstream/master' 2012-07-22 18:53:18 +04: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