scrawl
|
03cf383be7
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
Conflicts:
apps/openmw/mwgui/referenceinterface.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwscript/cellextensions.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/store.cpp
apps/openmw/mwworld/worldimp.cpp
|
2014-01-24 18:28:35 +01:00 |
|
scrawl
|
295aed3533
|
Implement savegame screenshots
|
2014-01-24 17:49:16 +01:00 |
|
scrawl
|
786ed6ca5b
|
Include some required Ogre headers explicitely
|
2014-01-24 15:02:34 +01:00 |
|
Marc Zinnschlag
|
419e3a7d30
|
write references in cells to saved game file
|
2014-01-23 12:51:42 +01:00 |
|
Marc Zinnschlag
|
dd7d80ffbc
|
removed a redundant field from object state
|
2014-01-23 12:51:25 +01:00 |
|
Marc Zinnschlag
|
22cb4784b5
|
store cell state in saved game files (no references yet)
|
2014-01-23 11:29:40 +01:00 |
|
scrawl
|
805843d7ff
|
Closes #1086: Implement blood effects
|
2014-01-17 11:27:13 +01:00 |
|
Marc Zinnschlag
|
ce00639d31
|
added missing birthsign field to player state record
|
2014-01-17 10:51:52 +01:00 |
|
Marc Zinnschlag
|
d8d4f1a15e
|
some fixes to record structs
|
2014-01-16 12:02:45 +01:00 |
|
scrawl
|
d544551f61
|
Added getSkill to Class interface, since creatures also have skills (which are provided by generalized Combat, Magic and Stealth attributes which substitute for the specific skills, in the same way as specialization)
Information provided by Hrnchamd.
|
2014-01-15 15:50:45 +01:00 |
|
scrawl
|
0a8c61a7fe
|
Bug #1107: Reverted previous fix, which caused problems with some actors not using a box shape as expected. Instead, do not create a bounding box collision shape for hidden nodes.
|
2014-01-15 14:53:29 +01:00 |
|
scrawl
|
79a6ffd216
|
Closes #1107: Do not create box shapes unless the box collision flag is enabled
|
2014-01-15 14:53:29 +01:00 |
|
scrawl
|
3ea1407ed3
|
Closes #1109: Don't reset water level when loading a plugin that does include water level records
|
2014-01-15 14:53:29 +01:00 |
|
scrawl
|
264736c139
|
Remove hopelessly outdated nifogre tests
|
2014-01-15 14:53:29 +01:00 |
|
scrawl
|
d0500e8124
|
Some unneeded includes cleanup
|
2014-01-15 14:53:28 +01:00 |
|
Marc Zinnschlag
|
bf1a37dc38
|
Merge remote-tracking branch 'sirherrbatka/referencables_verifer'
|
2014-01-15 14:29:54 +01:00 |
|
Marc Zinnschlag
|
8c5f313546
|
added savedgame-specifc record structs for objects state
|
2014-01-14 15:29:55 +01:00 |
|
scrawl
|
52b9ebff9d
|
Closes #1092: Implement sleep interruption. Fix levelled list flags for creatures. Change World::copyObjectToCell to search for the correct cell.
|
2014-01-14 07:42:03 +01:00 |
|
scrawl
|
26d972280f
|
Fix a few text defines
|
2014-01-14 06:03:34 +01:00 |
|
Marc Zinnschlag
|
3e58eb34e4
|
Merge remote-tracking branch 'sergeyshambir/startcombat'
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
|
2014-01-13 10:17:10 +01:00 |
|
Marc Zinnschlag
|
e453468eff
|
moved CellRef loading code to the CellRef class
|
2014-01-12 19:23:08 +01:00 |
|
Marc Zinnschlag
|
9025210965
|
Merge branch 'refnum' into savedgame
Conflicts:
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/manualref.hpp
components/esm/cellref.hpp
|
2014-01-12 16:58:06 +01:00 |
|
scrawl
|
1d19d36bd6
|
Remove unused magic effect flags and update esmtool output
|
2014-01-12 01:25:00 +01:00 |
|
scrawl
|
ce6aab89cf
|
Fix a possible permutation issue
|
2014-01-11 04:58:30 +01:00 |
|
scrawl
|
c64dc2c831
|
Terrain specular mapping: use a "_diffusespec" postfix to indicate specular information is present in the alpha channel. Use alpha directly instead of 1-alpha.
|
2014-01-11 00:51:03 +01:00 |
|
scrawl
|
bfdca3b738
|
Fix needTangents not being set for cached/shared materials
|
2014-01-09 23:13:31 +01:00 |
|
scrawl
|
aa855e9524
|
Include some required Ogre headers explicitely
|
2014-01-09 20:56:24 +01:00 |
|
scrawl
|
6f9113fe88
|
Add preliminary implementation of PayFine, PayFineThief and GoToJail instructions
|
2014-01-09 01:49:58 +01:00 |
|
scrawl
|
7b33f6f2ac
|
Detect crime of sleeping in other NPC's beds. ShowRestMenu needs to support an explicit/implicit reference for this.
|
2014-01-08 17:19:43 +01:00 |
|
scrawl
|
0285d18fc2
|
Respect items belonging to a faction
|
2014-01-07 20:24:01 +01:00 |
|
Sergey Shambir
|
d5a0ff17fd
|
MWScript: updated vmformat.txt, changed opcodes to fix sequence.
Opcodes for StartCombat, StopCombat, GetTarget now follow the last
previous opcode.
|
2014-01-07 05:06:20 +04:00 |
|
Sergey Shambir
|
5c7e39a92f
|
Implemented script commands StartCombat, StopCombat, GetTarget.
Also renamed one field of AIWander class because it's not longer
unknown.
|
2014-01-07 04:43:06 +04:00 |
|
Marc Zinnschlag
|
fefaec5804
|
Merge remote-tracking branch 'scrawl/savedgame' into savedgame
|
2014-01-06 22:30:08 +01:00 |
|
scrawl
|
4ad43fdf92
|
Closes #1088: Quick&dirty fix for NIF filters not working properly with some mods
|
2014-01-06 19:01:05 +01:00 |
|
Marc Zinnschlag
|
43dd3b8ef2
|
removed redundant deletion flag from CellRef
|
2014-01-06 13:53:20 +01:00 |
|
scrawl
|
62774fcc4a
|
Merge branch 'master' into HEAD
Conflicts:
apps/openmw/mwbase/world.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm/loadtes3.cpp
|
2014-01-06 00:23:17 +01:00 |
|
scrawl
|
b3764c504a
|
Implement GetPcJumping instruction
|
2014-01-05 19:08:12 +01:00 |
|
scrawl
|
c004fb778f
|
Get rid of underscore defines. They are reserved by the standard.
|
2014-01-05 18:22:29 +01:00 |
|
scrawl
|
b8e9343764
|
Extend NifOverrides to allow material overrides, useful for texture modding e.g. adding normal maps without having to edit the affected meshes
|
2014-01-05 18:09:50 +01:00 |
|
scrawl
|
14b70a3ce6
|
Implement AI related magic effects (calm, frenzy, rally, demoralize, turn undead)
|
2014-01-05 01:34:35 +01:00 |
|
scrawl
|
2a7d610f87
|
Implement GetSpellReadied instruction
|
2014-01-03 22:55:17 +01:00 |
|
scrawl
|
55c5d7cee4
|
Implement Resurrect instruction
|
2014-01-03 15:54:23 +01:00 |
|
scrawl
|
b4230f716e
|
Implement RemoveEffects instruction
|
2014-01-03 05:19:10 +01:00 |
|
scrawl
|
7d8ca91286
|
Implement RemoveSpellEffects instruction
|
2014-01-03 05:18:44 +01:00 |
|
scrawl
|
366801f3d5
|
Implement explodeSpell instruction (like Cast, with caster = target)
|
2014-01-03 04:44:50 +01:00 |
|
scrawl
|
93e1a2df73
|
Implement Cast script instruction (shrines work now)
|
2014-01-03 04:09:52 +01:00 |
|
scrawl
|
29acc3f722
|
Fix particles being too small. Looks like this should actually be size*2.
|
2014-01-02 16:56:31 +01:00 |
|
Marc Zinnschlag
|
a6e6411686
|
Merge remote-tracking branch 'scrawl/master'
|
2014-01-02 12:12:52 +01:00 |
|
scrawl
|
783c501d70
|
Some checks to prevent bound item abuse
|
2014-01-02 01:36:08 +01:00 |
|
Marc Zinnschlag
|
e1355be47c
|
Merge remote-tracking branch 'lgro/valgrind_warnings'
|
2014-01-01 19:41:52 +01:00 |
|