Marc Zinnschlag
|
1e56acc3de
|
Merge remote branch 'scrawl/graphics'
|
2012-04-13 10:12:07 +02:00 |
|
scrawl
|
fb78e853d4
|
removed 2 unneeded lines
|
2012-04-12 19:18:38 +02:00 |
|
Marc Zinnschlag
|
a4fb71a0fc
|
Merge remote branch 'scrawl/graphics'
|
2012-04-12 18:46:02 +02:00 |
|
scrawl
|
e2ec889d10
|
fixed a warning "implicit cast to float3"
|
2012-04-12 17:40:26 +02:00 |
|
scrawl
|
a96ad7fb82
|
restored toggleWater
|
2012-04-12 16:46:56 +02:00 |
|
scrawl
|
800df7376c
|
use the cursors from morrowind.bsa and remove mwpointer.png
|
2012-04-12 14:26:21 +02:00 |
|
scrawl
|
a727bcd4a4
|
override nif transparency settings (part 1)
|
2012-04-11 20:13:15 +02:00 |
|
scrawl
|
2a4fcf42a3
|
basic shadows
|
2012-04-11 18:53:13 +02:00 |
|
Marc Zinnschlag
|
62908c9ef5
|
Merge remote branch 'scrawl/settingsfixes'
|
2012-04-09 10:47:13 +02:00 |
|
scrawl
|
1df7be7fee
|
- fixes to texture filtering setting
- add a sensible warning to settings-default.cfg, since there have been some confusions with it
|
2012-04-09 00:10:42 +02:00 |
|
Marc Zinnschlag
|
0aecb0ed5c
|
cmake fix
|
2012-04-08 23:44:40 +02:00 |
|
Marc Zinnschlag
|
5e9d209b21
|
Merge remote branch 'minty3/testbranch'
|
2012-04-08 23:40:48 +02:00 |
|
Marc Zinnschlag
|
e17a09e710
|
Merge remote branch 'scrawl/water'
|
2012-04-08 23:21:46 +02:00 |
|
Aleksandar Jovanov
|
db928dcb2f
|
put an opening bracket on a new line
|
2012-04-08 19:44:11 +02:00 |
|
Aleksandar Jovanov
|
9893e4b384
|
made player respect NpcStats for mDrawState
|
2012-04-08 19:43:04 +02:00 |
|
Marc Zinnschlag
|
9e3299cae8
|
Merge remote branch 'scrawl/water'
|
2012-04-08 18:40:19 +02:00 |
|
Alexander "Ace" Olofsson
|
00b8ce6b35
|
Fix linker error in windows.
|
2012-04-08 18:22:41 +02:00 |
|
scrawl
|
a5c6207fe7
|
add setting to disable the underwater effect
|
2012-04-08 17:44:00 +02:00 |
|
scrawl
|
b1c84f28a9
|
Merge branch 'master' into water
Conflicts:
files/settings-default.cfg
|
2012-04-08 16:11:16 +02:00 |
|
scrawl
|
113bbfa253
|
removed the now unneccesary SG for transparent objects
|
2012-04-08 14:37:36 +02:00 |
|
Aleksandar Jovanov
|
23cc1d17ca
|
missing ; added
|
2012-04-08 13:28:34 +02:00 |
|
Aleksandar Jovanov
|
c589cbd4ff
|
enum bug fix
|
2012-04-08 13:25:28 +02:00 |
|
Aleksandar Jovanov
|
15526d6110
|
only fists support lacks
|
2012-04-08 13:17:16 +02:00 |
|
Marc Zinnschlag
|
77604086e2
|
Merge branch 'autoequip'
|
2012-04-08 13:01:25 +02:00 |
|
Marc Zinnschlag
|
ab2a1297b0
|
exclude player from auto equip
|
2012-04-08 13:01:03 +02:00 |
|
Aleksandar Jovanov
|
c1afd534fc
|
all stuff added
|
2012-04-08 12:37:59 +02:00 |
|
Aleksandar Jovanov
|
b4ee01e691
|
missing file
|
2012-04-08 12:26:59 +02:00 |
|
Marc Zinnschlag
|
dcab6737e5
|
consider skills when auto equipping
|
2012-04-08 12:26:21 +02:00 |
|
Aleksandar Jovanov
|
b1259ca15c
|
added a 'backend' for NPC/Player draw state
|
2012-04-08 12:25:33 +02:00 |
|
Aleksandar Jovanov
|
d5b8d4ef49
|
Revert "test commit"
This reverts commit 8c607870c0 .
reverting the test commit in the test branch
|
2012-04-08 11:30:17 +02:00 |
|
Aleksandar Jovanov
|
8c607870c0
|
test commit
|
2012-04-08 11:26:54 +02:00 |
|
Marc Zinnschlag
|
8e6c445111
|
Merge remote branch 'chris/sound'
|
2012-04-08 11:13:42 +02:00 |
|
Chris Robinson
|
59ccab0b2c
|
Add sound volume settings
|
2012-04-07 16:00:30 -07:00 |
|
Chris Robinson
|
752e89a268
|
Add a setting to select the sound device name
|
2012-04-07 15:28:38 -07:00 |
|
Chris Robinson
|
b8be867e6e
|
Work around a bug in the Windows OpenAL router
|
2012-04-07 14:58:52 -07:00 |
|
scrawl
|
c748252d33
|
weather fix again
|
2012-04-07 22:55:25 +02:00 |
|
scrawl
|
cdea19206c
|
Revert "more accurate fog, TODO: apply this to the terrain"
This reverts commit 96c37d3e7c .
|
2012-04-07 22:47:39 +02:00 |
|
scrawl
|
96911ada95
|
restored render queue of transparent objects, they are now part of the mrt textures
this fixes some issues with transparent objects not visible in the refraction
|
2012-04-07 22:37:15 +02:00 |
|
Marc Zinnschlag
|
34a02fef45
|
consider item value when auto equipping
|
2012-04-07 20:09:09 +02:00 |
|
Marc Zinnschlag
|
d5a7d418dd
|
added getValue function to Class hierarchy
|
2012-04-07 19:53:49 +02:00 |
|
Marc Zinnschlag
|
f52b9cc162
|
Merge branch 'autoequip'
|
2012-04-07 18:48:30 +02:00 |
|
scrawl
|
044d649edd
|
Merge branch 'master' into water
|
2012-04-07 17:16:35 +02:00 |
|
scrawl
|
96c37d3e7c
|
more accurate fog, TODO: apply this to the terrain
|
2012-04-07 16:55:32 +02:00 |
|
scrawl
|
dbf7547003
|
fixed first weather transition being instant
|
2012-04-07 16:33:03 +02:00 |
|
Roman Melnik
|
bdbb8a8d84
|
Merge remote-tracking branch 'upstream/master' into windowsPinning
Conflicts:
apps/openmw/mwgui/window_manager.cpp (keep both changes)
|
2012-04-07 17:30:20 +03:00 |
|
Roman Melnik
|
72b3f6121d
|
Windows Pinning: add files to CMakeLists.txt
Add new files (map_window and window_pinnable_base)
|
2012-04-07 12:37:15 +03:00 |
|
Marc Zinnschlag
|
b7614dd0ce
|
Merge remote branch 'chris/sound'
|
2012-04-06 22:09:34 +02:00 |
|
scrawl
|
dbde8405f7
|
Merge branch 'master' into water
|
2012-04-06 21:21:57 +02:00 |
|
scrawl
|
50702c5e84
|
Merge branch 'master' into water
|
2012-04-06 20:58:50 +02:00 |
|
Chris Robinson
|
87e8917c4d
|
Don't try to play sounds when no sound output is initialized
|
2012-04-06 10:43:14 -07:00 |
|