Marc Zinnschlag
29cb076113
Merge remote-tracking branch 'scrawl/rank'
2013-04-22 09:52:28 +02:00
Marc Zinnschlag
3fa35af796
Merge remote-tracking branch 'scrawl/master'
2013-04-22 09:52:24 +02:00
scrawl
56b871e362
Rank condition should always fail if NPC is not in a faction
2013-04-22 07:57:53 +02:00
scrawl
8bf1149cec
Fix activation not working sometimes
...
The current player cell was only being updated when the reference was not empty, causing it
to incorrectly detect a cell change the first time something was activated in a newly visited cell, immediately closing the opened dialogue again.
2013-04-21 21:24:48 +02:00
Nathan Jeffords
19325f9d40
fixed the type of iterator uses in MWWorld::Store
...
The containers type used to declare some iterators was not an exact match for the type of the container the iterator was being initialized from. This was causing build failure on windows.
2013-04-21 11:41:09 -07:00
scrawl
a8e3acd6c4
Fix consecutive dialogue choices
2013-04-19 17:57:22 +02:00
Marc Zinnschlag
f13b0c884f
hotfix for CharacterPreview destructor
2013-04-19 14:41:26 +02:00
scrawl
e92897526c
Only use the shader based mygui manager if the fixed pipeline is unavailable
2013-04-19 01:33:33 +02:00
Marc Zinnschlag
92e06cebf3
last minute change to changelog
2013-04-19 00:26:36 +02:00
Marc Zinnschlag
9c1e280614
Merge remote-tracking branch 'scrawl/master'
2013-04-19 00:23:24 +02:00
scrawl
ef9afeb53e
Auto calculate attributes if there are not specified in the NPC record
2013-04-18 23:51:43 +02:00
Marc Zinnschlag
257f940366
updated changelog
2013-04-18 22:50:04 +02:00
Marc Zinnschlag
3b3a052f4f
increased version number
2013-04-18 22:36:48 +02:00
Marc Zinnschlag
1b764e5d3c
Merge remote-tracking branch 'gus/AI'
2013-04-18 22:17:49 +02:00
Glorf
f9deb593d1
Bugfix #578
2013-04-18 21:37:58 +02:00
gus
c753eb4c28
another way to do pathfinding. Slightly less powerfull algorithme in theory, but morrowind pathgrids are so simple it shouldn't be a problem. Hope it solves the bug for KittyCat
2013-04-18 18:35:01 +01:00
scrawl
b34caccd2e
Fix moving NPCs not getting their collision box moved
2013-04-18 16:46:38 +02:00
scrawl
3c5e4ceefd
Workaround for ambiguous "Chargen_plank" ID in chargen script (one at -22,16 and one at -2,-9)
2013-04-18 16:46:32 +02:00
Britt Mathis
1dff1fabdb
Fixed race.cpp
2013-04-17 19:38:13 -04:00
Britt Mathis
7eee86ab66
No more using namespace
2013-04-17 18:56:48 -04:00
scrawl
c519fc360d
Move away from fixed record names for body parts
2013-04-18 00:19:34 +02:00
scrawl
0341a9e778
Fix a gcc 4.8 warning
2013-04-17 20:57:22 +02:00
scrawl
547f77031d
Fix crash when disabling objects in a previously loaded cell, then coming back to that cell and leaving again
2013-04-17 17:06:30 +02:00
Bret Curtis
c1ec16986b
add cmake fix for compiling with binutils >= 2.23 which requires explicit linking for dl<friends> and Xt
2013-04-17 12:04:05 +02:00
Marc Zinnschlag
5bbab1abd9
Merge remote-tracking branch 'galdor557/master'
2013-04-17 09:52:58 +02:00
Britt Mathis
60fadaeaf0
Cleaned up includes in implementation files
2013-04-16 20:16:22 -04:00
scrawl
7fcaffefb0
Fixed travel window to use the rotation part of ESM::Position
2013-04-15 03:13:25 +02:00
scrawl
2693b78536
Add initial player inventory when new game is started
2013-04-15 02:56:23 +02:00
Marc Zinnschlag
9bc07e6221
Merge remote-tracking branch 'scrawl/diseasefix'
2013-04-14 19:45:55 +02:00
Marc Zinnschlag
615ce0b199
Merge remote-tracking branch 'scrawl/master'
2013-04-14 19:45:33 +02:00
Marc Zinnschlag
f692fc1093
Merge branch 'cell'
2013-04-14 19:35:19 +02:00
Marc Zinnschlag
b2b953d2a8
added region column to cell table
2013-04-14 19:34:55 +02:00
scrawl
a57fbbb168
Fix wrong detection of diseases
2013-04-14 17:51:17 +02:00
scrawl
48f46e505c
Look in exterior cells first (chargen_crate_01_empty is in the prison ship but also outside of it, the one outside needs to be disabled)
2013-04-14 17:37:39 +02:00
Marc Zinnschlag
71148121a2
added flag columns to cell table
2013-04-14 17:10:37 +02:00
Marc Zinnschlag
0c33dd86d5
added basic cell table
2013-04-14 17:04:55 +02:00
Chris Robinson
254c6840d8
Fix particle direction
2013-04-13 18:22:30 -07:00
Chris Robinson
0b363ba36e
Handle NiParticleColorModifier with Ogre's ColourInterpolator
...
Note that Ogre's ColourInterpolator has a maximum of six color stages. This
seems to be fine so far, but if we want anything better, we'll need a custom
affector for it.
2013-04-13 16:42:32 -07:00
Chris Robinson
80a4345787
Keep particles in local space
2013-04-13 16:26:34 -07:00
Chris Robinson
dd981077b9
Handle the vertical and horizontal parameters of Nif particles
...
Note that 'horizontal' is mapped to rotate around the Z axis, not Y. The Nif
particle parameters seem to be set up to expect a normal OpenGL (Direct3D?)
orientation, rather than the 90-degree pitch offset of the game.
2013-04-13 16:16:57 -07:00
Chris Robinson
7191f6ed2a
Start a Nif-style particle emitter
...
Not complete yet (doesn't handle the vertical or horizontal direction/angle),
and should probably be renamed.
2013-04-13 14:36:24 -07:00
Chris Robinson
07c24e0382
Don't create entities and particles when only the skeleton base is needed
2013-04-13 13:13:09 -07:00
Chris Robinson
4a42f89e08
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-13 13:04:41 -07:00
Chris Robinson
9cc97b195c
Implement Gravity particle affector effects
2013-04-13 13:03:45 -07:00
Marc Zinnschlag
62aa563466
Merge remote-tracking branch 'scrawl/scale'
2013-04-13 10:32:09 +02:00
Marc Zinnschlag
41744818bb
Merge remote-tracking branch 'scrawl/master'
2013-04-13 10:23:35 +02:00
scrawl
d50150ad71
Scale adjustment factor should not be written back to cellref scale
2013-04-13 00:13:56 +02:00
scrawl
2eb9395661
Do some padding with zeros on the resource group name to avoid priority problems with more than 10 resource groups.
2013-04-13 00:05:31 +02:00
scrawl
86bac7aa92
Fix wrong BSA group name typo
2013-04-12 23:40:30 +02:00
Chris Robinson
5b30677e41
Add the start of a custom gravity affector
2013-04-12 14:39:06 -07:00
