Marc Zinnschlag
e0537a3253
made object state polymorphic
2014-01-28 13:53:24 +01:00
Marc Zinnschlag
a623f03850
reduced object state for objects in containers
2014-01-28 13:49:59 +01:00
Marc Zinnschlag
1d34f5e096
Merge remote-tracking branch 'sirherrbatka/cloning'
...
Conflicts:
apps/opencs/model/world/refiddata.cpp
2014-01-28 12:40:14 +01:00
Marc Zinnschlag
a473c3f619
some cleanup
2014-01-28 12:36:10 +01:00
Marc Zinnschlag
fd5486864a
Merge remote-tracking branch 'gus/AIFix2'
...
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/actors.hpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
2014-01-28 12:33:31 +01:00
Marek Kochanowicz
2bd98a69ab
Corrections, according to the comments. Thanks for the review. :-)
2014-01-28 11:16:48 +01:00
mrcheko
e50e94af0b
remove CreatureStats::mAttackType, set/getAttackType()
2014-01-27 23:05:17 +02:00
mrcheko
fe0268062d
merge with master
2014-01-27 22:38:01 +02:00
Marek Kochanowicz
d3000ce099
whitespaces removed again.
2014-01-27 19:47:54 +01:00
Marek Kochanowicz
62ea0bb066
Cleared whitespaces.
2014-01-27 19:40:05 +01:00
Marek Kochanowicz
c82db915f1
Removed needless includes
2014-01-27 19:32:51 +01:00
Marek Kochanowicz
d0b07de7ef
Corrected bug mentioned by zini.
2014-01-27 16:59:18 +01:00
gus
846276f747
clean up
2014-01-27 15:14:24 +01:00
Marek Kochanowicz
ed0ba906cf
removed needless include
2014-01-27 15:05:29 +01:00
Marek Kochanowicz
9c579dbd6c
ok, that should be enough
2014-01-27 15:03:29 +01:00
Marek Kochanowicz
84e07c95b1
formatting
2014-01-27 15:02:29 +01:00
Marek Kochanowicz
51115fa5be
spaces around operators
2014-01-27 14:56:57 +01:00
Marek Kochanowicz
c91ae86084
is there something that can generate diff from two git branches? Using github for this is kinda annoying.
2014-01-27 14:53:39 +01:00
Marek Kochanowicz
52176d6435
reforfucking
2014-01-27 14:51:57 +01:00
Marek Kochanowicz
2b71568bb6
still reformating
2014-01-27 14:50:36 +01:00
Marek Kochanowicz
316debb827
reformating
2014-01-27 14:46:58 +01:00
Marek Kochanowicz
4d6fb31610
reformating
2014-01-27 14:45:07 +01:00
Marek Kochanowicz
2899f04a3f
reformatting
2014-01-27 14:43:12 +01:00
Marek Kochanowicz
6a0b5defd7
removed needless member value.
2014-01-27 13:42:08 +01:00
Marek Kochanowicz
bb62efc3d8
Removed pointless includes.
2014-01-27 13:36:01 +01:00
Marc Zinnschlag
29c3a288e3
load and save of reference in cells (without CustomData state)
2014-01-27 13:27:42 +01:00
Marek Kochanowicz
71d6364754
Chaninging variables name to follow our policy.
2014-01-27 13:13:39 +01:00
Marek Kochanowicz
aa6d1ff4c3
removed needless argument for cloning
2014-01-27 13:08:14 +01:00
Marek Kochanowicz
be8b978a89
corrected mistake in data
2014-01-27 12:23:03 +01:00
Marek Kochanowicz
62c2259c87
removing coordinates handling
2014-01-27 10:10:23 +01:00
mrcheko
45b3aa3d93
corrected things connected to determining attack type
2014-01-26 23:32:57 +02:00
gus
f5d589388c
bug fix
2014-01-26 22:06:54 +01:00
gus
764011dd1b
clean up
2014-01-26 21:53:55 +01:00
gus
7cb47aa635
new implementation of pathfinding. Works, but need clean up
2014-01-26 21:26:19 +01:00
scrawl
eba6c9a8fd
Fix massive console spam regarding the scrib's idle3 animation
2014-01-26 02:49:32 +01:00
scrawl
b1066de81d
Revert "Merge remote-tracking branch 'mrcheko/master'"
...
This reverts commit 4e360136b10061e29fd60492544aad59850513e7, reversing
changes made to 047bbe43b2ca08a63c8e18d2b4af52e0dbefb37b.
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
2014-01-26 00:31:44 +01:00
scrawl
a1fbd1fcc8
Revert "Merge remote-tracking branch 'mrcheko/master'"
...
This reverts commit df7c139e2f614f8a951aae1b4889b920af0013fe, reversing
changes made to fec26342cd57269bc0801e5d901e00419fbc7cec.
2014-01-26 00:14:49 +01:00
scrawl
e0de76a6f7
Save/load global map
2014-01-25 19:06:14 +01:00
scrawl
e62bf8fca9
Remove some garbage
2014-01-25 16:41:26 +01:00
scrawl
79a9c4e048
Clear mShared before populating it. Fixes an issue with duplicate records (e.g. dialogue keywords) after loading a savegame.
2014-01-25 16:33:39 +01:00
scrawl
bdb03926c2
Fix crash when loading another game after dying
2014-01-25 16:13:45 +01:00
scrawl
28185e2017
Death/godmode fixes: Revive player *after* character update, since there might be fall damage.
2014-01-25 15:54:24 +01:00
scrawl
9c0ed69550
Fix CellRef loading issue causing a startup script failure when TR_Mainland.esm is loaded.
2014-01-25 15:10:25 +01:00
scrawl
f09328ca84
Clear global map overlay when starting/loading a game
2014-01-25 13:34:56 +01:00
scrawl
a1ac99463f
Fix an uninitialized value
2014-01-24 22:52:04 +01:00
Marek Kochanowicz
032c542396
improving the cell cloning.
2014-01-24 20:34:33 +01:00
gus
707e579dfe
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2
...
Conflicts:
apps/openmw/mwmechanics/aifollow.cpp
2014-01-24 19:16:50 +01:00
gus
5ca5946760
WIP
2014-01-24 19:13:23 +01:00
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
