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
|
786ed6ca5b
|
Include some required Ogre headers explicitely
|
2014-01-24 15:02:34 +01:00 |
|
scrawl
|
805843d7ff
|
Closes #1086: Implement blood effects
|
2014-01-17 11:27:13 +01:00 |
|
Marc Zinnschlag
|
bf1a37dc38
|
Merge remote-tracking branch 'sirherrbatka/referencables_verifer'
|
2014-01-15 14:29:54 +01:00 |
|
Marek Kochanowicz
|
6224344957
|
Being any idiot is hard.
|
2014-01-15 12:52:38 +01:00 |
|
Marek Kochanowicz
|
3d722ba104
|
Corrected brackets.
|
2014-01-15 11:59:11 +01:00 |
|
Marek Kochanowicz
|
fbcb1a14fc
|
ooops, using search id
|
2014-01-15 11:12:56 +01:00 |
|
Marek Kochanowicz
|
89d4a90c06
|
Localised version of morrowind will no longer spam false positives. Don't check diff, please.
|
2014-01-15 10:30:43 +01:00 |
|
greye
|
15d946415e
|
minor cleanup
Removed case folding via std::transform, excessive lowerCase()
replaced with ciEqual().
|
2014-01-14 12:46:53 +04:00 |
|
Marek Kochanowicz
|
c981a2a6f8
|
Removed boost in favor of #include <components/misc/stringops.hpp>. Hopefully this will make scrawl happy. :P
|
2014-01-14 09:25:03 +01:00 |
|
Marek Kochanowicz
|
2c1ef610b9
|
Moving back to boost for case insensitive comparsion.
|
2014-01-14 09:16:59 +01:00 |
|
Marek Kochanowicz
|
e34cb9e931
|
changed according to the scrawl sugestion
|
2014-01-13 19:17:03 +01:00 |
|
Marek Kochanowicz
|
59de794e58
|
Creature check was not invoked.
|
2014-01-13 19:02:23 +01:00 |
|
Marek Kochanowicz
|
17cc6a695c
|
fixed bug resposnsible for exception throwed.
|
2014-01-13 18:34:28 +01:00 |
|
Marek Kochanowicz
|
cb0d3794f7
|
Final check is not performed with just +1! Something is not right.
|
2014-01-10 11:01:29 +01:00 |
|
Marek Kochanowicz
|
688488de62
|
replaced == operator for string comparsion in npc check with boost algorithm to get case insensitive check.
|
2014-01-10 10:43:03 +01:00 |
|
Marek Kochanowicz
|
31c59db71c
|
Splited another long line in the header.
|
2014-01-10 10:22:18 +01:00 |
|
Marek Kochanowicz
|
468b9d7340
|
camel case in the header
|
2014-01-10 09:50:56 +01:00 |
|
Marek Kochanowicz
|
e4d637fd64
|
splited long lines in the header.
|
2014-01-10 09:49:05 +01:00 |
|
Marek Kochanowicz
|
b98cdabe89
|
Shameful bug fixed.
|
2014-01-10 09:42:36 +01:00 |
|
scrawl
|
aa855e9524
|
Include some required Ogre headers explicitely
|
2014-01-09 20:56:24 +01:00 |
|
Marek Kochanowicz
|
b85fe2becf
|
Changes according to the comment.
|
2014-01-06 23:37:18 +01:00 |
|
Marc Zinnschlag
|
fefaec5804
|
Merge remote-tracking branch 'scrawl/savedgame' into savedgame
|
2014-01-06 22:30:08 +01:00 |
|
Marek Kochanowicz
|
06f8537087
|
added final check for player npc. Removed useless includes. However, this code spams exceptions and I can't figure out why.
|
2014-01-06 18:43:44 +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 |
|
Marek Kochanowicz
|
c69814ed14
|
corrected one, additional name to follow policy
|
2014-01-05 18:00:49 +01:00 |
|
Marek Kochanowicz
|
4338706307
|
static is a keyword. renamed static to staticElement
|
2014-01-05 17:31:54 +01:00 |
|
Marek Kochanowicz
|
80d424591f
|
npc instead of NPC.
|
2014-01-05 17:28:47 +01:00 |
|
Marek Kochanowicz
|
693c398204
|
forgot to save the file before comit -_-'
|
2014-01-05 17:05:57 +01:00 |
|
Marek Kochanowicz
|
873870c7ce
|
Chainging names to comply our policy.
|
2014-01-05 17:04:57 +01:00 |
|
Marek Kochanowicz
|
c1f4a9cb0e
|
Added proper id check.
|
2014-01-05 12:18:26 +01:00 |
|
Marek Kochanowicz
|
89d8ee62fa
|
Removing name check from listCheck. Id can't be empty to be sure.
|
2014-01-05 12:12:36 +01:00 |
|
Marek Kochanowicz
|
220d92f865
|
changed ID check in leveled list to name.
|
2014-01-05 11:30:03 +01:00 |
|
scrawl
|
14b70a3ce6
|
Implement AI related magic effects (calm, frenzy, rally, demoralize, turn undead)
|
2014-01-05 01:34:35 +01:00 |
|
Marek Kochanowicz
|
e860717105
|
replaced raw values with enums.
|
2014-01-04 15:28:08 +01:00 |
|
Marek Kochanowicz
|
558690b571
|
implemented list of magical bolts for skipping.
|
2014-01-04 15:19:17 +01:00 |
|
Marek Kochanowicz
|
dfd1058551
|
Various style corrections.
|
2014-01-04 14:49:01 +01:00 |
|
Marek Kochanowicz
|
aa05ffcf60
|
Splited some long argument lists to the multiple lines.
|
2014-01-04 13:05:19 +01:00 |
|
Marek Kochanowicz
|
1c3296fb64
|
Some changes in weapons check.
|
2014-01-03 18:25:06 +01:00 |
|
Marek Kochanowicz
|
7b63e1942c
|
style corrections
|
2014-01-03 11:42:49 +01:00 |
|
Marek Kochanowicz
|
24f090ca98
|
Finishing stuff.
|
2014-01-03 11:31:54 +01:00 |
|
Marek Kochanowicz
|
8201c97abf
|
Inventory item template.
|
2014-01-03 09:16:41 +01:00 |
|
Marek Kochanowicz
|
cb723710fe
|
Corrected stupid typo.
|
2013-12-30 19:24:53 +01:00 |
|
Marek Kochanowicz
|
79bc149c73
|
reverting refidata.hpp
|
2013-12-30 18:47:19 +01:00 |
|
Marek Kochanowicz
|
a7de04d0a4
|
reverting refiddata.cpp
|
2013-12-30 18:46:18 +01:00 |
|
Marek Kochanowicz
|
4a1987ddec
|
correcting
|
2013-12-30 18:41:16 +01:00 |
|
Marek Kochanowicz
|
3758fe3834
|
reformatted
|
2013-12-30 13:23:16 +01:00 |
|
Marek Kochanowicz
|
c89608f390
|
Check for head and hair. Correct faction check.
|
2013-12-30 11:39:03 +01:00 |
|
Scott Howard
|
2f082ef796
|
remove unneeded libraries
|
2013-12-29 16:25:49 -05:00 |
|