Jason Hooks
|
7fce57f335
|
Getting started with a new branch
|
2012-04-11 20:16:22 -04:00 |
|
scrawl
|
a727bcd4a4
|
override nif transparency settings (part 1)
|
2012-04-11 20:13:15 +02:00 |
|
Marc Zinnschlag
|
26a529111c
|
removed old known spell list from NpcStats
|
2012-04-11 19:45:56 +02:00 |
|
Marc Zinnschlag
|
77065390d7
|
simplifying Spells class
|
2012-04-11 19:40:42 +02:00 |
|
Marc Zinnschlag
|
e04ccfced0
|
replaced old abilities container in CreatureStats with a Spells object
|
2012-04-11 19:03:36 +02:00 |
|
Marc Zinnschlag
|
750d79eaf0
|
added spell container class
|
2012-04-11 19:03:06 +02:00 |
|
scrawl
|
2a4fcf42a3
|
basic shadows
|
2012-04-11 18:53:13 +02:00 |
|
Marc Zinnschlag
|
344641e574
|
updated developer list in readme file
|
2012-04-11 13:38:17 +02:00 |
|
Chris Robinson
|
0b5b2e9260
|
Merge remote branch 'zini/master' into sound
|
2012-04-10 21:34:52 -07:00 |
|
scrawl
|
33f360f52f
|
transparency fix
|
2012-04-09 15:36:51 +02:00 |
|
scrawl
|
944654f263
|
image rotating function
|
2012-04-09 15:20:57 +02:00 |
|
gugus
|
0553227ee1
|
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into Factions2
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwworld/player.cpp
apps/openmw/mwworld/player.hpp
|
2012-04-09 14:43:35 +02:00 |
|
gugus
|
dd9a88cee2
|
clean up
|
2012-04-09 14:32:07 +02:00 |
|
gugus
|
6ca212b9e9
|
script instruction: PCJoinFaction
|
2012-04-09 14:30:42 +02:00 |
|
gugus
|
aa8418634f
|
add PCLowerRank script instruction
|
2012-04-09 14:26:53 +02:00 |
|
gugus
|
45d11eaf14
|
fixed a bug in the dialogue manager.
|
2012-04-09 14:23:12 +02:00 |
|
scrawl
|
75dd651205
|
Merge branch 'terraincollision' into physicsterrain
Conflicts:
apps/openmw/mwworld/physicssystem.cpp
|
2012-04-09 13:56:09 +02:00 |
|
gugus
|
e5b1e27fa6
|
pcRaiseRank works. Player can now join factions.
|
2012-04-09 13:24:19 +02:00 |
|
Marc Zinnschlag
|
62908c9ef5
|
Merge remote branch 'scrawl/settingsfixes'
|
2012-04-09 10:47:13 +02:00 |
|
Jason Hooks
|
c0f52fef48
|
one more change
|
2012-04-09 00:51:10 -04:00 |
|
Jason Hooks
|
80afcb2eac
|
small change
|
2012-04-08 20:44:44 -04:00 |
|
Jason Hooks
|
74deb5588d
|
Post merge
|
2012-04-08 20:41:49 -04: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 |
|
Jason Hooks
|
6bdfdf379b
|
Trying iterators
|
2012-04-08 17:27:56 -04:00 |
|
Marc Zinnschlag
|
e17a09e710
|
Merge remote branch 'scrawl/water'
|
2012-04-08 23:21:46 +02:00 |
|
scrawl
|
aa8208efb9
|
changed compositor to be compatible with Ogre 1.8RC
|
2012-04-08 22:18:56 +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 |
|
scrawl
|
bc636f036c
|
made it compile
|
2012-04-08 18:25:50 +02:00 |
|
Alexander "Ace" Olofsson
|
00b8ce6b35
|
Fix linker error in windows.
|
2012-04-08 18:22:41 +02:00 |
|
scrawl
|
0b2dab0b5d
|
disable water fog due to some issues
|
2012-04-08 18:17:52 +02:00 |
|
scrawl
|
a5c6207fe7
|
add setting to disable the underwater effect
|
2012-04-08 17:44:00 +02:00 |
|
scrawl
|
9e1a9e5758
|
Merge branch 'master' into physicsaedra2
Conflicts:
apps/openmw/mwinput/inputmanager.cpp
libs/openengine/bullet/physic.cpp
|
2012-04-08 17:08:36 +02:00 |
|
scrawl
|
b1c84f28a9
|
Merge branch 'master' into water
Conflicts:
files/settings-default.cfg
|
2012-04-08 16:11:16 +02:00 |
|
scrawl
|
fbfc6e0966
|
enabled new water by default
|
2012-04-08 16:06:47 +02:00 |
|
scrawl
|
17eb68e4bc
|
disable "reflect statics" by default because it performs not so well right now
|
2012-04-08 15:52:43 +02:00 |
|
scrawl
|
8caa5ff9c4
|
fixed refraction and underwater distortion artifacts
|
2012-04-08 15:03:09 +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 |
|