mckibbenta
e545f49807
Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm
2013-09-02 18:40:37 -04:00
Marc Zinnschlag
4dbacdc6bd
increased version number
2013-09-02 10:58:58 +02:00
Marc Zinnschlag
e03de11fa8
Merge remote-tracking branch 'corristo/master'
2013-09-02 10:57:01 +02:00
Marc Zinnschlag
7076ea9467
Merge remote-tracking branch 'scrawl/map'
2013-09-02 10:55:12 +02:00
Marc Zinnschlag
5f380bc085
Merge remote-tracking branch 'lgro/unittests'
2013-09-02 10:54:51 +02:00
Marc Zinnschlag
b737d958e1
Merge remote-tracking branch 'kcat/master'
...
Conflicts:
extern/sdl4ogre/cursormanager.hpp
2013-09-02 10:54:18 +02:00
Marc Zinnschlag
547d7355a0
Merge remote-tracking branch 'scrawl/master'
2013-09-02 10:43:59 +02:00
Nikolay Kasyanov
f9cfe654f2
Workaround for https://bugreports.qt-project.org/browse/QTBUG-22154
...
(Qt redefines min OS X version and SDL in turn checks this version and
doesn't accept version set by Qt)
2013-09-01 23:17:41 +04:00
scrawl
3ddeb075fb
Fix a cell border seam on the map
2013-08-31 04:36:23 +02:00
Lukasz Gromanowski
2c49458b6c
Added unittests for FileFinder::FileFinderStrict class.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-08-31 00:13:42 +02:00
Lukasz Gromanowski
0e83b50659
Changed test dir for SearchTest.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-08-30 23:24:33 +02:00
Lukasz Gromanowski
2baaef7d87
Added unittests for FileFinder::FileFinder class.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-08-30 23:23:34 +02:00
Lukasz Gromanowski
303e02cab5
Added unittests for FileFinder::find function.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-08-30 22:45:30 +02:00
Lukasz Gromanowski
515a865daa
Changed ASSERT_EQ to ASSERT_TRUE/FALSE.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-08-30 22:44:03 +02:00
Lukasz Gromanowski
da0b90ee45
Converted tests from components/misc into google unittests.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-08-30 21:57:06 +02:00
Chris Robinson
82a09a988b
Minor pathfinding cleanup
2013-08-29 19:17:27 -07:00
Chris Robinson
8f23b330d3
Remove unnecessary initialization
2013-08-29 17:41:20 -07:00
Chris Robinson
1026e89810
Don't assume TexturePtr is a class
2013-08-29 17:41:20 -07:00
Chris Robinson
9499ac4fd5
Increase the distance for reaching a path node
2013-08-29 17:41:20 -07:00
Chris Robinson
f9dbce685a
Avoid killing AIWander and AITravel when far away
...
This fixes the problem of certain NPCs not wandering because they
happened to spawn near a cell border away from the player, which
immediately "completed" the wander package.
AIWander can't cause NPCs to cross cell boundaries, so there's no risk
of them walking into an unloaded to. AITravel will now simply stop
moving, and resume later when the cell is loaded.
2013-08-29 17:41:20 -07:00
mckibbenta
f65172bdca
Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm
2013-08-29 20:26:36 -04:00
mckibbenta
eef9df504a
fiddlings
2013-08-29 20:25:36 -04:00
Marc Zinnschlag
2391c591b3
Merge remote-tracking branch 'lazaroth/layout_updates_4'
2013-08-29 18:00:54 +02:00
scrawl
f12d5b728a
Ogre 1.9 compatibility changes
2013-08-29 17:14:25 +02:00
Lars Söderberg
f4e9199f78
Various chargen tweaks
2013-08-29 16:21:11 +02:00
scrawl
c8e31725dc
Fix weather sounds persisting on a new game
2013-08-29 15:16:08 +02:00
Marc Zinnschlag
9f0b34eae0
fixed reference loading code (editor)
2013-08-29 13:27:54 +02:00
Marc Zinnschlag
ce90c2f3be
Merge remote-tracking branch 'kcat/master'
2013-08-28 21:05:07 +02:00
Chris Robinson
e589d0ec91
Werewolves can't activate activators
2013-08-28 11:36:22 -07:00
Chris Robinson
84d259ab8e
Avoid reconstructing strings for updating the dynamic stats
...
Attributes still do this, but they change infrequently enough that it doesn't
matter.
2013-08-28 10:50:29 -07:00
scrawl
5918b84666
Don't crash on resize events during load
2013-08-28 17:05:28 +02:00
Marc Zinnschlag
94e255ea47
Merge branch 'filter'
2013-08-28 12:42:03 +02:00
Chris Robinson
92082dae66
Modify the current magicka and fatigue when the base changes
2013-08-27 22:44:52 -07:00
Chris Robinson
305b5fec0f
Avoid needlessly copying the MagicEffects
2013-08-27 21:40:31 -07:00
Chris Robinson
281fdbd81b
Cleanup some redundancy
2013-08-27 17:56:47 -07:00
Chris Robinson
33c173a23a
Update the watched Ptr when changing it
2013-08-27 17:22:07 -07:00
Chris Robinson
39af9a13fa
Remove some unused functions
2013-08-27 17:13:49 -07:00
Chris Robinson
189541aa72
Apply drowning damage based on the update duration
...
1 damage every 0.33 seconds is 3 damage a second. Applying it this way avoid
having to track another stat.
2013-08-27 17:08:23 -07:00
Chris Robinson
f216b25be8
Slightly randomize time between environment sounds
...
We should use the "Minimum Time Between Environmental Sounds" and
"Maximum Time Between Environmental Sounds" INI/fallback settings, but we don't
have them.
2013-08-27 16:04:19 -07:00
Chris Robinson
02df8ab841
Store the underwater sound to easily stop it
2013-08-27 13:48:20 -07:00
Chris Robinson
16331bf1ed
Avoid a hack to play the underwater sound properly
2013-08-27 13:26:57 -07:00
Marc Zinnschlag
26b3d93293
streamlined filter syntax
2013-08-27 18:58:23 +02:00
scrawl
e5ce94c336
Fix the water being affected by fog on the map
2013-08-27 16:45:51 +02:00
scrawl
188df341c3
Replaced log2 to make VC happy
2013-08-27 16:08:58 +02:00
scrawl
839d251cc5
Renamed Terrain::Terrain to Terrain::World to make VC happy
2013-08-27 16:01:16 +02:00
scrawl
d3d6dfbde8
Refactored loading screen
...
- Add loading progress for data files, global map, terrain
- Refactored and improved cell loading progress
2013-08-27 15:48:13 +02:00
Marc Zinnschlag
fb7273e14a
Merge remote-tracking branch 'sirherrbatka/icons-svg'
...
Conflicts:
.gitignore
2013-08-26 14:52:26 +02:00
Marc Zinnschlag
2e9948e86a
improved one-shot filter handling; allow empty pre-defined filters
2013-08-26 14:40:34 +02:00
Marc Zinnschlag
aa935ff03d
update tables on filter record changes
2013-08-26 12:49:13 +02:00
Marc Zinnschlag
20bd0707dc
avoid use of column number literals
2013-08-26 12:25:52 +02:00
