Chris Robinson
74ed1f73b4
Merge remote-tracking branch 'zini/master' into animations
2013-05-09 13:53:38 -07:00
Marc Zinnschlag
5c99f15ad3
Merge remote-tracking branch 'torben/aiescort'
2013-05-09 14:27:22 +02:00
Glorf
6417fa504e
Fixed constness
2013-05-09 13:56:13 +02:00
Torben Carrington
4928c9d079
Removed sqrt function call (minor optimization thanks to Chris)
2013-05-08 20:47:31 -07:00
Torben Carrington
d20178dd56
Removed unnecessary std::cout messages
2013-05-08 20:05:45 -07:00
Torben Carrington
133964f0e4
AIEscort complete
2013-05-08 20:02:24 -07:00
Torben Carrington
c03dca47f5
AIEscort implemented and working - only touchups are needed.
2013-05-08 17:19:47 -07:00
Glorf
c605f15a15
Another weather cleanup
2013-05-09 00:36:58 +02:00
Torben Carrington
10840765d9
Framework - duration and pathing implemented, no waiting for follower yet.
2013-05-08 15:27:20 -07:00
Marc Zinnschlag
51067698a8
minor cleanup
2013-05-08 21:26:39 +02:00
Marc Zinnschlag
c80ffa0a16
Merge remote-tracking branch 'gus/AIFix'
2013-05-08 20:31:57 +02:00
scrawl
90b7df439f
Fix image buttons
2013-05-08 13:55:15 +02:00
Chris Robinson
8e38dc410f
Allow loading multiple animation sources
...
Animation sources are treated differently from base objects. When given
"path\file.nif", base objects will look for "path\xfile.nif" and use that
if it exists (falling back to the original name if not found). Animation
sources will instead use "path\xfile.kf", ignoring it if the file doesn't
exist.
2013-05-07 16:59:32 -07:00
gus
603af21715
little interface improvement
2013-05-07 19:42:21 +01:00
gus
a328a03bd3
more fix. Fargoth quest almost work as in vanilla now.
2013-05-07 19:35:10 +01:00
scrawl
301efb411e
Fix exit crash
2013-05-07 19:15:28 +02:00
scrawl
8845c0cee1
Camera relative sky rendering. Now we no longer need to keep sky position in sync with camera.
2013-05-07 17:38:24 +02:00
Glorf
68f249e8f4
Small weather cleanup
2013-05-07 10:27:37 +02:00
Chris Robinson
e85bc8b2cd
Only load one Nif for Animation objects
...
This breaks quite a bit, but it's needed for the transition to using the
.kf files.
2013-05-06 23:11:26 -07:00
Chris Robinson
6a3ba41170
Don't store camera nodes, we don't need them.
2013-05-06 21:46:11 -07:00
Chris Robinson
90e29c83c0
Merge remote-tracking branch 'zini/master' into animations
...
Conflicts:
apps/openmw/mwmechanics/character.cpp
2013-05-06 19:17:39 -07:00
scrawl
007a3cf9bd
rename IInterface to Interface
2013-05-06 16:05:56 +02:00
scrawl
b5071ced23
Removed using namespace
2013-05-06 16:04:28 +02:00
scrawl
757a26794a
Merge branch 'master' of https://github.com/zinnschlag/openmw into journal
2013-05-06 15:35:38 +02:00
scrawl
c6edb0288a
Remove unused file
2013-05-06 15:30:23 +02:00
scrawl
1315432322
Handle @# links in journal
2013-05-06 15:14:39 +02:00
scrawl
d43adbaa7c
Topic link fixes for russian version, thanks to greye for testing
2013-05-06 13:13:14 +02:00
scrawl
166eac2e25
Cleanup
2013-05-06 11:31:34 +02:00
gus
006f25d1c0
First try to improve AI. Does not work yet due to strange bug in physicsystem
2013-05-06 00:46:50 +01:00
scrawl
38c399a698
Fix duplicate sounds
2013-05-05 10:51:17 +02:00
scrawl
062ff189a2
Merge branch 'master' into memory
2013-05-04 23:04:33 +02:00
scrawl
0f2866dc15
Text replace fix
2013-05-04 18:49:51 +02:00
scrawl
48c5e33c79
Fix a limitation of the keyword search. It can now highlight keywords that have longer child variations correctly.
2013-05-04 17:40:00 +02:00
scrawl
a33e6b9c35
Fast forward to the last page in the journal when opening it
2013-05-04 16:06:48 +02:00
scrawl
d16bb26a48
Added text colors, goodbye, message
2013-05-04 15:15:44 +02:00
scrawl
f07497bbde
Fix lockup
2013-05-04 14:18:13 +02:00
scrawl
78e6dab9d2
Dialogue history rewrite WIP
2013-05-04 14:15:47 +02:00
scrawl
6cd28d1156
Fix a bug in getPCNextRank
2013-05-04 12:28:12 +02:00
scrawl
0bb51fd91d
Retrieve the correct case for topics in the journal
2013-05-03 22:53:29 +02:00
scrawl
1f58edb9db
Merge branch 'master' of https://github.com/zinnschlag/openmw into journal
2013-05-03 18:17:27 +02:00
gus
7fe7111c19
Fargoth quest almost works. There is still a sall problem as the path taken is not exactly the same. I need to copy the exact way morrowind do pathfinding...
2013-05-03 17:09:09 +01:00
Marc Zinnschlag
2e6594f8f7
Merge remote-tracking branch 'glorf/bugfix-5'
2013-05-03 14:55:00 +02:00
scrawl
75dcf52552
Sync extern/shiny, set memory budgets for texture and mesh managers (however this has no effect yet and depends on changes in Ogre being made)
2013-05-03 13:55:57 +02:00
Glorf
517dfb4d75
Bugfix #732 part 2
2013-05-03 13:24:34 +02:00
Glorf
57f22c77c0
Bugfix #732 part 1
2013-05-03 12:44:27 +02:00
greye
a8b1706678
init pointer value to prevent segfault
2013-05-03 10:51:42 +04:00
kpp
dcccfd9f22
Initialize values
2013-05-02 22:43:21 +04:00
kpp
28ef4d97da
Fixes Bug #734 'Book empty line problem'
...
Hides buttons 'Next' and 'Prev' at the last and at the first page
2013-05-02 07:35:25 +04:00
Chris Robinson
03a6190c5a
Merge remote-tracking branch 'zini/master' into animations
2013-05-01 10:20:42 -07:00
Chris Robinson
a120653c38
Implement handling weapon states
2013-05-01 10:19:16 -07:00