Alexander "Ace" Olofsson
|
0c6862e3e6
|
Undefining some windows defines
|
13 years ago |
Marc Zinnschlag
|
3442ef17a8
|
fixed ModDisposition
|
13 years ago |
|
Marc Zinnschlag
|
73df51695c
|
Merge remote branch 'gus/Factions2'
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwscript/statsextensions.cpp
|
13 years ago |
scrawl
|
e3486931ae
|
F10 hotkey toggle FPS
|
13 years ago |
|
Marc Zinnschlag
|
e16daeed23
|
added GetSpell script function
|
13 years ago |
|
Marc Zinnschlag
|
37f478b69a
|
Merge branch 'spells'
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwmechanics/npcstats.hpp
|
13 years ago |
|
Marc Zinnschlag
|
b099e1baf5
|
added addspell and removespell script instructions
|
13 years ago |
|
Marc Zinnschlag
|
52c7ee3b6a
|
moved selected spell from NpcStats to Spells
|
13 years ago |
|
Marc Zinnschlag
|
1e56acc3de
|
Merge remote branch 'scrawl/graphics'
|
13 years ago |
|
scrawl
|
fb78e853d4
|
removed 2 unneeded lines
|
13 years ago |
|
Marc Zinnschlag
|
a4fb71a0fc
|
Merge remote branch 'scrawl/graphics'
|
13 years ago |
|
scrawl
|
e2ec889d10
|
fixed a warning "implicit cast to float3"
|
13 years ago |
gugus
|
7edc5c733c
|
corrected a bug about rank.
|
13 years ago |
|
gugus
|
03d6d1fb82
|
NPC rank is correctly loaded now. Also corrected a potential bug (i think).
|
13 years ago |
|
scrawl
|
a96ad7fb82
|
restored toggleWater
|
13 years ago |
|
scrawl
|
800df7376c
|
use the cursors from morrowind.bsa and remove mwpointer.png
|
13 years ago |
|
scrawl
|
a727bcd4a4
|
override nif transparency settings (part 1)
|
13 years ago |
|
Marc Zinnschlag
|
26a529111c
|
removed old known spell list from NpcStats
|
13 years ago |
|
Marc Zinnschlag
|
77065390d7
|
simplifying Spells class
|
13 years ago |
|
Marc Zinnschlag
|
e04ccfced0
|
replaced old abilities container in CreatureStats with a Spells object
|
13 years ago |
|
Marc Zinnschlag
|
750d79eaf0
|
added spell container class
|
13 years ago |
|
scrawl
|
2a4fcf42a3
|
basic shadows
|
13 years ago |
|
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
|
13 years ago |
|
gugus
|
dd9a88cee2
|
clean up
|
13 years ago |
|
gugus
|
6ca212b9e9
|
script instruction: PCJoinFaction
|
13 years ago |
|
gugus
|
aa8418634f
|
add PCLowerRank script instruction
|
13 years ago |
|
gugus
|
45d11eaf14
|
fixed a bug in the dialogue manager.
|
13 years ago |
|
gugus
|
e5b1e27fa6
|
pcRaiseRank works. Player can now join factions.
|
13 years ago |
|
Marc Zinnschlag
|
62908c9ef5
|
Merge remote branch 'scrawl/settingsfixes'
|
13 years ago |
|
scrawl
|
1df7be7fee
|
- fixes to texture filtering setting
- add a sensible warning to settings-default.cfg, since there have been some confusions with it
|
13 years ago |
|
Marc Zinnschlag
|
0aecb0ed5c
|
cmake fix
|
13 years ago |
|
Marc Zinnschlag
|
5e9d209b21
|
Merge remote branch 'minty3/testbranch'
|
13 years ago |
|
Marc Zinnschlag
|
e17a09e710
|
Merge remote branch 'scrawl/water'
|
13 years ago |
Aleksandar Jovanov
|
db928dcb2f
|
put an opening bracket on a new line
|
13 years ago |
|
Aleksandar Jovanov
|
9893e4b384
|
made player respect NpcStats for mDrawState
|
13 years ago |
|
Marc Zinnschlag
|
9e3299cae8
|
Merge remote branch 'scrawl/water'
|
13 years ago |
|
Alexander "Ace" Olofsson
|
00b8ce6b35
|
Fix linker error in windows.
|
13 years ago |
|
scrawl
|
a5c6207fe7
|
add setting to disable the underwater effect
|
13 years ago |
|
scrawl
|
b1c84f28a9
|
Merge branch 'master' into water
Conflicts:
files/settings-default.cfg
|
13 years ago |
|
scrawl
|
113bbfa253
|
removed the now unneccesary SG for transparent objects
|
13 years ago |
|
Aleksandar Jovanov
|
23cc1d17ca
|
missing ; added
|
13 years ago |
|
Aleksandar Jovanov
|
c589cbd4ff
|
enum bug fix
|
13 years ago |
|
Aleksandar Jovanov
|
15526d6110
|
only fists support lacks
|
13 years ago |
|
Marc Zinnschlag
|
77604086e2
|
Merge branch 'autoequip'
|
13 years ago |
|
Marc Zinnschlag
|
ab2a1297b0
|
exclude player from auto equip
|
13 years ago |
|
Aleksandar Jovanov
|
c1afd534fc
|
all stuff added
|
13 years ago |
|
Aleksandar Jovanov
|
b4ee01e691
|
missing file
|
13 years ago |
|
Marc Zinnschlag
|
dcab6737e5
|
consider skills when auto equipping
|
13 years ago |
|
Aleksandar Jovanov
|
b1259ca15c
|
added a 'backend' for NPC/Player draw state
|
13 years ago |
|
Aleksandar Jovanov
|
d5b8d4ef49
|
Revert "test commit"
This reverts commit 8c607870c0.
reverting the test commit in the test branch
|
13 years ago |