scrawl
062ff189a2
Merge branch 'master' into memory
2013-05-04 23:04:33 +02:00
Marc Zinnschlag
5a177dcea5
Merge remote-tracking branch 'scrawl/master'
2013-05-04 20:37:51 +02:00
scrawl
2ccb779910
Fix member variable case problem
2013-05-04 19:15:29 +02:00
scrawl
f0354ea04c
Fix member variable case problem
2013-05-04 19:14:19 +02:00
Marc Zinnschlag
5de0db9a28
updated credits file
2013-05-04 18:57:34 +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
Lukasz Gromanowski
6fbd940a2f
Fix warning issued by GCC 4.8 in oics/tinyxml.cpp
...
Fix warning issued by GCC 4.8 (and as far I remember 4.7 too)
about not supported "%lf" format string:
openmw/extern/oics/tinyxml.cpp: In member function ‘void TiXmlAttribute::SetDoubleValue(double)’:
openmw/extern/oics/tinyxml.cpp:1269:50: warning: ISO C++98 does not support the ‘%lf’ gnu_printf format [-Wformat=]
TIXML_SNPRINTF( buf, sizeof(buf), "%lf", _value);
^
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-05-04 07:53:03 +02:00
scrawl
03f4e91ceb
Unrelated shadows fix
2013-05-03 23:08:46 +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
Glorf
f1a659e2ac
Bugfix #730
2013-05-02 14:49:30 +02: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
Marc Zinnschlag
d5741c7141
Merge remote-tracking branch 'scrawl/master'
2013-05-01 16:58:43 +02:00
Marc Zinnschlag
95eeea2a27
Revert "Merge remote-tracking branch 'glorf/acrobatics'"
...
This reverts commit 089ef7a2a0
, reversing
changes made to 67422c397c
.
2013-05-01 16:56:16 +02:00
scrawl
1acfd849a2
Fix a case folding bug
2013-05-01 16:38:16 +02:00
Marc Zinnschlag
fe038cef03
turned redeclartion of local variables from an error into a warning
2013-05-01 14:20:09 +02:00
Marc Zinnschlag
63407a662c
allow <== and >== as alternative for <= and >= in scripts
2013-05-01 14:08:05 +02:00
Marc Zinnschlag
6f0ccb6e38
Merge remote-tracking branch 'scrawl/insertrecords'
2013-05-01 13:55:26 +02:00
Marc Zinnschlag
089ef7a2a0
Merge remote-tracking branch 'glorf/acrobatics'
2013-05-01 13:44:23 +02:00
scrawl
40a0969055
Insert records that may not exist in vanilla MW
2013-05-01 12:47:50 +02:00
Glorf
b8630239d7
Code cleanup
2013-05-01 12:25:02 +02:00
Glorf
236ec3409f
Finished acrobatics
2013-05-01 12:21:59 +02:00
scrawl
67422c397c
GetWindSpeed
2013-05-01 11:42:24 +02:00
scrawl
5063d90dda
GetStartingAngle was implemented, but not registered
2013-05-01 11:22:46 +02:00
scrawl
627c3fdb6b
Added GetStandingPC, GetStandingActor; Fixed GetStartingPos
2013-05-01 11:15:43 +02:00
scrawl
3c68c87923
Fix some naming guidelines, fix topic index exception, fix exception in keyword search for some journal entries
2013-05-01 10:28:59 +02:00
scrawl
8bc59f8fe6
Merge branch 'master' into journal
2013-05-01 08:27:42 +02:00
Chris Robinson
d01351431c
Merge remote-tracking branch 'zini/master' into animations
2013-04-30 19:27:55 -07:00
Chris Robinson
4b15da076b
Move getStateInfo into the character controller
2013-04-30 19:26:41 -07:00
Glorf
d30e43784a
Fatigue decrease when jumping, live decrease when falling
2013-04-30 23:39:56 +02:00
Glorf
5a8c1661be
Jump acrobatics working, started falling acrobatics implementation
2013-04-30 20:44:17 +02:00
scrawl
1420a2cb33
Tweaked adjustPosition. Now uses a very thin box for tracing the feet only.
2013-04-30 20:43:38 +02:00
scrawl
91c89e5db4
Use sphere cast instead of ray for camera distance adjustment; use the box orientation value in newtrace
2013-04-30 20:26:59 +02:00
Glorf
add3cd6456
Advance acrobatics on jump
2013-04-30 18:22:59 +02:00
scrawl
2a42556aa5
Merge branch 'master' into HEAD
2013-04-30 14:54:10 +02:00