Marc Zinnschlag
e17f7ac81a
Merge remote-tracking branch 'cc9cii/master'
2015-06-14 12:50:10 +02:00
Marc Zinnschlag
0994893bc5
Merge remote-tracking branch 'dteviot/FixRunningInCircles'
2015-06-14 12:05:53 +02:00
cc9cii
c22c9c271d
Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535 .
...
- allows moving various config entries up or down
- comment lines above config entries stay as a pair
2015-06-14 14:51:01 +10:00
cc9cii
0efe8f5465
Fix broken launcher build for windows.
2015-06-14 14:42:08 +10:00
scrawl
28caeadef4
Improve error message for not found records
2015-06-14 02:31:00 +02:00
scrawl
de98d991b4
Revert "Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535."
...
Breaks the saving of content= entry order.
This reverts commit 15fe5d88e2
2015-06-13 23:50:12 +02:00
scrawl
c54a225467
Revert "Allow space characters in front of comments."
...
This reverts commit 4902c66792
2015-06-13 23:49:29 +02:00
scrawl
3bfe167bc0
Revert "Fix loop where there was a potential for double entry."
...
This reverts commit a439f49c4d
2015-06-13 23:49:29 +02:00
scrawl
b7cd62e4de
Revert "Remove user preference setting option."
...
This reverts commit d3b7cf44d3
2015-06-13 23:49:27 +02:00
scrawl
f70250a296
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/CMakeLists.txt
apps/opencs/CMakeLists.txt
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/CMakeLists.txt
components/CMakeLists.txt
extern/osg-ffmpeg-videoplayer/CMakeLists.txt
2015-06-13 21:11:24 +02:00
Stanislav Bas
281088c93b
Add check for an empty sound field to SoundGens verifier
2015-06-13 19:47:39 +03:00
Stanislav Bas
2c15ad5e0c
Add SoundGens verifier
2015-06-13 19:08:31 +03:00
cc9cii
5b6984d8d8
Set modified flag in setData() operations, without which the changes weren't being saved. Should resolve Bug #2656 .
2015-06-13 22:24:22 +10:00
Marc Zinnschlag
c560f8b8a2
Merge remote-tracking branch 'smbas/fix-regionmap-colors'
2015-06-13 11:33:12 +02:00
cc9cii
b81454d226
Fix using wrong bit flag for NPC stats auto-calculation. Also set the corresponding mNpdtType which is used when determining which data structure to save. Should resolve Bug #2668 .
2015-06-13 14:37:47 +10:00
Stanislav Bas
650e37dba1
RegionMap uses proper colors
2015-06-12 22:31:12 +03:00
scrawl
89c2a7e26b
Fix for possibly missing library on windows
2015-06-12 15:22:19 +02:00
scrawl
e13a938896
Add support to build with Qt5 (Task #2665 )
...
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
2015-06-12 15:13:42 +02:00
scrawl
d4c45efb2b
Remove useless #undef's for windows now that we have NOMINMAX flag
2015-06-12 04:39:44 +02:00
scrawl
40eb8b65c7
Revert the travis testing changes
2015-06-12 04:35:46 +02:00
scrawl
4b5c2398a1
Remove QTextCodec::setCodecForCStrings
...
Not needed, we're using QString::fromUtf8/toUtf8 to handle encodings correctly.
2015-06-12 02:00:06 +02:00
scrawl
c04f6cf167
Remove unused code
2015-06-12 01:58:13 +02:00
scrawl
45fcea929a
Refactor cmake scripts, reducing the amount of find_package(FFmpeg)
2015-06-12 01:45:48 +02:00
scrawl
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
2015-06-12 01:45:19 +02:00
scrawl
7407bbdac9
Add a function for SDL error handling
2015-06-12 01:08:58 +02:00
scrawl
800bd511f6
Set a sensible value for SDL_GL_DEPTH_SIZE (Bug #2649 )
2015-06-12 00:12:12 +02:00
scrawl
fc5176dc38
Refactor cmake scripts, reducing the amount of find_package(Qt4)
2015-06-11 23:38:08 +02:00
scrawl
d03880fbf0
Compile fix for old boost versions
2015-06-11 23:25:26 +02:00
scrawl
76bdf7a5b7
Add night-eye effect
2015-06-11 23:16:05 +02:00
scrawl
6051c47eef
Fix for incorrect QString -> path conversion
2015-06-11 22:36:19 +02:00
scrawl
712cef36b0
Minor cleanup
2015-06-11 18:01:00 +02:00
scrawl
cdc47fa874
Remove BulletNifLoader dependency on keyframe manager
...
This will make threaded loading easier.
2015-06-11 17:59:49 +02:00
scrawl
f81c3bcd6d
Fix for broken InitWorldSpaceParticles on projectile effects
2015-06-11 16:40:26 +02:00
scrawl
c94c87d409
Attach effects to the insert node instead of the object root (Bug #2654 )
2015-06-11 16:22:09 +02:00
scrawl
c7493eb45c
Fix bug with invisibility effect for meshes w/ vertex colors
2015-06-11 16:14:51 +02:00
dteviot
cb8ca2f03a
Moved logic for building a Sync'ed path from AiCombat to PathFinding.
...
Is now used by AiFollow, which should fix "running in circles" bug caused when recalc a path and closest way point is the one NPC has just passed.
2015-06-11 18:31:35 +12:00
dteviot
6d7e6cd30c
AiTravel logic merged into AiPackage.
2015-06-11 18:28:31 +12:00
scrawl
8d6620b074
Assign an initial bounding box to particle systems
2015-06-11 02:37:49 +02:00
scrawl
b5099324d1
Enable ParticleSystem's FreezeOnCull, big speed-up in Vivec
2015-06-10 20:35:59 +02:00
scrawl
a1e74a35a2
Revert "Use the WorkQueue to update skinning"
...
This reverts commit d52d0d9640
2015-06-10 19:08:56 +02:00
scrawl
9c86d4f8bc
Race condition fix
2015-06-10 19:02:33 +02:00
Marc Zinnschlag
8d22d26669
Merge remote-tracking branch 'cc9cii/scrollbar-fix'
2015-06-10 18:51:14 +02:00
scrawl
35b2d91fb3
Throw error when failing to create graphics context
2015-06-10 18:46:51 +02:00
scrawl
d52d0d9640
Use the WorkQueue to update skinning
2015-06-10 18:16:02 +02:00
scrawl
cc71e894e1
Add WorkQueue class
2015-06-10 18:15:31 +02:00
scrawl
15453e3d90
Use MyGUI::UString for unicode conversion
2015-06-10 16:59:35 +02:00
cc9cii
8e8da724f5
Remove unnecessary comment entry in the config file.
2015-06-10 08:23:38 +10:00
scrawl
c621d0400c
Fix error handling for out-of-range NIF roots (found in Bosmora, TR)
2015-06-09 18:22:18 +02:00
scrawl
db16cdad02
Add a comment
2015-06-09 03:16:41 +02:00
scrawl
5921e70625
Build a kdtree for terrain geometry
...
Improves intersection testing performance, shaving off ~2ms of frame time in exteriors.
Also increases terrain loading time by ~1ms per cell, so will have to look into background loading soon.
2015-06-09 02:29:56 +02:00
