Evil Eye
fea7e68fe9
silence operator precedence warning
2020-03-25 20:34:08 +01:00
Evil Eye
8dc081a60d
ignore unterminated empty strings
2020-03-25 19:52:22 +01:00
Capostrophic
7319eda54e
Correct drawable property apply order (bug #5313 )
2020-03-23 20:47:47 +03:00
James Moore
a37bdfd492
Implement a refresh button on data files page
2020-03-21 19:35:20 +00:00
Andrei Kortunov
e20d156904
Do not write empty trade time
2020-03-18 13:31:26 +04:00
Bret Curtis
79517f3f42
Merge pull request #2724 from akortunov/factions
...
Cleanup ownership for items in containers
2020-03-18 10:00:36 +01:00
Andrei Kortunov
ea30e27370
Cleanup ownership for items in containers
2020-03-17 17:22:39 +04:00
Andrei Kortunov
dea2018d9f
Do not use dynamic casts when using ObjectState
2020-03-17 15:18:40 +04:00
elsid
5168f2059f
Compare revisions by equality to support overflow
2020-03-14 09:38:24 +01:00
elsid
7ae7cb181d
Support recast mesh rendering
2020-03-14 09:38:24 +01:00
Capostrophic
c1f1e367fa
Accept an extra numerical argument in GetItemCount
2020-03-11 20:56:46 +03:00
Bret Curtis
7096ecdcf2
Merge pull request #2719 from Capostrophic/capofixes
...
Fixes of my mistakes
2020-03-11 09:05:12 +01:00
Capostrophic
d3244dc777
Don't save space in compressed BSA hash generation
2020-03-10 23:47:39 +03:00
Capostrophic
aef6cd7006
Fix handling of empty strings in NIF string tables
2020-03-10 23:04:20 +03:00
Andrei Kortunov
94df2114c1
Store fog of war as a PNG image instead of TGA (bug #5108 )
2020-03-07 11:05:32 +04:00
Capostrophic
5770227e37
Avoid using auto-detected normal maps that are bump map namesakes
2020-03-05 13:19:34 +03:00
Capostrophic
624a9ac353
Force shaders for objects affected by new envmap option
2020-03-04 14:06:22 +03:00
Capostrophic
2b3ecff004
Remove broken fixed function pipeline support
...
Added by mistake
2020-03-03 21:50:50 +03:00
Capostrophic
6999f1fd28
Add an option to apply lighting to environment maps
2020-03-03 20:08:59 +03:00
Capostrophic
19a7245251
Add bump mapping support
2020-03-03 13:32:30 +03:00
Andrei Kortunov
8c177f0306
Take in account transformations of NiCollisionSwitch
2020-02-25 11:09:36 +04:00
Bret Curtis
c907cd98c8
Merge pull request #2704 from akortunov/collisionswitch
...
Handle NiCollisionSwitch node
2020-02-19 21:24:25 +01:00
Alexei Dobrohotov
e1f0504557
Merge pull request #2703 from akortunov/masks
...
Fix a regression in the NiVisController
2020-02-19 11:50:51 +03:00
Andrei Kortunov
77d6fe46ca
Handle NiCollisionSwitch node
2020-02-19 12:14:21 +04:00
Andrei Kortunov
7b5ec76db4
Fix regression in the NiVisController
2020-02-19 11:50:59 +04:00
elsid
650f429ff5
Add final modifier to fix warnings
2020-02-18 10:36:08 -08:00
Andrei Kortunov
84979fa8b7
Move VisMask to components
2020-02-16 16:03:35 +04:00
Andrei Kortunov
f4291ea948
Fix intersector usage (bug #5283 )
2020-02-10 22:31:20 +04:00
Andrei Kortunov
b8548b8f56
Merge pull request #2691 from elsid/navigator_status
...
Use status codes to handle navigator errors instead of exceptions
2020-02-05 13:24:29 +04:00
elsid
349040ffb2
Use status codes to handle navigator errors instead of exceptions
...
For find path use case.
2020-02-04 22:33:56 +01:00
Capostrophic
216a5d27c6
Avoid working with AMBI subrecord in tools unnecessarily (bug #5269 )
2020-02-04 20:57:04 +03:00
Capostrophic
0479311c25
Correct declarations of utility methods
2020-02-02 19:01:47 +03:00
Capostrophic
e363d5df21
Some more minor NIF support fixes
2020-02-02 17:28:46 +03:00
Alexei Dobrohotov
234fdfefb7
Revert "Don't apply 1.6 magic value to NiGravity decay factor ( #5266 )"
2020-01-31 15:11:29 +03:00
Capostrophic
dcafe719a5
Don't apply 1.6 magic value to NiGravity decay factor ( #5266 )
2020-01-31 01:15:58 +03:00
elsid
f7caeefddb
Fallback to straight path when navmesh and pathgrind are not available
2020-01-29 11:14:07 +01:00
Bret Curtis
44a85795cf
Merge pull request #2669 from Capostrophic/wnam
...
Generate WNAM subrecord upon saving terrain instead of upon editing it
2020-01-28 11:43:47 +01:00
elsid
1e106013a0
Use navmesh to find wander destination outside pathgrid for ground based actors
...
Use dtNavMeshQuery::findRandomPointAroundCircle from recastnavigation
2020-01-21 00:01:06 +01:00
capostrophic
89055f1c6c
Generate WNAM upon saving terrain
2020-01-11 02:42:04 +03:00
Bret Curtis
95f9e4f4c9
Merge pull request #2649 from Capostrophic/nifstreamline
...
Yet more NIF adjustments
2020-01-10 22:07:25 +01:00
Alexei Dobrohotov
7a4caaf5bf
Merge pull request #2660 from akortunov/boost
...
Additional de-boosting
2020-01-09 22:14:32 +03:00
Alexei Dobrohotov
ff2739b8a3
Merge pull request #2651 from akortunov/encoding
...
Unify streams usage to support non-ASCII paths
2020-01-09 22:12:55 +03:00
Andrei Kortunov
a250a405b4
An attempt to fix the MSVC2017 build
2020-01-09 20:42:06 +04:00
Andrei Kortunov
1cdd33b434
Implement additional stringops to avoid Boost functions
2020-01-09 19:40:22 +04:00
Andrei Kortunov
cb1a8ec518
Do not link the Boost threads library
2020-01-09 19:40:22 +04:00
capostrophic
0467e8ee15
Avoid heap corruption while reading SCVR (bug #4680 )
2020-01-04 01:34:41 +03:00
Andrei Kortunov
3704acf857
Unify streams usage to support non-ASCII paths (bug #5239 )
2020-01-03 07:10:17 +04:00
capostrophic
f234d53269
Don't use double negation
2020-01-02 13:13:57 +03:00
capostrophic
32caab663f
Enumerate interpolation types properly
2020-01-02 13:07:27 +03:00
capostrophic
e654a52b70
More NIF adjustments
...
Constant interpolation support
2020-01-02 13:07:27 +03:00
Andrei Kortunov
75fed1d236
Print error code when failed to open file on Windows
2020-01-02 09:28:38 +04:00
Alexei Dobrohotov
133b99bf18
Merge pull request #2622 from akortunov/testcells
...
Implement TestCells and TestInteriorCells console commands
2019-12-29 14:27:48 +03:00
Alexei Dobrohotov
2693598d82
Merge pull request #2642 from akortunov/warnfix2
...
Add safety checks for door state
2019-12-23 21:22:56 +03:00
Alexei Dobrohotov
dfcc6d8b5a
Merge pull request #2640 from akortunov/save
...
Do not store gold-specific value for everything
2019-12-23 21:22:26 +03:00
Andrei Kortunov
24044b08e0
Do not store gold-specific value for everything
2019-12-23 19:34:57 +04:00
Andrei Kortunov
88a695f251
Add safety checks for door state
2019-12-23 19:29:12 +04:00
Andrei Kortunov
24ce242941
Implement TestCells (feature #5219 )
2019-12-22 11:13:42 +04:00
Andrei Kortunov
cd81f81fb6
Initialize variables to avoid GCC warnings
2019-12-22 10:44:14 +04:00
Assumeru
737aa1e4e8
Remove FactionID editing from OpenCS ( #2636 )
...
* Remove FactionID editing
* remove useless comments
* rename FactionID to Unknown
2019-12-18 20:42:54 +03:00
Assumeru
dfbe0021a5
Change rescaling to be more inline with vanilla ( fixes #5214 ) ( #2635 )
...
* move rescaling to loadData
* clamp on save
2019-12-18 19:37:45 +03:00
Alexei Dobrohotov
f3e8fbfded
Merge branch 'range-safety' into 'master'
...
Make script literal lookup functions safer
See merge request OpenMW/openmw!113
2019-12-18 15:27:49 +00:00
Andrei Kortunov
c41562fa27
Make TextureProperty warnings more informative
2019-12-15 13:56:20 +04:00
Capostrophic
909c8ef0ea
Avoid working with empty controller data (bug #5229 )
2019-12-14 20:35:23 +03:00
Andrei Kortunov
5b5c52d92e
Handle NiKeyframeController for NiTriShape (feature #5224 )
2019-12-10 16:20:27 +04:00
Capostrophic
4b38bab0d9
Make sure empty cell name subrecords are saved (bug #5222 )
2019-12-03 18:47:02 +03:00
Andrei Kortunov
eec82f676a
Merge pull request #2602 from elsid/clang_tidy
...
Fix clang-tidy issues
2019-12-03 08:27:43 +04:00
Andrei Kortunov
ab4b3677e3
Merge branch '16' into 'master'
...
perf regression fix
See merge request OpenMW/openmw!157
2019-12-02 05:35:19 +00:00
Andrei Kortunov
974670a7c5
Merge pull request #2540 from elsid/fix_startup_fail_crash
...
Fix crash on destructed stream usage
2019-11-30 22:15:00 +04:00
Andrei Kortunov
ae80d8e490
Merge pull request #2618 from elsid/fix_rope_bridge
...
Fix objects culling for recast mesh tiles (bug #5216 )
2019-11-30 21:54:14 +04:00
Alexei Dobrohotov
c01324fdb2
Merge pull request #2613 from akortunov/warnfix3
...
Fix GCC9 warnings about implicit declarations
2019-11-30 16:09:01 +03:00
elsid
7ec5a20c64
Filter recast mesh triangles by global bounding box
...
Except heightfields to reduce slow down.
2019-11-30 13:19:27 +01:00
elsid
7729e396b2
Fix exceptions logging
2019-11-30 10:33:14 +01:00
Andrei Kortunov
1b98fe4395
Fix GCC9 warnings about implicit declarations
2019-11-29 12:41:23 +04:00
Andrei Kortunov
5daf602256
Fix iterator usage when destroying cell borders (bug #5218 )
2019-11-29 12:26:17 +04:00
bzzt
d340224c95
shadowsbin for gl state reduction
2019-11-20 13:37:00 +00:00
bzzt
480302d634
terrainclusterculling
2019-11-20 13:37:00 +00:00
bzzt
f09125fc93
perf regression fix
2019-11-20 13:37:00 +00:00
elsid
8d358eeb7d
Avoid virtual call in ParticleSystem ctor
2019-11-17 18:50:45 +01:00
elsid
b07a6afa91
Avoid virtual call in GraphicsWindowSDL2 ctor
...
/home/elsid/dev/openmw/components/sdlutil/sdlgraphicswindow.cpp:23:8: warning: Call to virtual function during construction [clang-analyzer-optin.cplusplus.VirtualCall]
if(valid())
^
/home/elsid/dev/openmw/components/sdlutil/sdlgraphicswindow.cpp:23:8: note: This constructor of an object of type 'GraphicsWindowSDL2' has not returned when the virtual method was called
/home/elsid/dev/openmw/components/sdlutil/sdlgraphicswindow.cpp:23:8: note: Call to virtual function during construction
2019-11-17 18:50:11 +01:00
elsid
4cd2ff9a3d
Avoid virtual call in TerrainGrid dtor
...
/home/elsid/dev/openmw/components/terrain/terraingrid.cpp:31:9: warning: Call to virtual function during destruction [clang-analyzer-optin.cplusplus.VirtualCall]
unloadCell(mGrid.begin()->first.first, mGrid.begin()->first.second);
^
/home/elsid/dev/openmw/components/terrain/terraingrid.cpp:29:12: note: Assuming the condition is true
while (!mGrid.empty())
^
/home/elsid/dev/openmw/components/terrain/terraingrid.cpp:29:5: note: Loop condition is true. Entering loop body
while (!mGrid.empty())
^
/home/elsid/dev/openmw/components/terrain/terraingrid.cpp:31:9: note: This destructor of an object of type '~TerrainGrid' has not returned when the virtual method was called
unloadCell(mGrid.begin()->first.first, mGrid.begin()->first.second);
^
/home/elsid/dev/openmw/components/terrain/terraingrid.cpp:31:9: note: Call to virtual function during destruction
2019-11-17 18:50:11 +01:00
elsid
2e1d8a5e55
Remove unused virtual modifiers in DebugHUD
...
/home/elsid/dev/openmw/components/sceneutil/mwshadowtechnique.cpp:3127:9: warning: Call to virtual function during construction [clang-analyzer-optin.cplusplus.VirtualCall]
addAnotherShadowMap();
^
/home/elsid/dev/openmw/components/sceneutil/mwshadowtechnique.cpp:3094:5: note: Loop condition is true. Entering loop body
for (int i = 0; i < 2; ++i)
^
/home/elsid/dev/openmw/components/sceneutil/mwshadowtechnique.cpp:3094:5: note: Loop condition is true. Entering loop body
/home/elsid/dev/openmw/components/sceneutil/mwshadowtechnique.cpp:3094:5: note: Loop condition is false. Execution continues on line 3102
/home/elsid/dev/openmw/components/sceneutil/mwshadowtechnique.cpp:3126:21: note: Assuming 'i' is < 'numberOfShadowMapsPerLight'
for (int i = 0; i < numberOfShadowMapsPerLight; ++i)
^
/home/elsid/dev/openmw/components/sceneutil/mwshadowtechnique.cpp:3126:5: note: Loop condition is true. Entering loop body
for (int i = 0; i < numberOfShadowMapsPerLight; ++i)
^
/home/elsid/dev/openmw/components/sceneutil/mwshadowtechnique.cpp:3127:9: note: This constructor of an object of type 'DebugHUD' has not returned when the virtual method was called
addAnotherShadowMap();
^
/home/elsid/dev/openmw/components/sceneutil/mwshadowtechnique.cpp:3127:9: note: Call to virtual function during construction
2019-11-17 18:50:11 +01:00
elsid
bd149b909f
Remove unused virtual modifiers in ShadowManager
...
/home/elsid/dev/openmw/components/sceneutil/shadow.cpp💯 9: warning: Call to virtual function during construction [clang-analyzer-optin.cplusplus.VirtualCall]
setupShadowSettings();
^
/home/elsid/dev/openmw/components/sceneutil/shadow.cpp💯 9: note: This constructor of an object of type 'ShadowManager' has not returned when the virtual method was called
/home/elsid/dev/openmw/components/sceneutil/shadow.cpp💯 9: note: Call to virtual function during construction
/home/elsid/dev/openmw/components/sceneutil/shadow.cpp:104:9: warning: Call to virtual function during construction [clang-analyzer-optin.cplusplus.VirtualCall]
enableOutdoorMode();
^
/home/elsid/dev/openmw/components/sceneutil/shadow.cpp:104:9: note: This constructor of an object of type 'ShadowManager' has not returned when the virtual method was called
/home/elsid/dev/openmw/components/sceneutil/shadow.cpp:104:9: note: Call to virtual function during construction
2019-11-17 18:26:56 +01:00
Andrei Kortunov
f09d20434c
Clamp number of shadow maps
2019-11-17 17:25:02 +04:00
Alexei Dobrohotov
ef138e9afc
Merge pull request #2592 from akortunov/switchnode
...
Use transformations of NiSwitchNode
2019-11-15 19:46:45 +03:00
Andrei Kortunov
34873b6065
Fix dead code
2019-11-13 15:29:18 +04:00
Andrei Kortunov
7074baa1c2
Clamp number of shadow maps, as described in docs
2019-11-13 15:10:22 +04:00
Andrei Kortunov
af41e9acc1
Initialize variables to avoid undefined values
2019-11-13 14:47:29 +04:00
Andrei Kortunov
51cfd070c6
Use transformations of NiSwitchNode
2019-11-09 21:43:08 +04:00
Andrei Kortunov
bafc0d9e90
Added support for texture fragment usage to the ImageButton
2019-11-09 12:52:42 +04:00
Andrei Kortunov
6eb8e0cf4d
Display magic effects according to research page
2019-11-07 11:05:18 +04:00
Alexei Dobrohotov
a8843fa5a8
Make sure MultiChar::data() constructs a valid string
...
mData may ultimately not be a valid C-string (e.g. if it contains 4 significant characters) so it may not necessarily be converted into a valid std::string
2019-11-05 22:33:14 +03:00
elsid
d42b5fd28e
Fix warning -Woverloaded-virtual
...
In file included from openmw/components/terrain/quadtreeworld.cpp:10:
openmw/components/terrain/quadtreenode.hpp:95:14: warning: 'Terrain::QuadTreeNode::traverse' hides overloaded virtual function [-Woverloaded-virtual]
void traverse(ViewData* vd, const osg::Vec3f& viewPoint, LodCallback* lodCallback, float maxDist);
^
OpenSceneGraph/build/clang/release/include/osg/Group:43:22: note: hidden overloaded virtual function 'osg::Group::traverse' declared here: different number of parameters (1 vs 4)
virtual void traverse(NodeVisitor& nv);
^
1 warning generated.
2019-11-05 09:31:38 +01:00
bzzt
b6ed2f1718
Add optional shadow map max distance and fading
2019-11-02 18:06:39 +03:00
Bret Curtis
ec9a593fc3
Merge pull request #2578 from akortunov/mouse
...
Implement mouse wheel bindings (bug #2679 )
2019-10-31 13:14:29 +01:00
Michael Stopa
e4bec88a68
Implement mouse wheel bindings (bug #2679 )
2019-10-30 20:45:51 +04:00
Alexei Dobrohotov
9ab8d88753
Accept a bogus cell string argument for Position
2019-10-30 17:54:34 +03:00
Andrei Kortunov
45ab6e1430
Implement UTF-8 support for script parser (bug #4598 )
2019-10-30 14:59:47 +04:00
Alexei Dobrohotov
dc8e5f1d12
Accept redundant volume and pitch StopSound arguments
...
Exploited in Arktwend.
2019-10-29 18:51:58 +03:00
Alexei Dobrohotov
8bc2c1ac34
Make ForceGreeting ignore any extra argument
2019-10-29 14:39:21 +03:00
Andrei Kortunov
b2e12f0a73
Attempt to fix a regression - crash on ARM
2019-10-28 18:58:16 +04:00
Capostrophic
f7d2cdb782
Revert to 0.45.0 comments-in-the-middle settings behavior
2019-10-26 10:55:10 +03:00
Bret Curtis
9f039fac87
Merge pull request #2520 from unelsson/transientlandshapeedit
...
[Review phase] Editor: Transient land shape editing
2019-10-25 00:26:43 +02:00
Roman Siromakha
4e5aec5c30
Merge pull request #2539 from Capostrophic/scripting
...
Try to parse strings as number literals (bug #5097 )
2019-10-24 22:12:50 +02:00
Bret Curtis
2040ca5637
Merge pull request #2555 from akortunov/encoding
...
Encode ID's in all places to UTF-8
2019-10-24 00:48:12 +02:00
Nelsson Huotari
0ce971c1bb
Revert back to less aggressive component-level changes.
2019-10-22 21:26:55 +03:00
Nelsson Huotari
c2428bc5fa
Remove unneeded forward declaration
2019-10-22 21:25:10 +03:00
Nelsson Huotari
16138fc896
Transient land shape editing
2019-10-22 21:25:10 +03:00
elsid
275f552fcf
Do not modify settings on save
2019-10-21 22:47:24 +02:00
elsid
a7930073e8
Move settings parser declaration to separate header
2019-10-21 22:47:24 +02:00
Bret Curtis
f666d796e9
Merge pull request #2547 from Capostrophic/nif2
...
More minor NIF improvements
2019-10-21 21:49:07 +02:00
elsid
045ceeac11
Replace foreach macro by for-loop
2019-10-20 20:08:16 +02:00
Capostrophic
7c4743fdd1
Convert recordptr typedefs to using directives
2019-10-16 01:36:43 +03:00
Capostrophic
8056107c6e
More minor NIF improvements
2019-10-16 01:36:43 +03:00
Andrei Kortunov
2fc819cdae
Encode ID's in all places to UTF-8 (bug #3977 )
2019-10-10 20:52:32 +04:00
unelsson
3deebf0247
Merge branch 'master' into wnamfix
2019-10-07 01:40:23 +03:00
Nelsson Huotari
2fdaacf23c
remove for array, just std::swap
2019-10-06 23:50:16 +03:00
Nelsson Huotari
e35ed960ee
for -> std::copy
2019-10-06 21:57:10 +03:00
Nelsson Huotari
7f030fc3ee
copy mWnam record in copy constructor and custom assignment operator
2019-10-06 21:50:40 +03:00
Capostrophic
bde4a38181
Cast Random result to float (bug #5175 )
2019-10-03 23:20:25 +03:00
elsid
751accad0f
Remove unused field QuadTreeBuilder::mLodFactor
2019-09-28 14:26:52 +02:00
elsid
29f262e514
Fix crash on destructed stream usage
2019-09-28 11:30:38 +02:00
Capostrophic
138a7ac434
Expression parser: Try to parse strings as number literals (bug #5097 )
2019-09-26 02:54:17 +03:00
Alexei Dobrohotov
822b20ef46
Fix invalid strips-based collision shape transformation
2019-09-23 20:38:42 +03:00
Alexei Dobrohotov
0a97dd8e84
[Regression] Fix horribly broken fallback loading
2019-09-21 15:05:12 +03:00
Andrei Kortunov
1f3f3dd1a5
Merge pull request #2526 from Capostrophic/config
...
openmw.cfg-related fixes (incl. bug 2976)
2019-09-20 09:09:38 +04:00
Andrei Kortunov
e6b79d100a
Merge pull request #2503 from Capostrophic/keyword
...
Allow usage of more keywords as string arguments (bug #5087 )
2019-09-20 07:38:57 +04:00
Andrei Kortunov
e568ad30ea
Copy transformations data when we clone node (bug #5163 )
2019-09-19 11:35:15 +04:00
Capostrophic
3a912485ca
openmw.cfg-related fixes
...
Make sure the defaults exist in local openmw.cfg too
Make sure constant attenuation settings are defined now that they are implemented
Fix config file loading order once and for all (bug #2976 )
2019-09-17 21:26:06 +03:00
Capostrophic
83f61d1636
Support target color in NiMaterialColorController (bug #5159 )
2019-09-16 22:31:18 +03:00
Capostrophic
8baddefdbd
Refactor extra data and particle modifier handling
...
Objects no longer inherit from extra data class
"Controlled" harmful abstraction no longer exists
Introduced NiParticleModifier/NiParticleCollider abstractions
Extra data size reading moved into the base read() method
2019-09-13 20:26:22 +03:00
capostrophic
8f2ed884a5
Allow usage of more keywords as string arguments (bug #5087 )
2019-09-06 19:12:08 +03:00
Capostrophic
c0438a0c6b
Avoid using getPtr on empty geometry data
2019-08-26 23:01:58 +03:00
Alexei Dobrohotov
64fde2d7c2
Fix crash when NiGeometry lacks NiGeometryData
2019-08-24 22:34:56 +03:00
capostrophic
9c7474f88c
Implement NiPalette support (feature #4882 )
2019-08-16 20:21:09 +03:00
capostrophic
efa463af8f
Fix non-tiling textures clamp mode (bug #5137 )
2019-08-16 16:26:11 +03:00
Andrei Kortunov
d4a8023e1a
Merge pull request #2485 from Capostrophic/lighting
...
Add support for QuadraticMethod/LinearMethod setup (bug #4965 , continuation)
2019-08-11 22:17:40 +04:00
capostrophic
62fd2d47a5
Rewrite flickering/pulsing to work more like vanilla (bug #4952 )
2019-08-11 20:33:13 +03:00
Alexei Dobrohotov
3668473d6d
Fix comment
2019-08-10 19:22:46 +03:00
Alexei Dobrohotov
eaedf34975
Fix ventriloquism
2019-08-10 19:21:36 +03:00
capostrophic
c0d5cbdc8b
Add support for QuadraticMethod/LinearMethod setup (bug #4965 )
2019-08-10 13:25:49 +03:00
Alexei Dobrohotov
307e9ba666
Merge pull request #2413 from akortunov/weapon
...
Refactor weapon types behaviour
2019-08-09 20:02:10 +03:00
Andrei Kortunov
f0cef772fa
Refactor weapon types behaviour
...
1. Move weapon types behaviour from switches to the table (should allow
us to de-hardcode weapon types later)
2. Gereralize bones injection to actors skeletons (instead of using the
hardcoded xbase_anim_sh.nif)
2019-08-09 19:40:27 +04:00
capostrophic
9e93c9ecd2
Fix multiple-strip NiTriStrips loading
2019-08-08 22:48:24 +03:00
capostrophic
93f73fe87b
Fix comparison
2019-08-08 20:41:46 +03:00
capostrophic
7fc3153f62
Reduce code duplication further
2019-08-08 20:29:45 +03:00
capostrophic
91efdf18a9
Reduce Bullet part code duplication
2019-08-08 19:02:08 +03:00
capostrophic
ed154f0e2c
Fix typo and replace failsave with an assert
2019-08-08 18:42:58 +03:00
capostrophic
7cc70ffb50
Reduce skinned shape code duplication
2019-08-08 18:37:42 +03:00
capostrophic
bd6c455fd4
Reduce code duplication for non-skinned shapes
2019-08-08 18:12:46 +03:00
capostrophic
b4f54651f8
Make sure strips have valid size
2019-08-08 17:15:33 +03:00
capostrophic
6599a28ecf
Generate collision shape based on NiTriStrips
2019-08-08 17:15:33 +03:00
capostrophic
adb06913f7
Add basic NiTriStrips rendering (no physics yet)
2019-08-08 17:09:06 +03:00
capostrophic
8efbdeaa57
Load NiTriStrips/NiTriStripsData (don't do anything yet)
2019-08-08 17:09:06 +03:00
capostrophic
7b6af4a893
Make sure local path includes trailing slash
...
Launcher assumes it does
2019-08-08 17:06:27 +03:00
Andrei Kortunov
8557346fbd
Use glow for enchanted arrows (feature #5122 )
2019-08-07 12:58:14 +04:00
capostrophic
6928adcee1
Prevent front() and operator[] from causing undefined behavior
2019-08-04 14:47:33 +03:00
capostrophic
168e5050bb
Ignore an extra number argument in ModRegion (bug #5110 )
2019-08-01 20:48:58 +03:00
Chris Djali
576285573b
Merge pull request #2404 from Capostrophic/framerate
...
Make framerate limit configurable in the launcher
2019-07-19 16:16:20 +01:00
fredzio
ca7ac30f6d
Use the POSIX pathconf(2) to determine the maximum path length.
...
It fixes build on BSD platforms where PATH_MAX is defined in
<sys/syslimits.h> vs <linux/limits.h> on Linux.
2019-07-07 01:02:38 +02:00
Alexei Dobrohotov
e4c596adf8
Fix CI builds (attempt №2)
...
Gosh darn dem tabs
2019-07-04 14:12:36 +03:00
Alexei Dobrohotov
e4e513c5dc
Fix CI builds
...
Apparently the only tab characters are in this file.
2019-07-04 13:36:27 +03:00
Nat Meo
bcc5142b32
Issue #4202 : Open .omwaddon files without needing to open openmw-cs first.
2019-07-02 16:07:38 +00:00
AnyOldName3
bb72ed9744
Merge branch '9' into 'master'
...
IMPORTANT!! racingcrashfix #4766
See merge request OpenMW/openmw!119
2019-07-01 15:36:40 +00:00
AnyOldName3
8a6a8086da
Make in-memory buffers seekable to fix fog of war
2019-07-01 00:07:44 +01:00
Capostrophic
dfb852cbb0
Improve Boost apologia
2019-06-22 18:15:19 +03:00
Capostrophic
49c691d00a
Make settings manager locale-independent again
2019-06-22 18:15:19 +03:00
Capostrophic
e06178bf0f
Make sure shadow shapes aren't visible (bug #5063 )
2019-06-22 18:13:41 +03:00
Andrei Kortunov
b9a1e4d796
Merge pull request #2425 from Capostrophic/esm
...
Signedness fixes
2019-06-21 10:01:10 +04:00
Alexei Dobrohotov
f984f61055
Ignore any fourth AITravel argument for now
2019-06-20 14:18:12 +03:00
Capostrophic
3aa65273c5
Signedness fixes
2019-06-18 14:47:10 +03:00
Evil Eye
698c90b3ee
fix builds against MyGUI master
2019-06-16 14:41:34 +02:00
Andrei Kortunov
b66c437700
Merge pull request #2419 from Capostrophic/lod
...
Optimizer: Only merge pure osg::Groups
2019-06-12 18:33:07 +04:00
Andrei Kortunov
4fcbc1c96b
Merge pull request #2391 from Capostrophic/contentselector
...
Content selector: don't add file namesakes (bug #2395 )
2019-06-10 10:15:19 +04:00
Capostrophic
6622e36226
Only merge pure osg::Groups in the optimizer
2019-06-09 11:47:43 +03:00
Capostrophic
7c8360d0f3
Use NiSwitchNode initial index field
2019-06-09 01:58:02 +03:00
Alexei Dobrohotov
ce92b364e6
Merge pull request #2403 from akortunov/crashinfo
...
Improve info message about missing GDB
2019-06-06 11:09:46 +03:00
bzzt
a730365ea1
Creanup Distant Terrain code
...
- Cull terrain in the stock osg::CullVisitor
- Do not compile composite maps for shadow camera
- Do not abuse userdata for composite maps
2019-06-05 19:09:57 +04:00
bzzt
e4ba6ecf15
Do not store a LOD callback in the every QuadTreeNode
2019-06-05 18:27:37 +04:00
bzzt
a61c0aaee1
Do not load height data to the qued tree since we do not need it now
2019-06-05 18:27:37 +04:00
bzzt
ebcf8ca062
Do not store a ViewDataMap in the every QuadTreeNode
2019-06-05 18:27:37 +04:00
bzzt
cb6d27fb12
Use the custom LineSegmentIntersector for QuadTree to simplify traversal
...
code
2019-06-05 18:27:37 +04:00
bzzt
ce4e8be9ac
Move traverse methods to the QuadTreeNode
2019-06-05 18:27:37 +04:00
Capostrophic
b7afb213ae
"Handle" RepairedOnMe scripting function (feature #4255 )
2019-06-03 02:17:32 +03:00
Alexei Dobrohotov
f0640cbb21
Merge pull request #2296 from akortunov/blend
...
Optimize blendmap generation
2019-06-03 00:10:22 +03:00
bzzt
528cda8032
Prevent layers duplication when a terrain chunk crosses plugin borders
2019-06-01 14:52:42 +04:00
Andrei Kortunov
1da012f6ee
Optimize blendmap generation
2019-06-01 14:37:29 +04:00
Alexei Dobrohotov
5965aa991b
Improve grammar in a warning
2019-06-01 00:06:49 +03:00
Capostrophic
0fcb75fb21
Achieve CHIM and get rid of the loop
2019-05-31 20:01:46 +03:00
Capostrophic
5cd781b3eb
Experimental folder handling rewrite
2019-05-31 20:01:46 +03:00
Capostrophic
2fbed21f83
Avoid a memory leak
2019-05-31 20:01:46 +03:00
Capostrophic
e14ada8f36
Make file name comparison case-insensitive
2019-05-31 20:01:46 +03:00
Capostrophic
ebe5448816
Content selector: drop duplicates of the added file (bug #2395 )
2019-05-31 20:01:46 +03:00
Andrei Kortunov
f1db97fbbd
Improve info message about missing GDB (bug #4341 )
2019-05-30 14:51:31 +04:00
bzzt
ffe8bbd2dd
racingcrashfix #4766
2019-05-29 13:37:00 +00:00
Andrei Kortunov
7c53b99d31
Avoid possible data race during access to the static local variable
2019-05-24 08:03:45 +04:00
Phillip Andrews
dee72e9430
Make script literal lookup functions safer
...
Assert isn't really the right way to range check these, since in theory we could have a malformed compiled script. This should make it safer with zero performance overhead.
2019-05-21 17:58:10 -05:00
Alexei Dobrohotov
7c46102f0c
Merge pull request #2389 from akortunov/fmt
...
Introduce a custom format() function
2019-05-21 21:45:52 +03:00
Andrei Kortunov
6832a2fa9a
Remove BOM from CPP files (allows to build OpenMW with LCC on Elbrus)
2019-05-21 19:22:34 +04:00
Andrei Kortunov
e679190f31
Introduce a custom format() function to get rid of boost::format() and hackish replace()
2019-05-20 09:20:01 +04:00
Alexei Dobrohotov
2c956398c1
Actually fix bug 4938
2019-05-15 21:41:49 +03:00
Alexei Dobrohotov
1444ef6f43
Merge pull request #2298 from akortunov/optimize
...
Do not allocate eight dummy LightStateAttribute's for every stateset
2019-05-11 02:32:34 +03:00
Alexei Dobrohotov
acae586765
Merge pull request #2365 from akortunov/guifixes
...
Refactor Settings::Manager::apply()
2019-05-04 21:01:15 +03:00
Andrei Kortunov
4f42fe5595
Refactor Settings::Manager::apply()
2019-05-04 21:38:36 +04:00
Alexei Dobrohotov
1bfe0e43af
Merge pull request #2360 from akortunov/guifixes
...
Do not track resolution settings changes in the InputManager
2019-05-04 20:23:03 +03:00
Alexei Dobrohotov
74112976b2
Merge pull request #2085 from akortunov/herbalism
...
Native graphics herbalism support
2019-05-03 20:58:22 +03:00
Andrei Kortunov
7ce07e9202
Merge pull request #2345 from Capostrophic/scripting
...
More argument usage corrections
2019-05-03 08:06:06 +04:00
Ilya Zhuravlev
2e1ac51203
Clean up androidpath
2019-05-02 18:18:49 -04:00
Andrei Kortunov
861d41f4a4
Native graphics herbalism support (feature #5010 )
2019-05-02 23:03:47 +04:00
Capostrophic
95751ba671
Ignore extra numerical arguments for ForceGreeting, Position(Cell), PlaceItem(Cell)
2019-05-02 20:50:05 +03:00
Capostrophic
05727f2bcd
Ignore string arguments for AITravel, GetDynamic, LowerRank, RaiseRank
2019-05-02 20:50:05 +03:00
Andrei Kortunov
0cd8d4b842
Do not track resolution settings changes in the InputManager (bug #4902 )
2019-05-02 19:00:47 +04:00
Capostrophic
05d94d35f9
Make disabled shadow defines map static
2019-04-29 19:31:46 +03:00
Andrei Kortunov
7941fd6780
Merge branch 'patch-2' into 'master'
...
Add support for OpenGLES 3.2
See merge request OpenMW/openmw!93
2019-04-24 17:03:10 +00:00
Bret Curtis
e0edecf1f2
Merge pull request #2341 from Capostrophic/scripting
...
Allow using functions in non-conditional expressions (bug #3725 )
2019-04-24 12:05:07 +02:00
Andrei Kortunov
bd2188a0f8
Use the logging system for compiler errors
2019-04-23 22:20:18 +04:00
Capostrophic
3d64a46df2
Allow using functions in non-conditional expressions (bug #3725 )
2019-04-22 20:37:32 +03:00
Andrei Kortunov
9059971a69
Increase required MyGUI version to 3.2.2
2019-04-22 20:52:18 +04:00
Alexei Dobrohotov
53d704fec8
Merge pull request #2335 from akortunov/guifixes
...
Allow to shrink tooltip width to its actual text width
2019-04-22 19:44:17 +03:00
Andrei Kortunov
626a05f825
Merge pull request #2128 from Capostrophic/blood
...
Support all eight possible blood types (feature #4958 )
2019-04-21 21:14:30 +04:00
Andrei Kortunov
7e0bf40dbe
Allow to shrink tooltip width to its actual text width (bug #3812 )
2019-04-21 08:27:14 +04:00
Capostrophic
6cbec4a688
Stray argument usage corrections
2019-04-19 21:28:06 +03:00
terrabyte25
b29476de58
Add support for OpenGLES 3.2
2019-04-15 17:09:36 -05:00
Capostrophic
7814bd1b76
Support eight possible blood types (feature #4958 )
2019-04-14 18:48:31 +03:00
elsid
4500f01efd
Remove unused field
2019-04-13 13:25:49 +02:00
Alexei Dobrohotov
5b8fc5a151
Merge pull request #2314 from OpenMW/stdc++14
...
bump from C++11 to C++14
2019-04-12 17:34:18 +03:00
Bret Curtis
f4e113e7c1
Merge pull request #2277 from akortunov/terrain
...
Camera-related fixes
2019-04-12 11:17:20 +02:00
Bret Curtis
10643a10f2
Merge branch 'master' into lighting
2019-04-11 09:55:09 +02:00
Alexei Dobrohotov
d3e6921946
Merge pull request #2318 from elsid/navmesh_lock_tile
...
Avoid work duplication for multiple thread async navmesh updater
2019-04-11 00:19:52 +03:00
elsid
c683dc8565
Lock navmesh tile by thread while processing
...
To avoid duplicated work on a same tile by different threads.
If tile is locked by another thread, then post job into this thread queue.
2019-04-10 22:01:50 +02:00
Capostrophic
85e99182ce
Revise light source configuration (bug #4965 )
...
Set up attenuation less awkwardly
Use global attenuation settings for magic light source
Use constant attenuation settings
2019-04-10 22:31:31 +03:00
Bret Curtis
2ab7f903d7
make use of std::make_unique to test that MSVC2015 can handle that
2019-04-10 11:09:44 +02:00
Capostrophic
b08fed6d83
Fix NIF printVersion and allow 4.0.0.0 file loading
2019-04-09 21:58:29 +03:00
Andrei Kortunov
14b756a692
Use a generic logging system for RecastNavigation
2019-04-08 20:31:21 +04:00
Bret Curtis
7808cbbfe8
Merge pull request #2292 from akortunov/fallback
...
Make fallback map static to simplify constructors
2019-04-07 17:43:59 +02:00
bzzt
391f6faffb
Remove unused defaultViewer / defaultViewPoint
2019-04-07 11:21:09 +04:00
bzzt
e908790584
Inherit the view point from main camera for water RTT cameras
2019-04-07 11:21:07 +04:00
Andrei Kortunov
489e5c6cce
Store preloaded terrain view in the main thread
2019-04-07 11:15:21 +04:00
bzzt
63ab7345be
Reuse traversal result for different traversal with same view point
...
Rename eyePoint to viewPoint to match OSG conventions (eyePoint is the camera position, viewPoint is for LOD handling)
2019-04-07 11:14:37 +04:00
Bret Curtis
a5504f8cc1
Merge pull request #2297 from Capostrophic/esm
...
Make sure the record hasn't ended in getHString hack (bug #4938 )
2019-03-31 21:15:23 +02:00
bzzt
1a65adacdd
Do not allocate dummy LightStateAttribute's for every stateset
2019-03-30 21:36:08 +04:00
Capostrophic
4b6fc5f720
Make sure the record hasn't ended in getHString hack (bug #4938 )
2019-03-30 20:11:22 +03:00
Andrei Kortunov
368d1f9d25
Merge pull request #2191 from akortunov/viewer
...
Do not store Viewer reference in the ViewData
2019-03-30 08:24:44 +04:00
Andrei Kortunov
cae456a4aa
Merge pull request #2294 from Capostrophic/arguments
...
Ignore extra arguments to PlayLoopSound3D too
2019-03-30 08:18:39 +04:00
Capostrophic
7ef7555c19
Ignore extra arguments to PlayLoopSound3D too
2019-03-30 01:06:01 +03:00
Andrei Kortunov
a302ec9c65
Make fallback map static to simplify constructors
2019-03-29 15:30:49 +04:00
Capostrophic
17dce28705
Improve compiler messages
2019-03-29 00:59:26 +03:00
bzzt
c8d2107b80
Do not store Viewer reference in the ViewData
2019-03-28 09:51:45 +04:00
Bret Curtis
1e9eac568f
Merge pull request #2249 from akortunov/cache
...
Implement generic caching system
2019-03-25 13:32:23 +01:00
Bret Curtis
6cbf1288ff
Merge pull request #1929 from Capostrophic/elseif
...
Ignore the rest of the line after else operator (bug #3006 )
2019-03-24 16:35:49 +01:00
Capostrophic
cbce1a1b7c
Ignore the rest of the line after else (bug #3006 )
2019-03-24 18:34:33 +03:00
Bret Curtis
8f8bba66d9
Merge pull request #2178 from Capostrophic/declaration
...
Ignore extra text after a local variable declaration (bug #4867 )
2019-03-24 16:33:21 +01:00
Capostrophic
786f3e5fc3
Remove unused and unfinished blendmap packing feature
2019-03-22 22:15:28 +03:00
Capostrophic
af47ec7756
Skip extra text after variable declaration (bug #4867 )
2019-03-21 17:00:40 +03:00
Bret Curtis
5e12073b47
Merge pull request #2272 from akortunov/optimize_terrain
...
Do not block loading while compiling composite maps
2019-03-21 09:17:02 +01:00
Andrei Kortunov
b466bfee40
Enable light sources directly to avoid virtual calls
2019-03-21 10:27:50 +04:00
Andrei Kortunov
0e1f5f68b6
Do not allow different threads to compile the same composite map
2019-03-21 08:52:13 +04:00
Andrei Kortunov
cad45e96ac
Remove redundant mCompile set - we do not use data from it anyway
2019-03-21 08:42:48 +04:00
bzzt
c2986b3bd7
Do not block the loading thread while compiling composite maps in the
...
draw thread
2019-03-20 21:42:53 +04:00
Bret Curtis
26feedfcae
Merge pull request #2268 from akortunov/scanfix
...
Fix some issues from the Coverity Scan report
2019-03-19 17:27:48 +01:00
Bret Curtis
19dcbf2b3d
Merge pull request #2266 from Capostrophic/vsync
...
Vsync tweaks
2019-03-19 09:23:48 +01:00
Andrei Kortunov
b2fca46206
Fix a couple of minor issues in shadows
2019-03-19 09:14:07 +04:00
Andrei Kortunov
7995a92672
Initialize missing variables
2019-03-19 09:12:31 +04:00
Capostrophic
9b65f0dbca
Vsync tweaks
...
Try to use adaptive vsync if available
Don't use vsync if unavailable
2019-03-18 21:45:02 +03:00
Bret Curtis
b819690e82
Merge pull request #2264 from akortunov/optimize_terrain
...
Delete composite map layers in the background thread
2019-03-18 13:52:17 +01:00
bzzt
aa5a071aef
Delete composite map layers in the background thread
2019-03-18 14:00:50 +04:00
Bret Curtis
d56733149c
Merge pull request #2201 from akortunov/optimize_terrain
...
Optimize terrain
2019-03-18 08:59:10 +01:00
Bret Curtis
45221418bd
Merge pull request #2260 from elsid/fix_clean_unused_navmeshes
...
Fix clean unused navmeshes
2019-03-18 08:57:46 +01:00
bzzt
6029ed4ecc
Reject empty quad tree nodes at the cell level without land data
2019-03-18 10:27:29 +04:00
bzzt
36fa51b6ad
Fix bounding box calculation for terrain shapes
2019-03-18 10:27:09 +04:00
elsid
4624f31788
Report navigator stats
2019-03-17 22:15:18 +03:00
elsid
8adc83f6e2
Fix clean unused navmeshes
...
weak_ptr doesn't have constructor for shared_ptr&& type, so ptr wasn't
moved, just copied.
2019-03-17 21:28:34 +03:00
elsid
2c78d530a2
Use static vector to store stat names
2019-03-17 20:50:15 +03:00
Bret Curtis
ab69ad65ed
Merge pull request #2234 from Capostrophic/terrain
...
Some more improvements from bzzt's branch
2019-03-17 18:07:19 +01:00
Capostrophic
de572226e4
Update optimizer with upstream improvements
2019-03-17 07:59:16 +03:00
bzzt
b42ad0f610
Inline certain terrain storage functions
2019-03-17 07:27:27 +03:00
bzzt
e131e6699c
Match vertex colors data type to source
2019-03-17 07:24:22 +03:00
elsid
c91deaf7af
Use std::vector::data method to avoid reference binding to null pointer
2019-03-16 00:46:00 +03:00
elsid
dd0b45ede6
Do not pass nullptr to std::memcmp
2019-03-14 22:15:57 +03:00
Bret Curtis
7917f1fc84
Merge pull request #2252 from akortunov/terrain
...
Do not allocate empty callbacks in the RigGeometry
2019-03-14 14:53:35 +01:00
bzzt
4ab93aeffe
Do not allocate empty callbacks in the RigGeometry
2019-03-14 12:37:41 +04:00
Andrei Kortunov
2ed05a5195
Implement generic caching system
2019-03-14 09:10:19 +04:00
elsid
8e09468f45
Don't set display list usage for navmesh
2019-03-12 00:05:55 +03:00
Bret Curtis
7b1a62fc1d
Merge pull request #2247 from akortunov/loadtex
...
Allow to override texture records in the game
2019-03-11 21:05:30 +01:00
Andrei Kortunov
943279abbb
Consider land texture with given ID and index as override for base texture with the same ID and index (bug #4736 )
2019-03-11 20:19:19 +04:00
Bret Curtis
7efdddd53c
Merge pull request #2242 from elsid/make_shared
...
Use std::make_shared
2019-03-11 07:53:02 +01:00
Bret Curtis
cb1a5f3679
Merge pull request #2245 from elsid/navigator_refactor
...
Refactor navigator related code
2019-03-11 07:51:43 +01:00
Bret Curtis
7b793b8809
Merge pull request #2244 from elsid/navmesh_cache_item_refactor
...
Make NavMeshCacheItem consistent
2019-03-11 07:51:22 +01:00
elsid
68948bc847
Avoid key allocation to find tile in cache
2019-03-11 03:01:41 +03:00
elsid
4395a92c35
Use display list to render navmesh
...
Slightly improves performance of massive navmesh rendering.
2019-03-10 23:58:49 +03:00
elsid
849f2078c1
Swap outside critical section
2019-03-10 23:58:49 +03:00
elsid
8d2af94b75
Use default objects for NavigatorStub methods result
2019-03-10 23:58:49 +03:00
elsid
ece111d05a
Check for jobs using predicate
2019-03-10 23:58:49 +03:00
elsid
c05fc9e054
Add missing cleanup
2019-03-10 23:58:49 +03:00
elsid
ce9aebcba1
Clear all changed tiles after post
2019-03-10 23:58:48 +03:00
elsid
9d61c49478
Store key by reference in tiles map
2019-03-10 23:56:52 +03:00
elsid
614d5243c3
Make NavMeshCacheItem consistent
...
Move all logic related to this type into its methods.
2019-03-10 23:07:36 +03:00
elsid
b3c5d64ff3
Use std::make_shared
2019-03-10 22:07:46 +03:00
elsid
f6a1d3cecf
Store weak pointers to navmesh in jobs queue
...
To avoid useless processing for removed navmeshes.
2019-03-10 17:06:19 +03:00
elsid
ccc709a316
Store guarded navmesh cache item in shared_ptr
...
Remove useless SharedGuarded type.
2019-03-10 17:06:19 +03:00
elsid
0479ebf5ae
Remove unused actors and navmeshes on update
...
When there is only one actor (player) on a scene and it moving to other
cell first it will be removed from navigator then added. Remove cause
navmesh removing for its half extents. After it is added navmesh for
same half extents is created and added. While this all happens there are
still jobs for old navmesh are processing. Old navmesh still exists
because it is stored by shared pointer. So jobs take tiles from cache
and place them into old navmesh. After that other jobs take same tiles
from cache (half extents and coordinates are equal) and place them into
other navmesh. dtNavMesh changes tile data on add and remove. Adding tile
to two dtNavMesh corrupts tile in both nameshes.
2019-03-10 17:06:15 +03:00
Chris Djali
c328c4a010
Merge pull request #2231 from akortunov/warnfix
...
Get rid of C-style limits in the shadows code
2019-03-09 19:00:39 +00:00
Andrei Kortunov
bacaa1f789
Get rid of C-style limits in the shadows code
2019-03-09 13:52:03 +04:00
Andrei Kortunov
12f9184d00
Allow to interrupt terrain preloading
2019-03-09 13:15:23 +04:00
Andrei Kortunov
b214c54b3a
Calculate bounding volumes when preloading model instance
2019-03-09 13:15:16 +04:00
Bret Curtis
c20e69ef24
Merge pull request #2227 from elsid/fix_twitchy_massive_creatures
...
Fix twitchy movement for massive creatures (bug #4907 )
2019-03-09 02:11:11 +01:00
elsid
b9f21ec81a
Use custom steps size to make smooth path depending on half extents
2019-03-08 22:33:34 +03:00
bzzt
e0cf460ba3
Do not load terrain beyond the viewing distance
2019-03-08 22:15:27 +04:00
Andrei Kortunov
a6fd077537
Render nearby default cells if the Distant Terrain is disabled
2019-03-08 22:15:27 +04:00
Andrei Kortunov
46e1ed660c
Revert "Render default land texture for Wilderness cells with distant terrain"
...
This reverts commit 888c2d9a33
2019-03-08 22:15:27 +04:00
elsid
f2e47d640d
Add option to limit max number of navmesh tiles
2019-03-08 17:39:04 +03:00
elsid
ff47df4f2c
Repost navmesh update jobs when failed because of out of memory
...
DT_OUT_OF_MEMORY error is returned when limit of tiles is reached.
2019-03-08 17:39:04 +03:00
elsid
82e2739bae
Notify workers when only at least one job is posted
2019-03-08 15:27:16 +03:00
elsid
b9b8ed177c
Store priority values as named fields
2019-03-08 15:23:36 +03:00
elsid
0c16fef285
Add navmesh update status builder
2019-03-08 15:07:07 +03:00
elsid
14c9190f49
Move tile replacement into separate function
2019-03-08 15:06:11 +03:00
elsid
b6243e7d1f
Fix name styleguide
2019-03-08 15:02:49 +03:00
Bret Curtis
551563cbfb
Merge branch 'clsb-warning' into 'master'
...
Hopefully fix Clang warning about hiding overloaded virtual functions
See merge request OpenMW/openmw!82
2019-03-08 08:50:03 +00:00
Bret Curtis
0764271999
Merge pull request #2224 from elsid/fix_odr_violation
...
Fix ODR violation for VDSMCameraCullCallback
2019-03-08 09:09:36 +01:00
Bret Curtis
a381a1aff4
Merge pull request #2222 from akortunov/warnfix
...
Attempt to fix Clang warnings about hidden virtual methods
2019-03-08 00:09:31 +01:00
elsid
47e87cc2bd
Fix ODR violation for VDSMCameraCullCallback
...
This class is also defined in OpenSceneGraph at global namespace.
2019-03-07 23:49:23 +03:00
AnyOldName3
d34724a3c4
Hopefully fix Clang warning about hiding overloaded virtual functions
2019-03-07 20:46:10 +00:00
Bret Curtis
c55141d18d
Merge pull request #2217 from Capostrophic/shader
...
Move forcePPL and clamp to global shader defines (task #4869 )
2019-03-07 16:56:09 +01:00
Andrei Kortunov
72db11b56c
Fix Clang warnings about hidden virtual methods
2019-03-07 17:53:59 +04:00
Capostrophic
0cdc46dfd6
Move forcePPL and clamp to global shader defines (bug #4869 )
2019-03-05 23:36:08 +03:00
Capostrophic
59f7df187d
Add explicit variant of Journal
2019-03-05 20:47:05 +03:00
elsid
27d7452267
Update scaled objects in navigator
2019-03-04 22:59:39 +03:00
Bret Curtis
14c93b3df0
Revert "Merge pull request #2204 from elsid/fix_navigator_update"
...
This reverts commit 26fb0e7a0f42b2391303
2019-03-04 11:06:15 +01:00
elsid
133d7447f3
Update scaled objects in navigator
2019-03-03 16:46:41 +03:00
Andrei Kortunov
bf5f68a4d8
Replace boost GCD to the homebrew implementation
2019-03-02 17:32:05 +04:00
Bret Curtis
cd70354f34
Merge pull request #2190 from akortunov/terrain
...
Make Distant Terrain configurable
2019-03-02 11:19:45 +01:00
Bret Curtis
3b8b0b5dd7
Merge pull request #2197 from akortunov/quadtree
...
Optimize terrain QuadTree build
2019-03-01 17:09:06 +01:00
Andrei Kortunov
56fea4b062
Add setting to control composite geometry size
2019-03-01 18:02:40 +04:00
bzzt
9d44e18af6
Allow to configure terrain vertex LOD
2019-03-01 18:02:38 +04:00
bzzt
03f23b235a
Optimize terrain QuadTree build
2019-03-01 16:17:11 +04:00
bzzt
fd94d7f7ff
Make Distant Terrain more configurable (feature #4890 )
2019-03-01 14:51:13 +04:00
Grigory Latyshev
3872d7476b
Move makeOsgVec3f() to settingsutils.hpp
...
Remove all other makeOsgVec3f() implementations
2019-02-28 20:03:42 +00:00
Bret Curtis
fe23acdd14
Merge branch 'misc_stringutils_tolower' into 'master'
...
Simplify Misc::StringUtils::toLower
See merge request OpenMW/openmw!71
2019-02-28 19:59:05 +00:00
David Cernat
12cef51122
Merge pull request #2192 from Capostrophic/bzzt
...
Port minor fixes from bzzt's branch
2019-02-28 12:55:58 +02:00
AnyOldName3
6de1deeb2d
Include gldebug attribution and licence
2019-02-28 00:02:07 +00:00
AnyOldName3
e147f6fed9
Finsih gldebug move completely this time
2019-02-28 00:02:07 +00:00
AnyOldName3
ac18983f37
Finish gldebug location move
2019-02-28 00:02:07 +00:00
AnyOldName3
d42c976852
Add detailed OpenGL debug messages
2019-02-28 00:02:07 +00:00
AnyOldName3
aaa3eedf99
Move gldebug from components/misc to components/debug
2019-02-28 00:02:07 +00:00
AnyOldName3
3d917fcbad
Add basic OpenGL debug callback
2019-02-28 00:02:07 +00:00
bzzt
567ad293fd
Don't discard object cache with uninitialized timestamp
...
This can happen during terrain loading
2019-02-28 03:01:32 +03:00
bzzt
b2000b7642
Fix quad tree node child bounding box dimensions
2019-02-28 02:51:46 +03:00
bzzt
172cb74763
Delete composite map layers on demand
2019-02-28 02:47:00 +03:00
bzzt
4f387fdf1c
Prune empty quad tree nodes
2019-02-28 02:47:00 +03:00
bzzt
aecbc2f01c
Fix crash when incremental compile operation is not used
2019-02-28 02:46:59 +03:00
Grigory
af7b6a09a8
Simplify Misc::StringUtils::toLower
2019-02-28 00:24:43 +03:00
bzzt
8c649f05e6
Don't reallocate light list vector unnecessarily
2019-02-27 00:12:14 +03:00
bzzt
a567111400
Use emplace instead of find-assign
2019-02-27 00:10:34 +03:00
bzzt
5bce3cbc68
Don't use MWRender namespace in common terrain components
2019-02-27 00:04:01 +03:00
Capostrophic
9bc360267b
Ignore stray explicit references for names in expressions
2019-02-26 17:47:18 +03:00
Capostrophic
cc855e065a
Ignore stray references for variables in Set instruction
2019-02-26 16:58:16 +03:00
elsid
33f6fb258d
Option to set specific random seed for random number generator
2019-02-26 09:36:34 +03:00
Bret Curtis
3316938dfc
Merge pull request #2182 from Capostrophic/format
...
Replace Boost format and replace_all where possible
2019-02-24 20:17:31 +01:00
Bret Curtis
56d5fc788c
Merge pull request #2163 from Capostrophic/hello
...
AI data handling minor revisions
2019-02-24 20:14:08 +01:00
Capostrophic
e70cc10305
Some more de-boosting
2019-02-24 03:20:20 +03:00
Capostrophic
8ecd0b82a4
Replace Boost format and replace_all where possible
2019-02-24 03:20:20 +03:00
Bret Curtis
d4564a9be7
Merge pull request #2180 from akortunov/includes
...
Remove redundant includes
2019-02-24 01:14:16 +01:00
Bret Curtis
8cf2523a8d
Merge pull request #2176 from akortunov/rollcontroller
...
Add support for NiRollController
2019-02-23 23:55:27 +01:00
Bret Curtis
44920352ce
Merge pull request #2181 from Capostrophic/boost
...
Get rid of Boost.Array
2019-02-23 23:54:30 +01:00
Capostrophic
594ea39f5d
Revise AI data handling
...
Make Hello 16-bit unsigned as it's intended to be
Get rid of redundant mHasAI boolean
Always save AI data subrecord
Adjust creature and NPC default rating values to Morrowind defaults
2019-02-23 21:00:47 +03:00
Bret Curtis
4a69d96483
Merge branch 'esm_name_template_fix' into 'master'
...
Make sure that proper operator function of ESM:FIXED_STRING is used for char[N] argument
See merge request OpenMW/openmw!63
2019-02-23 13:39:15 +00:00
Adam Fandrejewski
75c204cdd8
Fix #4835 - undefined behavior - uninitialized mCtx
2019-02-23 13:35:25 +00:00
Andrei Kortunov
3032b177a1
Remove redundant includes
2019-02-23 08:02:12 +04:00
Capostrophic
58788de7c4
Get rid of Boost.Array
2019-02-22 23:16:34 +03:00
Bret Curtis
212f097b3c
Merge pull request #2172 from akortunov/pvs_fix
...
Fix some issues, found by PVS-Studio
2019-02-22 15:01:37 +01:00
elsid
73734fc04d
Fix update navmesh for not changed objects
...
When update method is called for not changed object befor this change
all object tiles were considered as not object tiles and were removed.
Also this marked those tiles as changed. This lead to alternation
between remove and add each tile update method was called. Problem was
detected by using Animated Containers mod.
2019-02-22 11:48:31 +03:00
Andrei Kortunov
60f112d11c
Add support for NiRollController (feature #4675 )
2019-02-21 12:34:35 +04:00
Chris Djali
cb5a57e41b
Merge pull request #1547 from AnyOldName3/osgshadow-test-vdsm
...
Shadows
2019-02-20 15:35:49 +00:00
AnyOldName3
0c8ad0a3bb
Double buffer debug HUD frustum geometries to prevent race conditions.
2019-02-19 18:13:03 +00:00
Bret Curtis
7a9ff9f7b3
Merge pull request #2161 from akortunov/switchnode
...
Do not create a redundant parent node for LOD and Switch nodes
2019-02-18 19:46:25 +01:00
Bret Curtis
09262e0336
Merge pull request #2170 from elsid/disable_navigator_option
...
Add option to disable DetourNavigator component (feature #4833 )
2019-02-18 16:01:30 +01:00
Andrei Kortunov
18a59df050
Throw exceptions by value instead of reference
2019-02-17 10:24:25 +04:00
elsid
da6df818ff
Fix update navmesh
...
Every updated object should produce a set of changed tiles where it is
placed. Before this change only current object tiles were updated. If
object was moved to another set of tiles then navmesh were not changed
in new tiles.
TileCachedRecastMeshManager::updateObject should add all new tiles if object
was moved and remove all no more used tiles. Both new and old tiles should be
marked as changed.
Also add tests to show desired result for add, update, remove.
2019-02-17 01:50:53 +03:00
elsid
9626b6ec42
Add option to disable DetourNavigator component to find paths
2019-02-16 15:50:58 +03:00
elsid
34c594f01e
Add default initializators for settings fields
2019-02-16 15:39:06 +03:00
elsid
16675fd254
Return empty path when navmesh is not found for agent
2019-02-16 15:37:06 +03:00
elsid
1d3668cd22
Add Navigator interface
2019-02-16 15:37:06 +03:00
elsid
d63881e054
Make Navigator::findPath independent from class fields
2019-02-16 15:14:05 +03:00
elsid
a0ed981a7c
Fix operator ++ for OutputTransformIterator
2019-02-16 15:09:57 +03:00
elsid
c68e64a2a7
Make navigator from settings manager setting in separate function
2019-02-16 14:41:11 +03:00
Andrei Kortunov
058e289162
Do not create a redundant parent node for LOD and Switch nodes (bug #4837 )
2019-02-09 12:02:09 +04:00
Andrei Kortunov
573b3f4f1d
Init target for AI packages from old saves
2019-02-05 08:03:31 +04:00
Bret Curtis
f4313c02e1
Merge pull request #2153 from akortunov/glowing_windows
...
Native glowing windows support
2019-02-04 14:50:13 +01:00
Andrei Kortunov
60c9806d62
Share RigGeometry node data
2019-02-03 13:09:49 +04:00
Azdul
7940317e42
Make sure that proper operator function is used for char[N] argument
2019-02-03 09:32:32 +01:00
Andrei Kortunov
9e4a339ad3
Daytime node switch support (feature #4836 )
2019-02-02 10:50:15 +04:00
AnyOldName3
15547750ba
Correct behaviour of use front face culling setting to not use back face culling either when disabled.
2019-02-01 00:29:13 +00:00
AnyOldName3
cfe921fb82
Remove uneeded includes.
2019-01-31 20:12:42 +00:00
AnyOldName3
2761a38562
Prettify shadow define map setup.
2019-01-31 20:12:17 +00:00
AnyOldName3
57e10e26b2
Make variable name less confusing
2019-01-31 14:58:57 +00:00
AnyOldName3
a24b8ec3d2
Fix enable/disable mixup.
2019-01-31 14:57:56 +00:00
AnyOldName3
556c9a3382
Add normal-offset shadow mapping to remove shadow acne (flicker)
2019-01-30 22:28:00 +00:00
Bret Curtis
e748abde7d
Merge pull request #2147 from akortunov/uvcontroller
...
Apply UVControllers only for given UV Set
2019-01-28 10:20:43 +01:00
Andrei Kortunov
03b71d3c30
Improve switchable nodes handling by optimizer
2019-01-27 15:19:48 +04:00
Andrei Kortunov
87598f9419
Fill Switch and LOD nodes names
2019-01-27 15:18:57 +04:00
Andrei Kortunov
b2126c2b6b
Apply UVControllers only for given UV Set (bug #4827 )
2019-01-26 14:53:33 +04:00
AnyOldName3
8482236a82
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2019-01-24 23:09:23 +00:00
AnyOldName3
d82c85913a
Don't bother multiplying a matrix by its inverse and applying that to the light direction.
...
Hopefully this will improve numerical stability and reduce shadow flicker a little.
2019-01-24 23:07:38 +00:00
AnyOldName3
4438ab4493
Use CullVisitor traversal mask for light manager.
2019-01-24 22:42:23 +00:00
Bret Curtis
8ddb45eb22
Merge pull request #2141 from akortunov/switchnode
...
Support NiSwitchNode
2019-01-23 21:32:21 +01:00
Andrei Kortunov
2c38e337ae
Support NiSwitchNode (feature #4812 )
2019-01-23 21:01:54 +04:00
Capostrophic
c9df63ffd1
Replace BSAOpt hash calculation with a custom function
2019-01-22 02:22:57 +03:00
Capostrophic
be5faadff8
Fix compressed BSA loading on non-Windows systems
2019-01-21 01:23:02 +03:00
Bret Curtis
e1d7a8415d
Merge branch 'bugfix/file-list-emptying-error' into 'master'
...
Fix error when create new OpenCS addon
Closes #4757
See merge request OpenMW/openmw!50
2019-01-20 19:59:05 +00:00
Bret Curtis
9cfc97a37a
Merge branch 'tes4_bsa' into 'master'
...
Read BSA files in TES4 / TES5 formats
See merge request OpenMW/openmw!56
2019-01-20 19:03:57 +00:00
Bret Curtis
6fd4d016eb
Merge pull request #2132 from akortunov/particlefix
...
Fix an exception when try to load a particle node with empty sizes array
2019-01-20 19:52:29 +01:00
Azdul
7880e6f761
CompressedBSAFile::FileRecord::isCompressed implementation simplified.
...
Double space in CompressedBSAFile::FileRecord::getSizeWithoutCompressionFlag removed.
2019-01-19 14:41:17 +01:00
Azdul
6aa6b2dc89
Removed TES4 from file names. Correct Git file history / attribution.
2019-01-18 21:14:44 +01:00
Azdul
a3bcd95546
Merge branch 'cc9cii' of https://github.com/cc9cii/openmw into tes4_bsa
2019-01-18 09:11:41 +01:00
Azdul
42ea609d1d
Remove files with incorrect Git history / attribution
2019-01-18 09:03:34 +01:00
Frederic Chardon
a78d98df27
Fix crashcatcher
2019-01-17 10:38:34 +00:00
Adam.Fandrejewski
777a50cb64
Replaced C++ 14 make_unique with C++ 11 compliant code
2019-01-17 09:56:11 +01:00
Azdul
0c3a3ea241
Strange issue with Linux compilation (<memory> header)
2019-01-17 09:11:19 +01:00
Azdul
4c499983ca
Fixed warnings reported by GCC
2019-01-17 08:58:25 +01:00
Azdul
d55cc4d3ea
Linux requires <memory> header
2019-01-17 08:52:30 +01:00
Azdul
caa0487c6a
Replace raw pointer in BsaArchive with unique_ptr
2019-01-17 08:42:43 +01:00
Azdul
e502819246
Proper conversion from shared_ptr<bsa::MemoryinputStream> to shared_ptr<std::istream>
2019-01-17 08:08:03 +01:00
Azdul
b9a7514278
Memory leak fixed. Proper file names in headers.
2019-01-17 07:08:25 +01:00
Azdul
c6fd979c42
Spaces instead of tabs in CMakeLists.txt
2019-01-17 05:42:26 +01:00
Azdul
96d19e07ca
Fix Linux build
2019-01-16 20:59:07 +01:00
Azdul
25650e65bf
Read any BSA file - detection based on version in BSA header
2019-01-16 20:19:15 +01:00
Andrei Kortunov
39c4a7833c
Fix out of range exception when try to load a particle node with empty sizes array (bug #4804 )
2019-01-16 22:00:50 +04:00
Capostrophic
166d757a19
Allow stray special characters before a begin statement
2019-01-16 01:12:16 +03:00
Bret Curtis
8834ee95be
Merge pull request #2120 from Capostrophic/macros
...
Get rid of some remaining instances of C numeric limits
2019-01-10 18:59:34 +01:00
Bret Curtis
590b393c8e
Merge pull request #2123 from akortunov/skinning
...
Optimize skinning, part 2
2019-01-10 18:56:52 +01:00
Bret Curtis
4617dea154
Merge pull request #2119 from akortunov/stringstream
...
Get rid of unnecessary string streams
2019-01-10 11:42:27 +01:00
Andrei Kortunov
8e6fd348d1
RigGeometry optimization: optimize geometry optimization
2019-01-09 21:01:33 +04:00
Capostrophic
a71cfca580
Get rid of some remaining instances of C limit macros
2019-01-09 16:06:18 +03:00
Andrei Kortunov
254f01b89d
RigGeometry optimization: vector iteration is more cheap than map iteration
2019-01-09 11:52:11 +04:00
Andrei Kortunov
71227ffc04
Handle possible invalid iterator issue during settings parsing
2019-01-08 12:37:46 +04:00
Andrei Kortunov
0937f02598
Get rid of unnecessary string streams
2019-01-07 21:08:16 +04:00
Bret Curtis
65a6b10995
Merge pull request #2066 from akortunov/guifixes
...
Do not read font size just for every single widget
2019-01-07 17:17:57 +01:00
Capostrophic
d1e0a10136
Make sure AI data is initialized when loading actor records
2019-01-06 21:03:19 +03:00
Capostrophic
ee2560edc3
Fix constant raining
2018-12-31 14:47:00 +03:00
Capostrophic
e412e1b41c
Revert to lexical_cast<float>, catch out-of-range exceptions
2018-12-29 20:20:27 +03:00
Capostrophic
467724d5e8
Improve fallback numerical value handling (bug #4768 )
2018-12-28 23:49:06 +03:00
Bret Curtis
91b962c095
Merge pull request #2099 from xyzz/replace-volatile-atomic
...
Replace volatile bools with std::atomic<bool>
2018-12-28 16:41:07 +01:00
Capostrophic
7155e787b4
Clean up fallback record creation
2018-12-28 01:22:24 +03:00
Ilya Zhuravlev
07e9ce84b3
Replace volatile bools with std::atomic<bool>
2018-12-24 14:19:35 -05:00
AnyOldName3
199e6ed82d
Revert "Use forward declaration to reduce build times."
...
This reverts commit 305b9826df
2018-12-19 23:53:14 +00:00
AnyOldName3
305b9826df
Use forward declaration to reduce build times.
2018-12-19 16:23:32 +00:00
Alexander Kolodeev
7c3ef213ce
Fix error when create new OpenCS addon
2018-12-19 18:47:02 +03:00
AnyOldName3
7b108ae9a2
Disable depth sorting for translucent objects in the shadow maps
2018-12-19 01:45:05 +00:00
AnyOldName3
e2515f6db7
Merge branch 'master' into osgshadow-test-vdsm
2018-12-18 19:51:27 +00:00
AnyOldName3
53188f61fc
Fix animation bug with VAOs
2018-12-18 19:44:30 +00:00
Bret Curtis
fc19c842cf
Revert "fix a rig bug visible with OSG_VERTEX_BUFFER_HINT=VAO"
2018-12-13 20:09:46 +01:00
Bret Curtis
97aa6f58e3
Merge pull request #2064 from sthalik/pr/win32-debug-parent-console
...
enable win32 debug console when launching from console
2018-12-12 21:15:07 +01:00
Stanislaw Halik
c5c160870d
fix accidental header namespace inclusion
2018-12-12 00:48:27 +01:00
Stanislaw Halik
f6c8842457
move to debugging.[ch]pp
2018-12-12 00:41:53 +01:00
Stanislaw Halik
74955555b9
remove verbose comments and example
2018-12-12 00:02:09 +01:00
AnyOldName3
b6b1b39804
Make the terrain paging system use the view point rather than the eye point to determine which nodes to use so that it can be inherited by RTT cameras.
2018-12-10 21:20:29 +00:00
elsid
da431135fa
Use pointer to check is NavMeshTilesCache::Value initialized
2018-12-10 23:51:15 +03:00
elsid
aab7f2e8b9
Don't check for equality in move assignment
...
Assume it is undefined behavior to move-assing value to itself.
2018-12-10 23:45:31 +03:00
AnyOldName3
2d5da1a6fa
Don't exclusively rely on a shadow map if its bounds have been expanded since the cull traversal.
2018-12-08 20:39:41 +00:00
Stanislaw Halik
56d79bd4e0
fix typo
2018-12-08 20:58:10 +01:00
Andrei Kortunov
e073e0d8c9
Do not read font size just for every single widget
2018-12-08 21:18:42 +04:00
Stanislaw Halik
44e60b708b
fix missing _WIN32 guard
2018-12-08 03:13:18 +01:00
Stanislaw Halik
64e960aa22
enable win32 debug console when launching from console
2018-12-08 01:29:14 +01:00
AnyOldName3
244bd289cb
Change default colour mode (as apparently it actually gets used sometimes)
2018-12-03 18:56:37 +00:00
mp3butcher
7a85e10d2f
fix a rig bug visible with OSG_VERTEX_BUFFER_HINT=VAO
2018-12-02 23:36:27 +01:00
AnyOldName3
0a409c0ab8
Make shadow map front-face culling configurable
2018-12-01 00:26:43 +00:00
AnyOldName3
dd207d9e54
Make the shadow polygon offset parameters configurable
2018-11-30 00:55:54 +00:00
AnyOldName3
642002b302
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-11-29 01:19:01 +00:00
AnyOldName3
aa11832949
Resolve bugs with depth-clamped shadow maps
2018-11-29 01:17:58 +00:00
AnyOldName3
7ad4882f0c
Fix debug hud frustum outline disappearence
2018-11-21 23:45:47 +00:00
AnyOldName3
061fa57335
Switch to better-performing data types for debug hud geometry
2018-11-21 22:38:50 +00:00
AnyOldName3
632b0d8979
Make shadow maps use their whole depth range for the overlap with the view frustum and rely on depth clamping to ensure objects outside the frustum still cast shadows.
2018-11-20 23:02:28 +00:00
AnyOldName3
660e423e99
Correct debug hud frustum colour
2018-11-20 23:01:04 +00:00
Bret Curtis
419e7ea5a2
Merge pull request #2035 from akortunov/coverity
...
Fix many Coverity Scan warnings
2018-11-14 09:44:30 +01:00
Andrei Kortunov
4ee15ddcb9
Fix many Coverity Scan warnings
2018-11-14 11:21:49 +04:00
Andrei Kortunov
d2613e35a2
Fix some Clang 7 warnings
2018-11-09 19:42:59 +04:00
Bret Curtis
228f6b572f
Merge branch 'master' into prisonmarker
2018-11-08 21:11:24 +01:00
Bret Curtis
f6243fae83
Merge pull request #1615 from akortunov/holstered_weapons
...
Weapon sheathing
2018-11-08 20:44:20 +01:00
Bret Curtis
9ae077c033
use c++11 std::align from <memory> ( #2026 )
...
* use c++11 std::align from <memory>
* for Ubuntu, use gcc5 instead of 4.8
* use travis to set gcc to 5
eval
and sudo
* use eval in .travis.yml
* use gcc-8
* replace precise with trusty llvm toolchain, because we have been using trusty for awhile now
* push things to matrix, so we can support multiple releases if we want
* we should not be allowing for failures, we are ready to start trusting clang and its analyzer
* scan-build was pushed to another package
* use gcc-8 still but wrap in scan-build
* travis.yml cleanup, have output of scripts go to stdout, make search for substring a regex
use double []
fix missing ,
use bash to use regex
black spaces matter
* set human readable names for our various builds, split out our static analysis between openmw and openmw-cs
* test if not set, then set otherwise ignore
* use quotes
* do not eval it, set it in travis env
* no more &&
* what does clang7 have to say?
* use sourceline for now
* use clang-7 instead of clang-7.0
* yes, llvm-toolchain-trusty-7 not llvm-toolchain-trusty-7.0
* for static analysis, openmw is compiled and checked on its own while openmw-cs is build with all the rest. this might change in the future.
and actually do it the other way around
2018-11-08 17:38:09 +01:00
Andrei Kortunov
ad36834671
Fix some compiler warnings
2018-11-08 13:16:04 +04:00
Capostrophic
4efe1bc892
Add prison marker record fallback definition (bug #4701 )
2018-11-05 19:37:46 +03:00
Andrei Kortunov
92e45507d8
Weapon sheathing support, including quivers and scabbards (feature #4673 )
2018-11-05 11:18:20 +04:00
Bret Curtis
a8d944e756
Merge pull request #2023 from elsid/navmesh_cache_limit
...
Navmesh cache limit
2018-11-05 07:51:48 +01:00
elsid
6e78fbb538
Double key size for item cache size
2018-11-05 02:21:19 +03:00
elsid
696bb9adc8
Add missing decrease for free navmesh data size
2018-11-05 02:21:18 +03:00
elsid
d2c2bdadb5
Add align implementation
2018-11-04 21:56:15 +03:00
elsid
b477775e16
Use callback to iterate over chunks
2018-11-04 18:34:31 +03:00
elsid
db5638bf6d
Add global recast allocator to allocate temp buffers on stack
2018-11-04 18:11:15 +03:00
Andrei Kortunov
a387c6b910
Fix MSVC2015 C4503 warning
2018-11-04 11:11:55 +04:00
Bret Curtis
261bbded00
Merge pull request #2016 from elsid/navmesh_update_change_type
...
Use new change type for update object
2018-11-03 17:30:05 +01:00
elsid
41319eb2bf
Use new change type for update object
...
To perform jobs for updated animated objects and doors with lowest
priority.
2018-11-03 16:44:23 +03:00
elsid
b77684a135
Add TODOs
2018-11-03 16:15:32 +03:00
elsid
2ba026e2b2
Limit navmesh cache size by data size + key size
2018-11-03 16:14:07 +03:00
Andrei Kortunov
829faf7b2c
Improve toggleactorspaths console command
2018-11-03 10:42:14 +04:00
AnyOldName3
b178e1868a
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-11-03 00:27:40 +00:00
AnyOldName3
3c25e7b93d
Merge pull request #2010 from AnyOldName3/windows-debug-build-fix
...
Include missing Windows header before calling Windows-specific functions and switch CMake compile definitions to the new style.
2018-11-02 23:57:44 +00:00
elsid
264ea99af6
Use explicit default ctors call
...
Special change for MSVC2015.
2018-11-02 10:35:57 +03:00
AnyOldName3
a6d3210a9c
Include missing Windows header before calling Windows-specific functions
2018-11-02 01:05:39 +00:00
AnyOldName3
d0c254bc7e
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-11-01 16:48:21 +00:00
elsid
792a0585c0
Add recastnavigation as subdirectory
2018-11-01 17:01:22 +01:00
AnyOldName3
0208cb8616
Merge pull request #2001 from AnyOldName3/enable-osg-logging
...
Allow OSG objects to be sent to the debug log.
2018-10-31 22:14:36 +00:00
AnyOldName3
4489f23005
Remove recastnavigation conflicts
2018-10-31 15:15:01 +00:00
Andrei Kortunov
a615076c61
Add default return value
2018-10-31 10:18:29 +04:00
AnyOldName3
3785ba6aa0
Merge upstream/master
2018-10-30 22:38:09 +00:00
AnyOldName3
90986df81c
Allow OSG objects to be sent to the debug log.
2018-10-30 22:15:32 +00:00
Bret Curtis
d6c674660a
Merge pull request #1633 from elsid/pathfinder_detour
...
Use recastnavigation for pathfinding (#2229 )
2018-10-30 20:44:13 +01:00
AnyOldName3
1ca7ea23d1
Add extra uniforms to the disabled shadows StateSet so that the shadow texture samplers are bound ot the dummy shadow maps correctly.
2018-10-30 17:07:11 +00:00
Bret Curtis
3c53fe16e9
Merge pull request #1986 from akortunov/rootfix
...
[Regression] Handle RootCollisionNode exactly as in original engine
2018-10-29 22:47:04 +01:00
elsid
49d81241db
Merge branch 'master' into pathfinder_detour
2018-10-28 17:08:09 +03:00
elsid
50b6ae3e10
Fix calculation for shape local AABB
2018-10-28 16:58:22 +03:00
elsid
af2f4e8424
Allow to use zero cache size
2018-10-28 16:54:06 +03:00
elsid
abc51a8a17
Add settings option to set max number of polygons per navmesh tile
2018-10-28 15:36:47 +03:00
Andrei Kortunov
6e05853478
Center progress bar when there are active messageboxes (bug #4691 )
2018-10-28 14:40:48 +04:00
Andrei Kortunov
61da6b6ecf
Print warning if the RootCollisionNode is attached to non-root node (bug #4311 )
2018-10-26 17:11:08 +04:00
Andrei Kortunov
6d91fe69b2
Revert "Handle RootCollisionNode, attached to non-root node (bug #4311 )"
...
This reverts commit ec9a1b0d05
2018-10-26 12:51:04 +04:00
Marc Zinnschlag
4d88d6dd58
Merged pull request #1980
2018-10-25 11:06:22 +02:00
AnyOldName3
1e2bf9c447
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-10-24 20:13:13 +01:00
Andrei Kortunov
61e6e359c4
Allow creatures to use the autogenerated collision box (feature #2787 )
2018-10-22 15:48:23 +04:00
Andrei Kortunov
41e90bd56c
Unify random generator usage
2018-10-19 16:16:18 +04:00
AnyOldName3
b0907f8929
Add todos in case they're left until after the shadow PR is merged
2018-10-18 16:01:36 +01:00
AnyOldName3
a41ce42208
Move setting of colorMode to ShaderRequirements in case they're reused
2018-10-18 16:00:51 +01:00
AnyOldName3
474770eca8
Switch shadow map rendering to a specialised, simplified shader.
2018-10-16 21:23:31 +01:00
AnyOldName3
ce15369bbd
Convert colorMode shader define to a uniform
2018-10-15 23:12:15 +01:00
elsid
03d4ce5e49
Log find path exception with level verbose, add more info to message
2018-10-15 23:25:42 +03:00
elsid
dc2eb2e16b
Do not write to global log async navmesh updater exceptions
2018-10-15 22:47:07 +03:00
Bret Curtis
53ccce1867
Merge pull request #1966 from akortunov/logfix
...
Allow apps without logging system to display log messages
2018-10-14 11:20:36 +02:00
Andrei Kortunov
b5df385111
Allow apps without logging system to display log messages
2018-10-14 12:07:15 +04:00
elsid
e57504ae7c
Lower log level
2018-10-13 22:22:15 +03:00
elsid
0f6a64ad54
Split makeNavMeshTileData
2018-10-13 22:22:15 +03:00
elsid
fb655cb04f
Remove macroses to check recastnavigation functions result
2018-10-13 22:22:15 +03:00
elsid
ed73d130f9
Cache navmesh tiles
...
Use LRU modification to hold currently used items. Use RecastMesh binary
data for item key.
Store original pointer of btCollisionShape in user pointer to make available
it as an identifier within all duplicates. Use pointer to heights data array
for btHeightfieldTerrainShape.
2018-10-13 22:22:12 +03:00
elsid
69b5834c64
Add doc for Navigator
2018-10-13 22:16:35 +03:00
elsid
ae7285e960
Use ScopeGuarded instead of raw mutex
2018-10-13 22:16:35 +03:00
elsid
cf4066751c
Add classes to encapsulate value guarded by mutex
2018-10-13 22:16:35 +03:00
elsid
1a27489904
Add special type for object id
2018-10-13 22:16:35 +03:00
elsid
7c80bb9411
Support multiple threads for async nav mesh updater
2018-10-13 22:16:34 +03:00
elsid
ff478aba6d
Use actor half extent for interior cells
2018-10-13 22:16:33 +03:00
elsid
346e9e3141
Add off mesh connections for doors without teleport
2018-10-13 22:16:33 +03:00
elsid
d02beae5a8
Find path for actors according to their abilities to swim and walk
2018-10-13 22:16:33 +03:00
elsid
dc09674362
Add command and settings option to enable actors paths render
2018-10-13 22:16:32 +03:00
elsid
c95cea414c
Support water for NavMesh
2018-10-13 22:16:32 +03:00
elsid
72f211ef28
Add enums for area type and flags
2018-10-13 22:16:32 +03:00
elsid
fa23b590a4
Add unwalkable areas to NavMesh
2018-10-13 22:16:32 +03:00
elsid
c771986c56
Prioritise NavMesh jobs first to remove and last to add
...
When player move fast enough, tiles update for specific area square
couldn't catch player move. Tiles to be removed are left in the queue
with lower priority then tiles to be added which are nearest to player.
This can lead to overflow for amount of tiles. So we try to do remove
first. But we detect change type approximately using mixed change type,
because even if we do it precise, change type could change while job
is in queue.
2018-10-13 22:16:31 +03:00
elsid
b33a291a67
Log thread id
2018-10-13 22:16:31 +03:00
elsid
f6a60790f8
Create collision shape for all avoided nodes
2018-10-13 22:16:31 +03:00
elsid
e24d4d7052
Explicitly use RC_NULL_AREA constant to mark unwalkable areas
2018-10-13 22:16:31 +03:00
elsid
330e596c64
Remove useless parameter
2018-10-13 22:16:31 +03:00
elsid
c3298d13a6
Add log sinks (stdout and file)
2018-10-13 22:16:31 +03:00
elsid
84949bedb1
Remove and add tile in single critical section
2018-10-13 22:16:30 +03:00
elsid
144e1a063b
Support animated objects
2018-10-13 22:16:30 +03:00
elsid
4aba0fa85f
Limit number of NavMesh tiles to add by distance from player tile
2018-10-13 22:16:30 +03:00
elsid
d2fd9abd51
Split RecastMesh into tiles
2018-10-13 22:16:30 +03:00
elsid
dbb1d99bff
Add NavMeshItem generation to fix update NavMesh for render
2018-10-13 22:16:30 +03:00
elsid
f268ec5d34
Measure total time for NavMesh build from first pop
2018-10-13 22:16:29 +03:00
elsid
c26773bd29
Log update NavMesh status
2018-10-13 22:16:29 +03:00
elsid
937e8e1803
Allow to create empty RecastMesh
2018-10-13 22:16:29 +03:00
elsid
dd5f4498f6
Increment NavMesh revision on remove or add tile
2018-10-13 22:16:29 +03:00
elsid
ed3a255f65
Do not use NavMesh to find changed tiles
2018-10-13 22:16:28 +03:00
elsid
d1e71f9322
Support btBoxShape for RecastMesh
2018-10-13 22:16:28 +03:00
elsid
70a369f70e
Add command to enable NavMesh render
...
togglenavmesh or tnm
2018-10-13 22:16:28 +03:00
elsid
1caa18bb4f
Use one recast mesh for all jobs
2018-10-13 22:16:27 +03:00
elsid
794cfc4aa3
Write detournavigator log to file
2018-10-13 22:16:27 +03:00
elsid
dd5e6a61a3
Support btCompoundShape for RecastMesh
2018-10-13 22:16:27 +03:00
elsid
373adc6ec4
Option to enable/disable file names revisions
2018-10-13 22:16:27 +03:00
elsid
f8909218ee
Store recast mesh bounds
2018-10-13 22:16:27 +03:00
elsid
d1d034a1ec
Update NavMesh one by one tile in order from nearest to player
2018-10-13 22:16:26 +03:00
elsid
41caca24ee
Options to enable/disable write recast mesh and nav mesh into file
2018-10-13 22:16:26 +03:00
elsid
6d233ae868
Option in settings to enable/disable detour navigator debug log
2018-10-13 22:16:26 +03:00
elsid
430ba9d7a5
Build NavMesh tile data only for changed tiles
2018-10-13 22:16:25 +03:00
elsid
fafba8ea0c
Use recastnavigation to find path
2018-10-13 22:16:25 +03:00
elsid
4f2bfa1e9d
Add operators for osg types
2018-10-13 22:16:25 +03:00
elsid
c01be7b07f
Add operators for bullet types
2018-10-13 22:16:25 +03:00
jvoisin
ca8744af56
Fix crash in the ESM reader, when SCVR has no variable names
...
Fixes bug [#4678 ](https://gitlab.com/OpenMW/openmw/issues/4678 )
The `loadSCVR` method assumes that the list of variable
names won't be empty, which it might.
Instead of crashing, we show a warning and ignore the record.
2018-10-12 11:28:14 +02:00
Andrei Kortunov
f9271fd7f0
Fix crash in the ESM reader, when list is empty (bug #4677 )
2018-10-12 10:38:32 +04:00
AnyOldName3
0124be5713
Merge upstream/master
2018-10-10 21:23:19 +01:00
Andrei Kortunov
e06f0b797a
Replace all NULLs to nullptr
2018-10-09 10:21:12 +04:00
cc9cii
6ec6b9bc2a
OpenMW Integration.
...
Read the ESM/ESP records but do nothing with them for the moment.
2018-10-07 08:55:30 +11:00
cc9cii
15d5cdf3cf
Allow TES4 ESM/ESP to co-exist with TES3 ESM/ESP.
...
This change aims to allow TES4/TE5 content to OpenMW. i.e. a standalone TES4 would be implemented quite differently. That said, the key changes are:
* Use pointers rather than references for ESM readers so that they can be switched to another variant on the fly.
* Content file dependencies to be checked within each group (only 3 groups for now, TES3/TES4/TES5)
2018-10-06 20:38:53 +10:00
cc9cii
3982573035
BSA enhancements.
...
* Implement hash based lookup for TES3 BSA files.
* Added TES4/TES5 BSA support.
* Implemented a hack (non-portable code) in an attempt to reduce startup time under Windows because Boost::filesystem seems to take forever on GetFileAttributeW. This implementation uses FindFirstFile/FindNextFile/FindClose instead.
2018-10-06 13:35:51 +10:00
cc9cii
4cd4cf8479
Resolved conflicts and build fixes.
2018-10-05 21:54:29 +10:00
scrawl
f456174af8
Rename to lowerCaseInPlace
...
(cherry picked from commit 07b064f616
2018-10-05 19:16:46 +10:00
scrawl
b4cdb965dc
Move rng to components
...
(cherry picked from commit 8c810e3620
2018-10-05 18:53:47 +10:00
dteviot
4b0aeb4066
consolidate random number logic
...
Note, I suspect Rng::rollClosedProbability() is not needed. The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
(cherry picked from commit 3f28634d1f
2018-10-05 18:45:57 +10:00
Andrei Kortunov
87394f2ebb
Revert "Take in account transformations of NiTriShape and NiSkinData in skinning (bug #4437 )"
...
This reverts commit 09427d3f5e
2018-09-29 16:21:40 +04:00
Marc Zinnschlag
38758a9555
Merged pull request #1944
2018-09-29 11:16:14 +02:00
Capostrophic
f20f49daa6
Content selector: allow to copy paths to clipboard (feature #2847 )
2018-09-29 02:09:13 +03:00
Andrei Kortunov
43c7438e8e
Move WeakCache to components/misc
2018-09-28 16:47:47 +04:00
Kyle Cooley
7eb1b14b21
Periodically prune empty elements in weak cache
2018-09-27 13:14:59 +04:00
Kyle Cooley
031502b2ab
Reorganize ActorAdapter data, use weak cache for sharing
2018-09-27 13:14:59 +04:00
Kyle Cooley
6bece13a32
Use new Log class for error message
2018-09-27 13:14:59 +04:00
Kyle Cooley
e2ac392a40
Move common stuff to scene util, fix errors with 1st person meshes
2018-09-27 13:14:59 +04:00
Kyle Cooley
8444ee9981
Start rendering npc's
2018-09-27 13:14:59 +04:00
Marc Zinnschlag
43880ca47b
Merged pull request #1919
2018-09-27 11:06:00 +02:00
Andrei Kortunov
0176ee389e
Handle length of UTF-8 strings properly in plugin metadata (bug #4653 )
2018-09-25 21:40:26 +04:00
Andrei Kortunov
bce8de5fe9
Respect selected encoding in the content selector (bug #4467 )
2018-09-25 21:39:18 +04:00
Capostrophic
92259c6cca
Discard count arguments for AddSoulGem and RemoveSpell (bug #3762 )
2018-09-23 22:30:06 +03:00
Marc Zinnschlag
7be9f2ca45
Merged pull request #1891
2018-09-21 11:38:19 +02:00
Andrei Kortunov
01b3f92f7e
Make coc and fixme console commands close to vanilla (bug #4292 , bug #4217 )
2018-09-20 16:25:02 +04:00
Andrei Kortunov
276b7830a9
Mass potion creation (feature #4642 )
2018-09-20 15:45:14 +04:00
Andrei Kortunov
70ed8fd1a9
Use constants instead of widely used magic numbers (task #4645 )
2018-09-17 19:22:50 +04:00
Marc Zinnschlag
06b2a23e74
Merged pull request #1768
2018-09-17 12:10:21 +02:00
Marc Zinnschlag
d76367918a
Merged pull request #1907
2018-09-17 12:10:00 +02:00
Marc Zinnschlag
107165d36d
Merged pull request #1923
2018-09-17 11:59:28 +02:00
Andrei Kortunov
2961f0d810
Allow to use the %Name for creatures (bug #4644 )
2018-09-16 21:53:28 +04:00
Capostrophic
95aa05e41b
Tweaks to script parser messages and pathgrid warnings
2018-09-16 16:47:33 +03:00
Andrei Kortunov
09427d3f5e
Take in account transformations of NiTriShape and NiSkinData in skinning (bug #4437 )
2018-09-16 14:38:58 +04:00
Capostrophic
363516049d
Actually fix General number formatting
2018-09-14 18:38:24 +03:00
Andrei Kortunov
7a986f38da
Support for user-defined TrueType fonts
2018-09-12 14:31:01 +04:00
Andrei Kortunov
c9c0230d2a
Scale journal fonts separately from common ones
2018-09-12 14:31:01 +04:00
Andrei Kortunov
adbaeb7cca
Improve GUI scaling (bug #3288 )
2018-09-12 14:31:01 +04:00
Marc Zinnschlag
6100e34051
Merged pull request #1912
2018-09-12 12:04:49 +02:00
Andrei Kortunov
f0919f51e9
Fix integer result formatting of scripting functions
2018-09-11 14:05:44 +04:00
Andrei Kortunov
c2c24a76a4
Handle MyGUI exceptions inside destructors
2018-09-11 11:11:27 +04:00
Andrei Kortunov
aca6625af4
Avoid possible memory leak by using the unique_ptr
2018-09-11 11:11:27 +04:00
Andrei Kortunov
a262e4b342
Print warning, if can not close or remove temporary file
2018-09-11 11:11:27 +04:00
Andrei Kortunov
d5bcc49079
Initialize missing struct fields
2018-09-11 11:11:24 +04:00
Andrei Kortunov
e5a81b1f99
Fix some issues, found by Coverity Scan
2018-09-10 16:35:27 +04:00
Andrei Kortunov
5693ceca74
Remove redundant declaration
2018-09-04 17:56:19 +04:00
Capostrophic
65ff346b61
Make NPC record reputation, disposition and faction rank have unsigned char type
2018-09-03 16:45:38 +03:00
Andrei Kortunov
7e2bda459b
Check if there are textures in FlipController to avoid division by zero (bug #4614 )
2018-09-02 17:36:37 +04:00
Marc Zinnschlag
78a84042ad
Merged pull request #1901
2018-09-01 11:08:24 +02:00
Capostrophic
7ef6fa9f61
Remove deprecated GMST get* functions
2018-08-29 18:38:12 +03:00
Andrei Kortunov
b0ac0b0b22
Do not initialize map every call
2018-08-29 16:47:12 +04:00
Marc Zinnschlag
24ce8cce72
Merged pull request #1898
2018-08-29 12:04:52 +02:00
Andrei Kortunov
0ddd0e4edc
Fix light flicker amplitude calculation
2018-08-28 14:57:11 +04:00
Andrei Kortunov
c677f7ca27
Rework pulsing light sources (bug #4615 )
2018-08-28 14:57:08 +04:00
Marc Zinnschlag
232ea4f793
Merged pull request #1887
2018-08-27 12:52:30 +02:00
Sophie Kirschner
c412f99963
Remove commented lines in UnrefWorkItem::doWork
2018-08-26 11:08:06 +03:00
Marc Zinnschlag
327f36b081
Merged pull request #1876
2018-08-26 09:15:38 +02:00
Andrei Kortunov
ff241fb787
Optimize skinning (task #4605 )
2018-08-25 20:45:59 +04:00
Sophie Kirschner
4dd9386c4f
Fix error: member access into incomplete type 'SceneUtil::UnrefWorkItem'
...
Fixes compile error encountered on OSX 10.9 with g++
sophie:build pineapple$ g++ --version
Configured with: --prefix=/Applications/Xcode.app/Contents/Developer/usr --with-gxx-include-dir=/usr/include/c++/4.2.1
Apple LLVM version 6.0 (clang-600.0.56) (based on LLVM 3.5svn)
Target: x86_64-apple-darwin13.4.0
Thread model: posix
The compilation error:
[ 24%] Building CXX object apps/openmw/CMakeFiles/openmw.dir/mwrender/renderingmanager.cpp.o
In file included from /Users/pineapple/git/openmw/apps/openmw/mwrender/renderingmanager.cpp:1:
In file included from /Users/pineapple/git/openmw/apps/openmw/mwrender/renderingmanager.hpp:4:
/Users/pineapple/git/openmw/openmw-deps/include/osg/ref_ptr:35:36: error: member access into incomplete type 'SceneUtil::UnrefWorkItem'
~ref_ptr() { if (_ptr) _ptr->unref(); _ptr = 0; }
^
/Users/pineapple/git/openmw/./components/sceneutil/unrefqueue.hpp:14:11: note: in instantiation of member function
'osg::ref_ptr<SceneUtil::UnrefWorkItem>::~ref_ptr' requested here
class UnrefQueue : public osg::Referenced
^
/Users/pineapple/git/openmw/./components/sceneutil/unrefqueue.hpp:10:11: note: forward declaration of 'SceneUtil::UnrefWorkItem'
class UnrefWorkItem;
2018-08-24 16:41:52 +03:00
Andrei Kortunov
a560a9e00d
Allow messageboxes arguments to have newline characters (bug #3836 )
2018-08-24 15:48:18 +04:00
AnyOldName3
db707a31ec
Add clipping planes when allow shadow map overlap is enabled
2018-08-23 13:14:02 +01:00
AnyOldName3
25e92481f4
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-08-21 14:00:58 +01:00
AnyOldName3
15e820825f
Fix another convex hull clipping issue and restore z-clipping
2018-08-21 14:00:29 +01:00
Capostrophic
a06c9c767d
Treat <> and << operators as < and >< and >> as > in scripts
...
(bug #4597 )
2018-08-19 18:40:33 +03:00
Marc Zinnschlag
dc9aedca7d
Merged merge request !33
2018-08-18 12:08:05 +02:00
AnyOldName3
3ce96997d1
Remove sneaky tabs.
2018-08-18 00:09:40 +01:00
AnyOldName3
80082308f0
Merge upstream (shadermanager log system revamp)
2018-08-17 18:22:13 +01:00
AnyOldName3
dd501f4132
Make ConvexHull::clip more resilient against large values.
2018-08-17 17:47:52 +01:00
AnyOldName3
987306feb9
Fix ConvexHull::extendTowardsNegativeZ
2018-08-16 23:48:19 +01:00
Bret Curtis
dcd381049c
Merge pull request #1872 from akortunov/extended_logging
...
Use new logging system
2018-08-16 11:38:29 +02:00
Andrei Kortunov
c7a5548475
Use new logging system for editor
2018-08-14 20:01:09 +04:00
Andrei Kortunov
1452684d9e
Use new logging system for components
2018-08-14 19:42:41 +04:00
Bret Curtis
c0e50b2c02
Merge pull request #1865 from elsid/material_race_condition
...
Fix race condition (bug #4584 )
2018-08-14 10:29:58 +02:00
Andrei Kortunov
9a5b016293
Move crashcatcher initialization to components
2018-08-14 11:17:05 +04:00
Andrei Kortunov
5e172ed831
Move cerr initialization out of 'try' block
2018-08-14 10:30:27 +04:00
James Carty
1c49698053
Implement 'g' flag
2018-08-13 20:31:11 +01:00
Bret Curtis
61b34124e2
Merge pull request #1847 from akortunov/extended_logging
...
Improve console logging
2018-08-13 10:19:25 +02:00
James Carty
579f35511a
Add support for scietific notation flag for MessageBox
2018-08-12 22:45:03 +01:00
Andrei Kortunov
7d6e3673e0
Implement advanced logging system (feature #4581 )
2018-08-12 13:38:15 +04:00
elsid
c2b8c7086a
Fix race condition
...
Values are accessed from main thread and cell preloader threads.
2018-08-12 01:06:58 +03:00
elsid
2de38142e2
Replace raw pointers by unique_ptr
2018-08-11 18:00:52 +03:00
elsid
f2a63bcf35
Add unit tests for BulletNifLoader
2018-08-11 18:00:52 +03:00
elsid
6afc1dc3a0
Support build with coverage for components and test suite
2018-08-11 17:24:40 +03:00
Marc Zinnschlag
b67b17010d
Merged pull request #1826
2018-08-10 12:21:49 +02:00
Andrei Kortunov
ec9a1b0d05
Handle RootCollisionNode, attached to non-root node (bug #4311 )
2018-08-10 11:11:40 +04:00
Bret Curtis
03bf599426
Merge pull request #1856 from Capostrophic/hidden
...
Revert untextured shapes rendering changes
2018-08-09 12:36:03 +02:00
Capostrophic
348c6f848e
Fix a bunch of MSVC warnings
2018-08-09 02:27:33 +03:00
AnyOldName3
3b3721897d
Make indoor shadows disableable.
2018-08-08 23:56:11 +01:00
AnyOldName3
a2b54714d4
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-08-08 23:28:06 +01:00
AnyOldName3
6286f5a1d4
Ensure RigGeometry child geometries have sensible bounds without actually computing them.
2018-08-08 23:24:57 +01:00
Capostrophic
85208eff7f
Revert untextured shapes rendering changes
2018-08-08 21:10:00 +03:00
Capostrophic
bda23c6ad6
Fix nodemask
2018-08-07 20:49:10 +03:00
Capostrophic
a1e3b2e586
Don't render NiTriShapes without NiTexturingProperty (bug #4483 )
2018-08-05 16:24:24 +03:00
Andrei Kortunov
1f4dd3b393
Make partial binary search case insensitive, as it supposed to be (bug #4558 )
2018-08-05 13:26:12 +04:00
Marc Zinnschlag
452a706047
Merged pull request #1837
2018-08-04 10:26:44 +02:00
Andrei Kortunov
e2519226aa
Move boost include
2018-08-03 17:04:07 +04:00
Andrei Kortunov
c2a175c2e0
Move crash catcher wrapper to separate file
2018-08-03 15:51:17 +04:00
Andrei Kortunov
ac98797999
Add missing file
2018-08-03 15:05:13 +04:00
Andrei Kortunov
c454f1bdad
Use log file for editor (feature #4012 )
2018-08-03 09:05:08 +04:00
AnyOldName3
8f4125134f
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-08-02 15:51:06 +01:00
Andrei Kortunov
369ea7e177
Check if a temporary file was successfully closed
2018-08-01 20:36:29 +04:00
Andrei Kortunov
12144de8ed
Initialize missing variables
2018-08-01 20:18:37 +04:00
AnyOldName3
cc23a968d1
Merge upstream/master
2018-08-01 14:13:45 +01:00
AnyOldName3
71778e2552
Disable convex hull clipping based on render leaf traverser results in the z direction.
2018-07-31 23:42:44 +01:00
AnyOldName3
02ab3b466a
Use simplified convex hull clipping maths from the other function doing hte same thing
2018-07-31 23:30:15 +01:00
Andrei Kortunov
469bb29621
Do not try to handle shape controllers as node controllers
2018-07-30 21:45:17 +04:00
Andrei Kortunov
7e0df01c83
Do not optimize animated shapes (bug #3950 )
2018-07-28 16:48:57 +04:00
Nikolay Kasyanov
21f198af7a
Fix debugger detection on macOS ( #4511 )
2018-07-15 12:36:01 +02:00
Bret Curtis
99e4d49e7c
Merge pull request #1787 from akortunov/profilierfont
...
Use the DejaVuLGCSansMono.ttf for profiler output
2018-07-11 16:00:34 +02:00
Andrei Kortunov
70b6d4983d
Use the DejaVuLGCSansMono.ttf in profilier output
2018-07-11 14:41:49 +04:00
elsid
3f21c49479
Put check for nif file name into separate function
2018-07-10 23:46:06 +03:00
elsid
2599aba196
Fix check whether file name starts with x or X
...
If path doens't contains / or \, then slashpos will be 0.
Therefore slashpos + 1 = 1 doesn't point to first symbol.
xmesh.nif
^
slashpos + 1
2018-07-10 23:46:06 +03:00
Andrei Kortunov
c921d1c7e9
Refactor NifStream class (eliminate LNK4221 MSVC warning)
2018-07-10 13:32:52 +04:00
Andrei Kortunov
16a4df25d6
Make void function to do not return value
2018-07-10 09:36:39 +04:00
Alexander Stillich
725cc94210
Renamed cc_install to something less cryptic (crashCatcherInstall)
2018-07-09 16:25:55 +02:00
Doc West
467989cdd5
Moved crashcatcher to a component and also use it in CS
...
Reworked debugger detection (failed on gdb 7.11), it now uses /proc to detect the debugger
2018-07-09 16:25:55 +02:00
AnyOldName3
85aba2e1da
Add toggleable shadow debug overlay.
2018-06-28 17:24:36 +01:00
Andrei Kortunov
359e748c28
Initialize some missing fields in constructors
2018-06-25 09:35:42 +04:00
AnyOldName3
f8e4f3fca5
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-06-22 00:11:29 +01:00
Bret Curtis
6655b7e512
Merge pull request #1740 from nikolaykasyanov/software-cursor-decompression
...
Decompress cursors using SDL software renderer on Mac or if OSG >= 3.5.8 or if OPENMW_DECOMPRESS_TEXTURES is set
2018-06-20 17:19:48 +02:00
Bret Curtis
3ebebdf3c1
Merge pull request #1751 from wareya/terrainbleeding
...
Fix #4452
2018-06-20 10:20:11 +02:00
AnyOldName3
553094669b
Merge upstream/master (& fix merge conflicts)
2018-06-20 00:11:23 +01:00
AnyOldName3
ed68db5ef9
Fix issue where the camera frustum cropping wouldn't consider where casters might cast shadows, just where they actually were.
2018-06-19 23:48:59 +01:00
Bret Curtis
c1eb9042b3
Merge branch 'master' into terrainbleeding
2018-06-19 13:40:14 +02:00
Andrei Kortunov
5fd3ec1035
Implement unlockable locks with 'lock 0' console command
2018-06-19 14:17:33 +04:00
Nikolay Kasyanov
75d79e98b9
Force software decompression if OPENMW_DECOMPRESS_TEXTURES is set
2018-06-16 12:38:16 +02:00
Nikolay Kasyanov
359f87ab9f
Change imageToSurface to return a unique_ptr to avoid manual surface cleanup
2018-06-16 12:12:32 +02:00
Miloslav Číž
2a23b53515
Merge branch 'drummyfish/openmw-toggleborders'
2018-06-14 15:33:08 +02:00
Miloslav Číž
477e1437d2
Resolve conflicts
2018-06-14 15:30:28 +02:00
Miloslav Číž
34f8eca7bd
Fix indent
2018-06-14 13:43:32 +02:00
Miloslav Číž
ab8de9fa14
Set node mask to cell borders
2018-06-14 13:18:37 +02:00
Miloslav Číž
414e6caafe
Make tb work with distant terrain
2018-06-14 13:14:38 +02:00
Miloslav Číž
f18d57429e
Move cell border management to World
2018-06-14 12:27:22 +02:00
Miloslav Číž
1b8d500c07
Make tb command work again
2018-06-14 12:01:09 +02:00
Miloslav Číž
1fd5ad3e56
Use REAL_SIZE constant
2018-06-14 01:01:22 +02:00
Miloslav Číž
d629c30fdb
Merge branch 'master' into screenshot360
2018-06-13 21:16:28 +02:00
Bret Curtis
a747318c90
Merge branch 'master' into terrainbleeding
2018-06-13 09:20:49 +02:00
Marc Zinnschlag
48711bbdde
Merged pull request #1592
2018-06-13 08:58:06 +02:00
Miloslav Číž
c3d7ee5a9e
Resolve merge conflicts
2018-06-13 08:22:37 +02:00
wareya
94f695cffc
Fix #4452 and remove dead code
2018-06-12 21:04:27 -04:00
Miloslav Číž
db8aaa74d6
Start cell border debug drawing
2018-06-13 01:48:31 +02:00
Nikolay Kasyanov
224b94c0ce
Decompress cursors using SDL software renderer on Mac or if OSG >= 3.5.8
2018-06-12 20:32:02 +02:00
AnyOldName3
f5b144ef77
Improve bounds calculation for shadow casters outside of the viewing frustum
2018-06-12 17:04:56 +01:00
Marc Zinnschlag
565922f9ad
naked expressions beginning with the member operator were allowed erroneously outside of the console (Fixes issue #2971 )
2018-06-12 17:52:16 +02:00
Marc Zinnschlag
8d0f717e72
Merged pull request #1739
2018-06-12 17:04:41 +02:00
Marc Zinnschlag
90febde783
Merged pull request #1742
2018-06-12 17:03:38 +02:00
Marc Zinnschlag
816a1733dc
Allow comma after Begin and End script instruction ( Fixes #4451 )
2018-06-12 15:29:28 +02:00
Andrei Kortunov
acd3cba5fa
Store previous items in the savegame
2018-06-10 16:21:19 +04:00
wareya
7344323b9e
remove indentation from blank lines
2018-06-09 10:31:51 -04:00
wareya
8f45b0d53a
remove unnecessary conditions
2018-06-09 10:11:43 -04:00
Andrei Kortunov
fba0c155df
Fix assertion fail related to NiLookAtController
2018-06-09 17:07:38 +04:00
Marc Zinnschlag
7d9de93fd3
Merged pull request #1477
2018-06-09 10:52:35 +02:00
Marc Zinnschlag
551a69f1b1
Merged pull request #1559
2018-06-09 10:51:02 +02:00
Marc Zinnschlag
efb4abbb7f
Merged pull request #1623
2018-06-09 10:49:04 +02:00
wareya
6277f5511c
fix #3876 and #3993
2018-06-08 17:52:46 -04:00
Andrei Kortunov
3d0631cfcc
Store last AI package in savegame
2018-06-08 21:53:47 +04:00
Andrei Kortunov
3a0ee78d2b
AiTravel: store mHidden flag in savegame
2018-06-08 21:53:47 +04:00
Andrei Kortunov
fed10e87aa
Store integer actor ID in AI packages (bug #4036 )
2018-06-08 19:57:41 +04:00
Andrei Kortunov
2fada94879
Improve MRK NiStringExtraData handling (bug #4419 )
2018-06-08 15:44:35 +04:00
Marc Zinnschlag
13f7b53b1c
Revert "Don't force DDS file usage ( fixes #1392 )"
...
This reverts commit 90f3ff2da4
2018-06-04 17:08:09 +02:00
Bret Curtis
4a2b973052
Merge pull request #1726 from elsid/fix_catch_warnings
...
Fix warnings: catching polymorphic type by value
2018-06-02 19:36:04 +02:00
Capostrophic
eecde340cf
Make weapon health short unsigned ( fixes #4435 )
2018-06-02 15:44:59 +03:00
elsid
dba79f4d4d
Fix warnings: catching polymorphic type by value
...
openmw/apps/openmw/mwworld/worldimp.cpp: In member function ‘virtual bool MWWorld::World::findExteriorPosition(const string&, ESM::Position&)’:
openmw/apps/openmw/mwworld/worldimp.cpp:2650:25: warning: catching polymorphic type ‘class std::invalid_argument’ by value [-Wcatch-value=]
catch (std::invalid_argument)
^~~~~~~~~~~~~~~~
openmw/apps/openmw/mwworld/worldimp.cpp:2654:25: warning: catching polymorphic type ‘class std::out_of_range’ by value [-Wcatch-value=]
catch (std::out_of_range)
^~~~~~~~~~~~
openmw/components/widgets/numericeditbox.cpp: In member function ‘void Gui::NumericEditBox::onEditTextChange(MyGUI::EditBox*)’:
openmw/components/widgets/numericeditbox.cpp:41:21: warning: catching polymorphic type ‘class std::invalid_argument’ by value [-Wcatch-value=]
catch (std::invalid_argument)
^~~~~~~~~~~~~~~~
openmw/components/widgets/numericeditbox.cpp:45:21: warning: catching polymorphic type ‘class std::out_of_range’ by value [-Wcatch-value=]
catch (std::out_of_range)
^~~~~~~~~~~~
2018-06-02 14:28:46 +03:00
AnyOldName3
50fdd0be99
Resolve computed near plane issues with extremely high viewing distances.
2018-05-29 00:52:43 +01:00
AnyOldName3
759e6fb804
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-05-27 15:41:42 +01:00
Thunderforge
c2fff61ccd
Changing so that data changes happen only after the addon is checked
2018-05-26 20:35:28 -05:00
Andrei Kortunov
afae398b5c
Use utf8 lowercase function for journal index to avoid code duplication
2018-05-24 12:53:06 +04:00
Andrei Kortunov
b5374029e5
Implement case-insensitive search in spell window
2018-05-24 12:39:00 +04:00
Marc Zinnschlag
810e4416f6
Merged pull request #1691
2018-05-23 16:56:36 +02:00
Marc Zinnschlag
d92d754834
Merged pull request #1697
2018-05-23 16:01:11 +02:00
Thunderforge
d58cce9c72
Adding WIP code to dynamically change the autocomplete fields
2018-05-22 20:50:31 -05:00
Andrei Kortunov
888c2d9a33
Render default land texture for Wilderness cells with distant terrain
2018-05-22 12:40:01 +04:00
AnyOldName3
2c30bc1b4f
Accidentally fix the one remaing case where shadows look awful while refactoring some stuff.
2018-05-18 22:39:57 +01:00
AnyOldName3
9f0a49c303
Disable CSM when disabled in the settings.
2018-05-17 20:27:10 +01:00
AnyOldName3
84284a60a7
Make CSM shader changes controllable by the setting.
2018-05-17 17:35:55 +01:00
AnyOldName3
5d05aadb37
Begin to let settings toggle between CSM and PSSM
2018-05-17 16:57:01 +01:00
AnyOldName3
7255c266ba
Merge branch 'osgshadow-test-vdsm' into osgshadow-test-dicking-around-with-cascading-shadow-maps
2018-05-16 21:21:05 +01:00
AnyOldName3
fc1aee10f4
Remove function declaration that somehow snuck in.
2018-05-16 21:20:17 +01:00
AnyOldName3
1b30d47d7f
Add a hacky temporary version of cascading shadow maps
2018-05-13 12:56:40 +01:00
AnyOldName3
44b2cf2b7f
Merge upstream.
2018-05-11 19:15:04 +01:00
AnyOldName3
166e7df778
Improve debug HUD frustum
2018-05-11 19:08:42 +01:00
Marc Zinnschlag
b7cce1a665
Merged pull request #1702
2018-05-11 10:11:17 +02:00
Alf Henrik Sauge
d4f278a113
Replacing tab with spaces
2018-05-09 18:02:02 +02:00
Alf Henrik Sauge
feeee50a88
Dropping a separate NPDTstruct12 object and instead use NPDTstruct52
...
NPDTstruct12 is now only used when loading and saving. Turning auto calc
on and off now no longer switches between to different set of values
2018-05-09 00:25:07 +02:00
Marc Zinnschlag
3197ebd8e7
Merged pull request #1694
2018-05-08 12:19:14 +02:00
Andrei Kortunov
1dd36329a3
Load default markers definitions (bug #4410 )
2018-05-05 17:14:33 +04:00
tri4ng1e
f5b7a230fc
ESMReader::close now clears mHeader
2018-05-05 14:40:58 +03:00
AnyOldName3
4547151863
Add the view frustum to the debug HUD (in the most annoying way possible)
2018-05-05 00:08:00 +01:00
Marc Zinnschlag
69c659852d
Merge pull request #1689 )
2018-05-03 13:03:42 +02:00
Andrei Kortunov
6cc7405194
Remove unnecessary command from QuadTreeWorld destructor (bug #4408 )
2018-04-30 18:29:26 +04:00
scrawl
f4cd7ff5b2
Merge pull request #1690
2018-04-29 14:24:56 +00:00
Capostrophic
d967983f5c
Assume Morrowind.esm dependency for dependency-less content addons ( fixes #2829 )
2018-04-29 14:56:38 +03:00
Andrei Kortunov
5afcc56860
Handle NiLookAtController (feature #4407 )
2018-04-29 09:24:13 +04:00
scrawl
55a6344fb0
Revert log spam
2018-04-22 15:41:25 +00:00
Evgeny Kurnevsky
48fb6bb9e8
Fix crash when rollDice is called with 0.
2018-04-21 16:46:36 +03:00
scrawl
1f1f47431f
Merge pull request #1672
2018-04-19 13:36:40 +00:00
Capostrophic
48467814d4
Improve random number generation
2018-04-19 15:55:26 +03:00
scrawl
ce1b2a612c
Merge pull request #1674
2018-04-18 15:56:22 +00:00
Capostrophic
90f3ff2da4
Don't force DDS file usage ( fixes #1392 )
...
Fallback to a DDS file if the requested texture path doesn't point to an existing file, not vice versa
2018-04-18 17:55:12 +03:00
tri4ng1e
d310d36ea3
[Fix] Some PVS-Studio and cppcheck fixes
2018-04-18 12:36:10 +00:00
tri4ng1e
d4d1703bcf
Some PVS-Studio and cppcheck fixes
...
cppcheck:
[apps/esmtool/record.cpp:697]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/esmtool/record.cpp:1126]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/esmtool/record.cpp:1138]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/niftest/niftest.cpp:36]: (performance) Function parameter 'filename' should be passed by reference.
[apps/niftest/niftest.cpp:41]: (performance) Function parameter 'filename' should be passed by reference.
[apps/opencs/model/prefs/boolsetting.cpp:25]: (warning) Possible leak in public function. The pointer 'mWidget' is not deallocated before it is allocated.
[apps/opencs/model/prefs/shortcuteventhandler.cpp:52]: (warning) Return value of std::remove() ignored. Elements remain in container.
[apps/openmw/mwstate/quicksavemanager.cpp:5]: (performance) Variable 'mSaveName' is assigned in constructor body. Consider performing initialization in initialization list.
PVS-Studio:
apps/opencs/model/filter/parser.cpp 582 warn V560 A part of conditional expression is always true: allowPredefined.
apps/opencs/view/world/referencecreator.cpp 67 warn V547 Expression '!errors.empty()' is always false.
apps/opencs/view/world/referencecreator.cpp 74 warn V547 Expression '!errors.empty()' is always false.
apps/opencs/view/doc/loader.cpp 170 warn V560 A part of conditional expression is always true: !completed.
apps/opencs/view/doc/loader.cpp 170 warn V560 A part of conditional expression is always true: !error.empty().
apps/opencs/model/tools/pathgridcheck.cpp 32 err V517 The use of 'if (A) {...} else if (A) {...}' pattern was detected. There is a probability of logical error presence. Check lines: 32, 34.
apps/opencs/model/world/refidadapterimp.cpp 1376 err V547 Expression 'subColIndex < 3' is always true.
apps/openmw/mwgui/widgets.hpp 318 warn V703 It is odd that the 'mEnableRepeat' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:318, MyGUI_ScrollBar.h:179.
apps/openmw/mwgui/widgets.hpp 319 warn V703 It is odd that the 'mRepeatTriggerTime' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:319, MyGUI_ScrollBar.h:180.
apps/openmw/mwgui/widgets.hpp 320 warn V703 It is odd that the 'mRepeatStepTime' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:320, MyGUI_ScrollBar.h:181
apps/openmw/mwmechanics/actors.cpp 1425 warn V547 Expression '!detected' is always true.
apps/openmw/mwmechanics/character.cpp 2155 err V547 Expression 'mode == 0' is always true.
apps/openmw/mwmechanics/character.cpp 1192 warn V592 The expression was enclosed by parentheses twice: ((expression)). One pair of parentheses is unnecessary or misprint is present.
apps/openmw/mwmechanics/character.cpp 521 warn V560 A part of conditional expression is always true: (idle == mIdleState).
apps/openmw/mwmechanics/pathfinding.cpp 317 err V547 Expression 'mPath.size() >= 2' is always true.
apps/openmw/mwscript/interpretercontext.cpp 409 warn V560 A part of conditional expression is always false: rank > 9.
apps/openmw/mwgui/windowbase.cpp 28 warn V560 A part of conditional expression is always true: !visible.
apps/openmw/mwgui/journalwindow.cpp 561 warn V547 Expression '!mAllQuests' is always false.
apps/openmw/mwgui/referenceinterface.cpp 18 warn V571 Recurring check. The '!mPtr.isEmpty()' condition was already verified in line 16.
apps/openmw/mwworld/scene.cpp 463 warn V547 Expression 'adjustPlayerPos' is always true.
apps/openmw/mwworld/worldimp.cpp 409 err V766 An item with the same key '"sCompanionShare"' has already been added.
apps/openmw/mwworld/cellstore.cpp 691 warn V519 The 'state.mWaterLevel' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 689, 691.
apps/openmw/mwworld/weather.cpp 1125 warn V519 The 'mResult.mParticleEffect' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 1123, 1125.
apps/openmw/mwworld/weather.cpp 1137 warn V519 The 'mResult.mParticleEffect' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 1135, 1137.
apps/wizard/unshield/unshieldworker.cpp 475 warn V728 An excessive check can be simplified. The '(A && B) || (!A && !B)' expression is equivalent to the 'bool(A) == bool(B)' expression.
apps/wizard/installationpage.cpp 163 warn V735 Possibly an incorrect HTML. The "</p" closing tag was encountered, while the "</span" tag was expected.
components/fontloader/fontloader.cpp 427 err V547 Expression 'i == 1' is always true.
components/nifosg/nifloader.cpp 282 warn V519 The 'created' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 278, 282.
components/esm/loadregn.cpp 119 err V586 The 'clear' function is called twice for deallocation of the same resource. Check lines: 112, 119.
components/esm/cellref.cpp 178 warn V581 The conditional expressions of the 'if' statements situated alongside each other are identical. Check lines: 175, 178.
components/esmterrain/storage.cpp 235 warn V560 A part of conditional expression is always true: colStart == 0.
components/esmterrain/storage.cpp 237 warn V560 A part of conditional expression is always true: rowStart == 0.
2018-04-18 12:36:10 +00:00
scrawl
6c79c0fb35
Add an empty compileGLObjects implementation to Rig/MorphGeometry to avoid unnecessary creation of display list done by osg
2018-04-18 12:36:08 +00:00
Andreas Sturmlechner
2c9d46a60b
Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
2018-04-17 23:03:56 +02:00
scrawl
ef050d7869
Merge pull request #1660
2018-04-09 20:23:27 +00:00
scrawl
e73af18824
Merge pull request #1653
2018-04-02 17:29:04 +00:00
elsid
14daadded7
Add virtual destructors
...
To fix warnings:
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/shared_ptr_base.h:588:8: warning: delete called on non-final 'NifOsg::ControllerFunction' that has virtual functions but non-virtual destructor
[-Wdelete-non-virtual-dtor]
delete __p;
^
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/shared_ptr_base.h:595:4: note: in instantiation of function template specialization
'std::__shared_count<__gnu_cxx::_S_atomic>::__shared_count<NifOsg::ControllerFunction *>' requested here
: __shared_count(__p)
^
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/shared_ptr_base.h:1079:17: note: in instantiation of function template specialization
'std::__shared_count<__gnu_cxx::_S_atomic>::__shared_count<NifOsg::ControllerFunction *>' requested here
: _M_ptr(__p), _M_refcount(__p, typename is_array<_Tp>::type())
^
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/shared_ptr.h:129:25: note: in instantiation of function template specialization 'std::__shared_ptr<NifOsg::ControllerFunction,
__gnu_cxx::_S_atomic>::__shared_ptr<NifOsg::ControllerFunction, void>' requested here
shared_ptr(_Yp* __p) : __shared_ptr<_Tp>(__p) { }
^
/home/elsid/dev/openmw/components/nifosg/nifloader.cpp:242:39: note: in instantiation of function template specialization 'std::shared_ptr<NifOsg::ControllerFunction>::shared_ptr<NifOsg::ControllerFunction, void>' requested here
callback->setFunction(std::shared_ptr<NifOsg::ControllerFunction>(new NifOsg::ControllerFunction(key)));
^
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/unique_ptr.h:78:2: warning: delete called on non-final 'MWGui::ResponseCallback' that has virtual functions but non-virtual destructor
[-Wdelete-non-virtual-dtor]
delete __ptr;
^
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/unique_ptr.h:268:4: note: in instantiation of member function 'std::default_delete<MWGui::ResponseCallback>::operator()' requested here
get_deleter()(__ptr);
^
/home/elsid/dev/openmw/apps/openmw/mwgui/dialogue.cpp:58:23: note: in instantiation of member function 'std::unique_ptr<MWGui::ResponseCallback, std::default_delete<MWGui::ResponseCallback> >::~unique_ptr' requested here
PersuasionDialog::PersuasionDialog(ResponseCallback* callback)
^
2018-04-01 21:51:59 +03:00
Capostrophic
1aa3ed0c18
Font loader fallback character reorganization ( fixes #1987 )
2018-03-31 20:16:44 +03:00
Capostrophic
be542507f8
Make hasMaster() behavior consistent with isGameFile() ( fixes #3618 )
2018-03-28 15:43:51 +03:00
bret curtis
4890ecd357
remove native GLESv* support, as it never worked; make things less complicated as result, fixed lighting.glsl to work with gl2es thanks to ptitSeb
2018-03-27 20:20:40 +02:00
scrawl
eb723f5ae6
Merge pull request #1629
2018-03-16 23:26:50 +00:00
Capostrophic
002ad9ae1b
Print a warning in case a fallback value wasn't found
2018-03-14 00:25:56 +03:00
Capostrophic
e4531a6910
Use middle gray instead of pure black as default fallback color ( Fixes #2841 )
2018-03-12 23:38:59 +03:00
scrawl
e81faf5f2f
Add an option to disable GUI keyboard navigation (Bug #4333 )
2018-03-08 23:39:35 +00:00
Harald H
d3b623b5d3
http to https for supported urls ( #1625 )
...
* http to https for supported urls
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http tp https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* some url fixes
* http to https
2018-03-08 21:23:24 +01:00
AnyOldName3
e885612bd7
Make a dynamic cast static
2018-03-03 02:05:46 +00:00
AnyOldName3
b553b58de5
Fix another compiler warning
2018-03-03 02:03:16 +00:00
AnyOldName3
3bed2a7b01
Fix some copiler warnings (hopefully)
2018-03-03 02:01:03 +00:00
AnyOldName3
fc41902798
Replace a dynamic cast with string comarison
2018-03-01 14:37:11 +00:00
AnyOldName3
bc4b4c66e4
(Hopefully) add include which G++ requires even though VC++ doesn't.
2018-02-27 16:54:48 +00:00
AnyOldName3
d1a2955fa1
Merge upstream
2018-02-27 14:29:14 +00:00
AnyOldName3
66a114d6ec
Fix a couple of warnings
2018-02-27 14:15:06 +00:00
AnyOldName3
f9cf1ac94b
Separate indoor and outdoor shadow casting masks.
2018-02-27 00:13:51 +00:00
AnyOldName3
35eb71052e
Tidy up the shadow manager
2018-02-26 23:52:46 +00:00
AnyOldName3
882b63cba9
Make split point control parameters configurable with the new shadow technique.
2018-02-26 23:00:46 +00:00
AnyOldName3
e233dae1cd
Hook up the new shadow technique
2018-02-26 22:27:09 +00:00
AnyOldName3
97b607fc66
Make whitespace match upstream OSG
2018-02-26 21:10:06 +00:00
AnyOldName3
99db93510c
Undo minor cockup where the same file appeared twice
2018-02-26 21:09:29 +00:00
AnyOldName3
639a4f5e8c
Remove TODO left in by accident. Also, become 100 commits ahead of upstream.
2018-02-26 20:52:19 +00:00
AnyOldName3
478367bef3
Ensure the debug HUD won't crash if settings are changed at runtime.
2018-02-26 20:50:54 +00:00
AnyOldName3
7b52091a82
Make the debug hud enableable
2018-02-26 20:36:43 +00:00
AnyOldName3
5d719e9d5f
Add the debug HUD to the new shadow technique
2018-02-26 20:20:01 +00:00
AnyOldName3
76f23c28b1
Make shadows disableable.
2018-02-26 16:25:44 +00:00
AnyOldName3
0f1e770c53
Transfer changes to cull to new shadow technique
2018-02-26 15:51:22 +00:00
AnyOldName3
4c31b38f77
Move CLSB changes to new shadow technique
2018-02-26 14:58:12 +00:00
AnyOldName3
06b2ce6646
Fix alignment issues caused by renaming classes
2018-02-26 14:34:14 +00:00
AnyOldName3
02d0ee3485
Rename old shadow class to shadow manager
2018-02-26 14:29:31 +00:00
AnyOldName3
ce02c83089
Copy debug shader source into new shadow technique
2018-02-26 14:27:47 +00:00
Miloslav Číž
db6107f12f
Merge branch 'master' into screenshot360
2018-02-25 11:25:19 +01:00
AnyOldName3
7bd4c5e4b3
Change class name
2018-02-24 00:57:58 +00:00
AnyOldName3
c815366044
Move to the correct namespace part 2
2018-02-24 00:55:24 +00:00
AnyOldName3
11e59d3c11
Move to the correct namespace.
2018-02-24 00:52:46 +00:00
AnyOldName3
324b398d29
Add a notice clarifying the source of the shadow technique files.
2018-02-24 00:15:54 +00:00
AnyOldName3
7467248555
Undo a modification from the upstream shadow technique which breaks compatibiltiy with OSG 3.4
2018-02-24 00:14:29 +00:00
AnyOldName3
273914aba8
Add osgShadow ViewDependentShadowMaps as they can be found in OSG's GitHub Repository
2018-02-24 00:13:05 +00:00
AnyOldName3
9ec59783ba
Add basic support for distant terrain CLSB
...
(cherry picked from commit 0f9dc3e65b72e6fff762f7a0933bae6f861e5fd4)
2018-02-23 23:37:04 +00:00
AnyOldName3
cb6767b4fc
Move the declaration of ComputeLightSpaceBounds to the header so that it can be accessed from other compilation units.
...
(cherry picked from commit 8ac4fb208897a18da4934dd6f2fe84560b44ba9d)
2018-02-23 23:35:01 +00:00
AnyOldName3
6251e0519e
Use CLSB results to reduce maximum shadow map distance when sensible.
2018-02-23 23:31:53 +00:00
scrawl
9b8c56761b
Fix timing error
2018-02-13 18:25:28 +00:00
Alexander "Ananace" Olofsson
145b47a550
Fix Windows builds
...
`std::min`/`std::max` are part of algorithm, which is not implicitly included in Windows builds
2018-02-13 17:47:38 +01:00
scrawl
ac1609c433
Merge pull request #1604
2018-02-13 00:56:06 +00:00
scrawl
123f7b83d5
Make the CompositeMapRenderer use available time and add related setting
2018-02-13 00:40:41 +00:00
uramer
5502790ed9
removed the unnecessary comment
2018-02-09 16:34:55 +01:00
uramer
86c25f5dba
Removed NIF flag handling to replicate vanilla engine behaviour
2018-02-09 01:53:52 +01:00
scrawl
25a6a67508
Fix the optimizer messing up LOD node's children ( Fixes #4301 )
2018-01-29 19:44:12 +00:00
scrawl
89c6b59c30
Merge pull request #1602
2018-01-28 22:35:47 +00:00
Ilya Zhuravlev
9e9f6f3132
loadtes3: don't pack() non-POD structs
2018-01-26 21:35:51 -05:00
AnyOldName3
9f20aaccfb
Add some more advanced settings to control shadows.
2018-01-25 16:08:34 +00:00
AnyOldName3
6ec893b618
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-01-22 15:54:13 +00:00
AnyOldName3
112ade2a3f
Ensure TerrainDrawables affect the computed near/far planes.
2018-01-22 15:52:37 +00:00
Ilya Zhuravlev
359910762d
GraphicsWindowSDL2: support setting up GLESv2 context for android
2018-01-18 17:11:22 -05:00
Ilya Zhuravlev
a038327521
SDLCursorManager: fix possibly invalid read when no cursor present
...
On android we have no cursor so I moved the check closer to usage
2018-01-17 23:03:11 -05:00
Bret Curtis
588c1df0f0
Merge pull request #1599 from xyzz/android
...
Update android port.
2018-01-16 11:12:21 +01:00
Ilya Zhuravlev
d2121ccd62
Update android port.
2018-01-16 00:11:27 -05:00
scrawl
047c44f265
Ignore duplicate data directories to work around the fallout of ( Fixes #3557 )
2018-01-14 00:25:20 +00:00
scrawl
259919d125
Print a warning when an ambiguous file on a case-sensitive file system is found
2018-01-14 00:23:29 +00:00
Marc Zinnschlag
2dff3aab22
allow . and - in the name part of a begin script statement, but not at the beginning of a name. Fixes #4061
2018-01-12 16:37:06 +01:00
scrawl
bba9a8dd91
Don't update off-screen animations
...
Make flying creatures animate in-place when out of processing range
2018-01-11 01:49:35 +00:00
AnyOldName3
bf9a1ded63
Mark a function as override
2018-01-02 16:39:05 +00:00
Bret Curtis
93f14c219c
camelCase
2018-01-01 16:32:20 +01:00
Bret Curtis
7a7b040216
fix building on mips machines
2018-01-01 14:10:23 +01:00
scrawl
c920f95d1e
Don't incorrectly discard root node transformation ( Fixes #4272 )
2017-12-31 23:49:43 +00:00
AnyOldName3
c3e0398d1c
Add settings
2017-12-27 02:32:17 +00:00
AnyOldName3
c192c851db
Make disabling shadows disable their performance impact, too.
2017-12-26 23:51:50 +00:00
AnyOldName3
b08938485f
Make suspending viewer threads the responsibility of the caller, not the shader manager.
2017-12-17 23:55:19 +00:00
AnyOldName3
229cc9696f
Make updating global shader defines update shaders.
2017-12-17 01:57:53 +00:00
AnyOldName3
8957c92a36
Switch to a more industry-standard shadow map splitting scheme
2017-12-17 00:52:10 +00:00
AnyOldName3
7cce2d6f87
Implement a more sensible shadow map cascading system
2017-12-12 22:37:40 +00:00
AnyOldName3
0e481a457e
Merge remote-tracking branch 'refs/remotes/upstream/master'
2017-12-08 23:26:08 +00:00
scrawl
a4d8aef40d
Merge branch openmw-43 into master
...
Conflicts:
CMakeLists.txt
README.md
files/mygui/openmw_trade_window.layout
2017-11-29 22:37:50 +00:00
AnyOldName3
974e4d5299
Add check for null shaders when releasing OpenGL objects
2017-11-24 22:43:40 +00:00
Andrei Kortunov
94c0e3ed10
Move toUpper() from StringUtils to the JournalViewModel
2017-11-23 19:37:45 +04:00
AnyOldName3
98cd9fc144
Add preliminary support for global shader defines.
2017-11-22 20:07:07 +00:00
AnyOldName3
7a9df977c7
Add some prerequisits for making shadows disableable
2017-11-21 17:20:57 +00:00
AnyOldName3
166ba22072
Prevent line count changes within conditional blocks (because of conditional includes or @foreach expansion) ruining line numbering.
2017-11-21 16:53:12 +00:00
Andrei Kortunov
67acb83b62
Add missing include
2017-11-21 13:27:33 +04:00
Andrei Kortunov
5f41f7c48d
Clean code up a bit
2017-11-21 13:03:38 +04:00
Andrei Kortunov
ba91cd658b
Convert topic name to Unicode
2017-11-21 12:31:23 +04:00
Andrei Kortunov
f0ca3eabd3
Merge from upstream master
2017-11-21 09:39:54 +04:00
scrawl
9fda3b6db4
Fix NumericEditBox behavior broken by switch to std::stoi
...
For some reason stoi doesn't throw an error for '1foo' while 'foo1' does.
Now the edit box flat out rejects any non-digit key events.
2017-11-20 23:20:03 +00:00
Andrei Kortunov
a391990f2a
Provide multibyte toLower() and single chars comparator
2017-11-20 21:30:46 +04:00
AnyOldName3
0f6f097cf2
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2017-11-17 18:24:08 +00:00
AnyOldName3
3d18ddc8e4
Take into account previous #line directives when expanding @foreach shader macros
2017-11-17 17:18:33 +00:00
Miloslav Číž
3ae5310567
use loading screen to freeze the screen
2017-11-16 22:08:33 +01:00
Alexander Stillich
93e9df15c9
Fixed parameter naming
2017-11-11 22:58:02 +00:00
Alexander Stillich
52b3507a2b
Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all
2017-11-11 22:58:02 +00:00
Alexander Stillich
09aac22782
Added StringUtil::replaceAll()
2017-11-11 22:58:01 +00:00
Alexander Stillich
92aaff3b78
Fixed escaping @ in boost program options filter
2017-11-11 22:57:59 +00:00
Miloslav Číž
e804c4a011
remove no longer used method
2017-11-11 13:54:14 +01:00
scrawl
a5ba1caed1
Merge pull request #1541 from astillich/4189
...
Fixed escaping @ in boost program options filter
2017-11-10 23:08:54 +00:00
scrawl
a5adc5b018
Add NPC base skeleton files to the optimizer blacklist ( Fixes #4159 )
2017-11-10 22:51:32 +00:00
AnyOldName3
590531595b
Create @foreach shader preprocessor macro in preparation for moving shadow setup out of shadermanager.cpp
2017-11-10 02:02:27 +00:00
Miloslav Číž
d763e9fe46
add settings for spherical screenshots
2017-11-09 20:25:29 +01:00
AnyOldName3
6e0b61d084
Add missing libraries to components target
2017-11-08 04:09:14 +00:00
AnyOldName3
e201e359a9
Move Shadow to Components
2017-11-08 01:44:49 +00:00
AnyOldName3
1a30a917af
Merge upstream/master
2017-11-08 01:31:38 +00:00
AnyOldName3
aa31cbba4f
Attempt (and fail) to make the local map show without unwanted shadow
2017-11-08 01:20:52 +00:00
scrawl
244cc5b861
Reduce error spam
2017-11-08 00:24:03 +00:00
scrawl
7b4add2ae4
Fall back to non-shader material if creating the shader fails
...
Also fixes an uncaught exception that will break the whole game.
2017-11-08 00:24:03 +00:00
Alexander Stillich
43b5c2e36b
Fixed parameter naming
2017-11-07 23:20:10 +01:00
Alexander Stillich
70d578d050
Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all
2017-11-07 23:10:58 +01:00
Alexander Stillich
af3e1f92ec
Added StringUtil::replaceAll()
2017-11-07 23:06:23 +01:00
AnyOldName3
715f29165b
Dynamically adjust shaders to have the required number of shadow maps.
2017-11-07 20:22:45 +00:00
Alexander Stillich
7d39c5450c
Fixed escaping @ in boost program options filter
2017-11-05 22:14:16 +01:00
scrawl
ceaf0ee409
Enable shadow casting for terrain
...
Add a check to TerrainDrawable to make sure shadows are only drawn once, not once per blending pass
2017-10-31 21:21:05 +01:00
David Walley
41dc82abad
Update Links to Documentation in settings.cfg files ( #1523 )
...
* Update settings-default.cfg
* Update settings.cpp
2017-10-28 16:05:30 +00:00
AnyOldName3
c1a871ff1f
Make indentation consistent.
2017-10-24 23:31:40 +01:00
AnyOldName3
daf7d8451c
Switch to a more reliable method of passing the git-version targt the data it needs
2017-10-24 23:29:18 +01:00
AnyOldName3
e3142b9643
Add missing variables to those forwarded to the git-version target
2017-10-24 23:10:50 +01:00
scrawl
0c6ef17fb5
Add explicit variant of 'OnActivate'
2017-10-23 23:33:06 +00:00
Marcin Baszczewski
46b015d3d9
Fix assert with empty setting value
...
Local value could be empty, so it's important to check it size before read first char.
2017-10-22 10:10:04 +02:00
Marc Zinnschlag
bdabace7e2
Merge remote-tracking branch 'aesylwinn/LLmerge'
2017-10-19 14:24:58 +02:00
scrawl
7f8d996eff
Merge pull request #1502 from AnyOldName3/launcher-and-wizard-ampersand-escape-support
...
Launcher and wizard ampersand escape support
2017-10-16 21:09:04 +00:00
scrawl
136ef1f738
Fix incomplete settings in recreateShaders()
2017-10-15 17:24:23 +02:00
scrawl
03554b2f4b
Fix some style issues flagged by cppcheck
2017-10-15 17:06:58 +02:00
scrawl
50d7eb8e54
Fix crash when adding a NULL object to the cache
2017-10-15 17:06:58 +02:00
scrawl
97ec38affb
Merge pull request #1492 from drummyfish/master
...
fix rain/snow moving with player (issue #2698 )
2017-10-15 09:04:48 +00:00
AnyOldName3
49dbb4a9ca
Add a third copy of a comment where I felt clarification was missing
2017-10-15 02:05:22 +01:00
AnyOldName3
7329e6a9ef
Load 'data=...' lines correctly when starting the wizard or launcher, and save them correctly when exiting the launcher.
2017-10-15 01:59:21 +01:00
AnyOldName3
28ff677337
Save 'data=...' lines correctly when exiting the wizard
2017-10-15 00:07:46 +01:00
Miloslav Číž
65977b910e
wrap weather around in all directions
2017-10-14 21:42:27 +02:00
Miloslav Číž
380a5799dd
use bbox as wrap range & apply to all particle systems
2017-10-14 21:42:19 +02:00
Miloslav Číž
33a1459b11
search for particle system by class name
2017-10-14 21:41:47 +02:00
Kyle Cooley
11eae16645
Get rid of duplicate function, fix flag checking
2017-10-14 15:09:12 -04:00
scrawl
5fbdb64bb9
Add OPENMW_DECOMPRESS_TEXTURES environment variable to decompress textures in software if not supported by graphics hardware
...
Disabled by default due to requiring new functionality that was just added to OSG 3.6 or OpenMW/OSG.
2017-10-14 18:28:46 +00:00
scrawl
f3ca9832b0
Merge pull request #1500 from akortunov/extraspell
...
Implement ExtraSpell magic effect
2017-10-14 14:01:49 +00:00
Andrei Kortunov
30b05b557b
ExtraSpell magic effect: a basic implementation
2017-10-14 16:55:00 +04:00
AnyOldName3
c9e86a8ebc
Remove superfluous argument
2017-10-12 18:16:44 +01:00
AnyOldName3
f9a3562ccd
Remove duplicate macro definition and fix warning
2017-10-12 02:45:50 +01:00
AnyOldName3
2652a89df4
Fix mismatched indentation that apparently the .editorconfig file doesn't handle automatically
2017-10-11 22:10:52 +01:00
AnyOldName3
f8fe992dc0
Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files
2017-10-11 21:58:55 +01:00
Marc Zinnschlag
dd17f70068
Merge remote-tracking branch 'aesylwinn/landrecords'
2017-10-03 13:32:02 +02:00
scrawl
64e27c032b
Merge pull request #1481 from scrawl/keyfocus
...
WindowManager overhaul & improved keyboard support
2017-09-28 22:34:05 +00:00
scrawl
44720bf41a
Allow MWList items to retain key focus
2017-09-27 12:56:00 +00:00
scrawl
b9341925f2
Set AutoSizedEditBox as Static by default
...
Would look very odd anyway to use it for editable text, with the widget resizing as you type.
2017-09-27 12:55:53 +00:00
scrawl
c88c535e0e
Fix HBox/VBox not using Client widget with MyGUI <= 3.2.2
2017-09-27 12:55:50 +00:00
scrawl
be7bdec2ed
Merge pull request #1471 from crussell187/nif_stream_optimization
...
first pass on optimization of nif parsing functions from the file stream
2017-09-25 22:43:34 +00:00
scrawl
19e07fad30
Remove redundant Services enum
2017-09-25 19:52:20 +02:00
scrawl
82a211ba03
Fix duplicate code
2017-09-25 17:47:30 +02:00
scrawl
76ddf8d794
Support Up/DownArrow keys to change NumericEditBox value
2017-09-25 00:47:07 +02:00
scrawl
1ad14b232f
Adjust ImageButton to accept key focus and use the 'highlighted' texture
2017-09-24 19:08:11 +02:00
scrawl
e7ad012977
Pass repeat key events to the GUI
...
For example, one can scroll to the last element in a list by holding down the 'Down Arrow' key.
2017-09-24 19:08:11 +02:00
scrawl
2494c22d66
Merge pull request #1470 from MiroslavR/convertmprj
...
ESS-Importer: Convert magic projectiles
2017-09-23 22:55:56 +00:00
825de71b29
removed an iostream include used for debug prints from nifstream.hpp
2017-09-23 11:10:05 -05:00
30a213a9b3
updates for nifstream optimization including fixing the non-x86 path for little endian reads
2017-09-22 21:08:25 -05:00
8834066dea
make streaming to a type array in nif a direct copy from the file into the vector
2017-09-21 23:47:09 -05:00
090a8408b8
made nif basic type read optimizations more portable
2017-09-21 22:37:19 -05:00
c72aa19d6d
first pass on optimization of nif parsing functions from the file stream
2017-09-20 23:53:12 -05:00
scrawl
58f9688433
Use client coordinates in HBox/VBox
2017-09-20 22:24:19 +00:00
scrawl
fb975d02db
Use client coordinates in HBox/VBox
2017-09-20 22:41:50 +02:00
MiroslavR
f15de6d3ca
ESS-Importer: Convert magic projectiles ( Closes #2320 )
2017-09-20 18:58:56 +02:00
Chris Robinson
021627bdf8
Mark some functions with override
...
Fixes some Clang warnings about overriding a virtual function without the
override keyword.
2017-09-18 01:51:11 -07:00
Kyle Cooley
50d9d9f78f
Get rid of some templates, exceptions instead of assert, and other small changes.
2017-09-17 20:29:51 -04:00
Andrei Kortunov
4bb349a525
Use default 0 precision in the float formatting (bug #4096 )
2017-09-17 15:07:04 +04:00
Kyle Cooley
2abf7f1752
Remove unnecessary cache dump
2017-09-15 12:19:12 -04:00
Kyle Cooley
09e645a0e0
Fix careless mistake.
2017-09-09 23:18:09 -04:00
Kyle Cooley
25d4a0370f
Changes to land data access in tables, also update Land once per frame in scene view.
2017-09-09 15:37:52 -04:00
Kyle Cooley
d030b595f8
Fix potential segfault, cleanup, get rid of warnings.
2017-09-09 11:48:13 -04:00
Kyle Cooley
72cb405de2
Some bug fixes, changes to land load code.
2017-09-08 21:03:52 -04:00
Kyle Cooley
2eacc2f093
Changes to land creation, add ability to specifically clear terrain cache
2017-09-08 14:37:03 -04:00
Kyle Cooley
ab607f3028
Tweaks to land loading, land cloning, terrain signals, placeholder land update handling
2017-09-08 00:51:46 -04:00
Andrei Kortunov
538498230b
Declare mClient variable
2017-09-06 15:59:54 +04:00
scrawl
dca31b7ffa
Remove redundant _boundingBoxComputed which no longer exists in osg master ( Fixes #4075 )
2017-09-04 19:35:42 +00:00
Kyle Cooley
d3014cf394
Temporary fix for adding new lands, cloned lands will still reference old data though
2017-09-04 15:13:45 -04:00
Kyle Cooley
7cc95a11a4
Add more land table columns
2017-09-03 20:00:19 -04:00
scrawl
2e58024f1c
Fix intersections with Rig/MorphGeometry, was caused by an issue in the LineSegmentIntersector not respecting the cullingActive flag of a drawable.
2017-09-03 14:14:15 +00:00
scrawl
5e790b567e
Fix node path issue
...
Needs to be set so that the 'cullingActive' flag of the node path's end can be checked
2017-09-01 22:12:40 +00:00
scrawl
4bef8260ab
Add const qualifiers
2017-09-01 21:42:36 +00:00
scrawl
5d524a6a10
Add custom version of MorphGeometry replacing osgAnimation
...
Double buffering, custom bounding box and the update in the cull visitor (instead of update) are now all handled internally rather than needing hacks and/or callbacks.
2017-09-01 21:42:36 +00:00
scrawl
f1ebb129c1
Fix ShaderVisitor to deal with the fact RigGeometry no longer derives from Geometry
2017-09-01 21:42:35 +00:00
scrawl
209e139aa8
Move double buffering implementation inside RigGeometry
...
The double buffering is an implementation detail so it should be handled as such, rather than mandating the scene graph to be structured in a certain way.
Override accept(NodeVisitor&) instead of using callbacks.
2017-09-01 21:42:34 +00:00
Kyle Cooley
9e41f1340a
Replace nonconst getId with setId, add template specialization and specialized derived classes for LandTexture
2017-08-31 22:09:49 -04:00
scrawl
45f7563a55
Revert "Revert "Check for a Geometry node when attaching bodyparts""
...
Issue with shaders has been fixed with b9931fb71ca1e3fb7604
2017-08-31 21:40:35 +00:00
scrawl
b9931fb71c
Set the shader on the node containing the StateSet
2017-08-31 21:39:21 +00:00
scrawl
a1e3fb7604
Revert "Check for a Geometry node when attaching bodyparts"
...
This reverts commit 3fc8634206
2017-08-29 22:40:19 +00:00
scrawl
3fc8634206
Check for a Geometry node when attaching bodyparts ( Fixes #3957 )
2017-08-29 12:55:42 +00:00
scrawl
bc82c6a35d
Use white color if told to use nonexisting vertexcolors ( Fixes #3833 )
2017-08-27 21:22:44 +00:00
scrawl
5d2fe5e887
Implement lightmode/vertmode of NiVertexColorProperty
2017-08-27 21:22:17 +00:00
scrawl
4fba157d3b
Implement releaseGLObjects for cached resources
2017-08-26 19:29:12 +00:00
Kyle Cooley
d3d04171f9
Fix seg fault, undo changes BsaArchive
2017-08-22 15:06:56 -04:00
Kyle Cooley
8c4b12a603
VFS changes, one VFS and resource system per document.
...
Added ability to reset a VFS::Manager.
Removed ability to rebuild the index for a VFS::Manager.
Moved VFS creation to CSM::Data.
2017-08-21 22:31:19 -04:00
Kyle Cooley
979b0d7211
Code cleanup and more cache clearing
2017-08-21 18:58:38 -04:00
Kyle Cooley
679a284735
Use scoped lock instead of directly locking/unlocking mutex
2017-08-21 13:33:11 -04:00
Kyle Cooley
3b9326d238
Clear terrain cache and reload terrain
2017-08-20 22:34:41 -04:00
Kyle Cooley
b62cb0e2a4
Clear out GPU texture/stateset cache
2017-08-20 19:55:16 -04:00
Kyle Cooley
7914fd5c9c
Re-index BSAs
2017-08-20 19:36:21 -04:00
Kyle Cooley
d7744e8b16
A bit of cleanup
2017-08-20 19:07:23 -04:00
Kyle Cooley
5950b26912
Update scene assets
2017-08-19 19:36:45 -04:00
Kyle Cooley
742bd00ec6
Clear cached resources
2017-08-19 15:26:46 -04:00
Kyle Cooley
d31ed83b54
Preliminary asset reloading
2017-08-19 03:43:31 -04:00
Thunderforge
54fe645703
Removing erroneous comment since Qt is not relevant here
2017-08-09 23:12:43 -05:00
Thunderforge
464c64a306
Swap the OIS Ctrl and Meta keys on macOS to match Qt
2017-08-09 20:03:27 -05:00
scrawl
cef415509f
Revert "Merge redundant input events"
2017-08-06 20:54:20 +00:00
Julian
3cfd9af945
merge redundant input events
2017-08-02 18:54:16 +02:00
scrawl
c9d9461d3e
Add Spacer class derived from AutoSizedWidget
...
Using a normal widget as a spacer with HStretch/VStretch may not work properly because for widgets not derived from AutoSizedWidget, the HBox/VBox treat the widget's current size as the requested minimum size. This leads the layout to break when resized more than once.
The new class sets HStretch and VStretch to true by default to save some typing.
2017-07-31 16:20:29 +02:00
PlutonicOverkill
5049fe4320
Pause game when minimised on Windows
2017-07-20 21:31:05 +12:00
scrawl
3e03a0d7bd
Terrain: remove ref argument that is now always true
2017-07-19 16:24:35 +02:00
scrawl
ac78d01b2b
Terrain: use the main camera's viewpoint for intersection tests
...
Fixes lag spikes caused by intersection tests loading/unloading terrain pages.
2017-07-19 13:11:44 +02:00
scrawl
ffb6dff6aa
Merge pull request #1338 from akortunov/valuefix
...
Change mValue type for clothes to unsigned short (bug #3960 )
2017-07-18 10:13:51 +00:00
Andrei Kortunov
2bd105f5e2
Change mValue type for clothes to unsigned short ( fixes #3960 )
2017-07-18 11:51:19 +04:00
scrawl
40dc1dd6f5
Fix checking a variable before it's assigned (Bug #3950 )
2017-07-10 23:50:24 +02:00
scrawl
be940656db
Add '0' as an alias for 'OFF' for OPENMW_OPTIMIZE
2017-07-10 23:49:42 +02:00
scrawl
54bb1b13cb
Change NCO/NCC flags to NC* ( Fixes #3915 )
2017-06-20 00:36:17 +02:00
Allofich
42402976e3
Fixes for building in MSVC
2017-06-13 19:38:12 +09:00
Bret Curtis
c6805314c2
be explicit about what we are trying to catch instead of catching everything and fixed up formatting
...
use Allman style brackets not K&R style, additional formatting for fallback.cpp which needed some love
revert allman formatting changes
2017-06-12 00:32:29 +02:00
Bret Curtis
7c758a6293
std::stof can not handle comma in us localization and can not handle period in french localization, using std::replace is not a solution, going back to boost::lexical_cast
2017-06-12 00:32:28 +02:00
Bret Curtis
f0b21cca22
use own inline hash_combine function
2017-06-12 00:32:28 +02:00
David Carlier
8a5c62de97
needs this head for getuid
2017-06-10 14:50:43 +01:00
Bret Curtis
c781d1f8ed
purge unnecessary imports
...
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
2017-06-09 19:08:53 +02:00
Bret Curtis
154d7cffa2
replace and purge boost::function
2017-06-09 19:08:53 +02:00
Bret Curtis
d48b829b45
replace and purge boost::lexical_cast
2017-06-09 19:08:53 +02:00
Bret Curtis
98752a9702
replace boost::bind
2017-06-09 19:08:53 +02:00
Bret Curtis
b7c27e5e96
remove boost/tuple
2017-06-09 19:08:53 +02:00
Bret Curtis
39185e6f8c
purge the rest of boost::shared and any other boost related things that no longer are required
...
put boost system back in, clean others up
revert Qt
add back boost fstream
2017-06-09 19:08:53 +02:00
Bret Curtis
d785344fad
purge all instances of <boost/shared_ptr.hpp>, clean up unused headers
2017-06-09 19:08:53 +02:00
Bret Curtis
07f75e1104
replace boost::shared_ptr in extern and components
2017-06-09 19:08:53 +02:00
Ewan Higgs
38a2de3c51
convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis
2017-06-09 16:49:25 +02:00
Julian Ospald
5d85fa9220
Fix build with osg >= 3.5.6
2017-05-28 17:30:01 +02:00
scrawl
813af876f6
Use a partial binary search in isReservedName ( Fixes #3835 )
2017-05-07 23:28:56 +02:00
scrawl
8d84869432
Fix commit 8f71b65d38 (don't overwrite the previous user data)
...
This resulted in a crash/corruption because the KeyframeController, for performance reasons, does not check that the expected user data is there and of correct type.
(Fixes #3829 )
2017-05-05 05:27:00 +02:00
scrawl
45d9e38616
Fix check for default material
2017-04-22 14:27:45 +02:00
Allofich
e095817ac2
Treat =< and => as == in scripts
...
(Fixes #3744 )
2017-04-21 22:26:13 +09:00
Allofich
ff3e307059
Pass parameters by const reference
2017-04-20 23:47:03 +09:00
scrawl
8f71b65d38
sceneutil/attach: inherit the UserDataContainer to avoid the resource cache from being cleared incorrectly
2017-04-14 15:04:53 +02:00
MiroslavR
c962b6dd6d
Fix correctActorModelPath to work properly when both backward and forward slashes are used in the path ( Fixes #3822 )
2017-04-09 18:34:36 +02:00
MiroslavR
395e97cf40
Remove evil "implicit GetJournalIndex" hack from expression parser
2017-04-03 01:44:26 +02:00
Allofich
3780d94214
Cast LAND_SIZE to integer to avoid linking error
2017-03-28 01:57:31 +09:00
Allofich
2a505b427d
Remove second LAND_SIZE definition
2017-03-27 03:45:53 +09:00
scrawl
f676b62711
Remove unused variable
2017-03-23 19:35:07 +01:00
scrawl
c992cb6e82
Fix texture not being applied on rendering the composite map ( Fixes #3791 )
2017-03-19 19:15:22 +01:00
MiroslavR
06dc94552f
Log a warning if size in SCHD (script header) does not match SCDT (bytecode) size instead of failing
2017-03-18 15:42:24 +01:00
scrawl
a070551af3
Attempt to fix naming conflict on windows
2017-03-15 17:51:00 +01:00
scrawl
3d58ba7301
Fix boolean test
2017-03-15 17:50:13 +01:00
scrawl
fd215caa02
Add local LandCache to cut down on store searches
2017-03-14 19:27:57 +01:00
scrawl
088d5604bf
Use a shader if required to display the composite map
...
Fixes composited terrain not respecting the 'clamp lighting' setting.
2017-03-14 19:27:56 +01:00
scrawl
7f5beb3172
Remove unused includes
2017-03-14 19:27:56 +01:00
scrawl
5044816770
Remove unused code
2017-03-14 19:27:56 +01:00
scrawl
b66c2abfe3
Build the bounding sphere in the loading thread (only relevant for TerrainGrid)
2017-03-14 19:27:56 +01:00
scrawl
9e9c028f1d
Skip light collection for far away terrain
2017-03-14 19:27:56 +01:00
scrawl
0782839a42
Avoid redundant culling tests on the transform/drawable
2017-03-14 19:27:56 +01:00
scrawl
fb8ac06524
Reduce the minSize of quad tree nodes for better performance
2017-03-14 19:27:56 +01:00
scrawl
a041546b54
Use the quad tree's minSize in the LodCallback
2017-03-14 19:27:56 +01:00
scrawl
e4e8821902
Refactor update of lodFlags
2017-03-14 19:27:56 +01:00
scrawl
2aa09639a9
Re-enable terrain intersections
2017-03-14 19:27:56 +01:00
scrawl
db00d47ca2
Hold a ref to the intersection visitor's view if possible
2017-03-14 19:27:56 +01:00
scrawl
11bee6ee35
Avoid compiling composite maps that are no longer referenced
2017-03-14 19:27:56 +01:00
scrawl
9eed7fa6f5
Fix composite map when force shaders is enabled
2017-03-14 19:27:56 +01:00
scrawl
d055dc25bf
Add custom traversal for local map camera to avoid loading terrain nodes that are exactly outside the border to another cell
2017-03-14 19:27:56 +01:00
scrawl
7d50b6c2e2
Add QuadTreeWorld::cacheCell to preload cells at max LOD for local maps
2017-03-14 19:27:56 +01:00
scrawl
6ccb6009ee
Use the View-based preloading for TerrainGrid as well
2017-03-14 19:27:56 +01:00
scrawl
3c29e2dbeb
Refactor ownership of terrain views
2017-03-14 19:27:56 +01:00
scrawl
28fd492711
Don't use terrain LOD for the map camera
2017-03-14 19:27:56 +01:00
scrawl
e7a0878c10
Add CompositeMapRenderer info to the stats panel
2017-03-14 19:27:56 +01:00
scrawl
c921620ef3
Compile the drawables of a composite map one by one to avoid frame drops for larger maps
2017-03-14 19:27:56 +01:00
scrawl
47ca8aeee5
Use the time elapsed instead of # compiled as limit
2017-03-14 19:27:56 +01:00
scrawl
8a6d909b22
Fix composite map being compiled twice
2017-03-14 19:27:56 +01:00
scrawl
683e625c6c
Rewrite CompositeMapRenderer to be based on Drawable and share the FBO
2017-03-14 19:27:56 +01:00
scrawl
4baa795152
Add preloading implementation to QuadTreeWorld
2017-03-14 19:27:56 +01:00
scrawl
9db71e3f62
Recompute the LOD stitching when the view changes
2017-03-14 19:27:56 +01:00
scrawl
ef704db877
Fix reset of changed flag
2017-03-14 19:27:56 +01:00
scrawl
1c15686353
Remove non required use of WorkQueue
2017-03-14 19:27:56 +01:00
scrawl
433900fca5
Fix waiting on initial quad tree build
2017-03-14 19:27:56 +01:00
scrawl
4dbd224249
Hide the terrain in non-exterior cells
2017-03-14 19:27:56 +01:00
scrawl
2580de11a4
Refactor ownership of ViewDataMap
2017-03-14 19:27:56 +01:00
scrawl
5a3c645c89
Enable lazy compiling of composite maps
2017-03-14 19:27:56 +01:00
scrawl
99e18f0d68
Clear the ViewData on exit
2017-03-14 19:27:56 +01:00
scrawl
bb991850da
Add LOD stitches
2017-03-14 19:27:56 +01:00
scrawl
6bd286d924
Fix unnecessary resizing in ViewData
2017-03-14 19:27:56 +01:00
scrawl
8c151364df
Add special handling for CullVisitor to QuadTreeWorld.
...
- Cull only against bounding box, not bounding sphere, as this appears to perform better.
- Also traverse into non visible nodes to compute their LOD, this is to avoid nodes having to be loaded in when the player turns the view around, and will avoid unnecessary refs/unrefs of rendering data in the View. This should probably be turned off at some point for static cameras, such as the local maps.
2017-03-14 19:27:56 +01:00
scrawl
f19a88be9d
Reject QuadTreeNodes with invalid bounds
2017-03-14 19:27:56 +01:00
scrawl
7d004bf757
Preliminary rendering of QuadTreeWorld
2017-03-14 19:27:55 +01:00
scrawl
e36bdb490e
Add view data structure for efficient collection of LOD nodes to use for a given camera/intersection
2017-03-14 19:27:55 +01:00
scrawl
0efc54c749
Subdivide the composite maps
2017-03-14 19:27:55 +01:00
scrawl
0756fc4ae6
Optimize getBlendmaps for the general case that most points are within the given cell
2017-03-14 19:27:55 +01:00
scrawl
81c9853fe9
Fix handling in getBlendmaps when the chunk is >1 ESM::Cell
2017-03-14 19:27:55 +01:00
scrawl
b384087e28
Fix handling in fillVertexBuffers when the chunk is >1 ESM::Cell
2017-03-14 19:27:55 +01:00
scrawl
819860081f
Remove custom bounding box
2017-03-14 19:27:55 +01:00
scrawl
ce8c4ad4f5
Add quad tree implementation (no rendering yet)
2017-03-14 19:27:55 +01:00
scrawl
14225a42c6
Remove unused pointer to IncrementalCompileOperation
2017-03-14 19:27:55 +01:00
scrawl
c487df0abb
Move updateTextureFiltering and material into the base class
2017-03-14 19:27:55 +01:00
scrawl
5eff286c71
Use separate node mask and parent for CompositeMapRenderer to allow the loading screen to pre compile composite maps.
2017-03-14 19:27:55 +01:00
scrawl
7e4450da55
Change the renderOrder of composite maps to ensure they are updated before water reflections or other cameras that may be using it.
2017-03-14 19:27:55 +01:00
scrawl
b1d4bb5708
Add CompositeMapRenderer
...
Temporarily render all terrain using composite maps for testing purposes
2017-03-14 19:27:55 +01:00
scrawl
e323b2fa7b
Use the SceneManager's ShaderManager
2017-03-14 19:27:55 +01:00
scrawl
0fc465da59
Store the min/max height in LandData
2017-03-14 19:27:55 +01:00
scrawl
051c17a184
Make reportStats const
2017-03-14 19:27:55 +01:00
scrawl
80a0398f9d
Load LandData into the LandObject to avoid threading conflicts when the same data is being loaded by two threads
2017-03-14 19:27:55 +01:00
scrawl
20d30bb8d7
Move mDataLoaded into LandData
2017-03-14 19:27:55 +01:00
scrawl
16b5cadd9e
Fix order of operations w.r.t clearing cache
2017-03-14 19:27:55 +01:00
scrawl
2c68ed4fb4
Remove no longer required use of UnrefQueue as the new resource manager will naturally clear the cache from the worker thread
2017-03-14 19:27:55 +01:00
scrawl
35d53acc65
Factor out terrain chunk loading/caching into a new resource manager
2017-03-14 19:27:55 +01:00
scrawl
274690f790
Refactor BufferCache to allow caching buffers of different sizes
2017-03-14 19:27:55 +01:00
scrawl
9a3a64f0c4
Add resource manager for ESM::Land to allow data to be unloaded when no longer required
2017-03-14 19:27:55 +01:00
scrawl
804f873649
terrain: factor out texture caching into a separate class
2017-03-14 19:27:55 +01:00
scrawl
4cd4457d21
Add support for Functors to ObjectCache
2017-03-14 19:27:55 +01:00
scrawl
9d72d9f0c9
Change order of operations in SceneManager::updateCache to allow deleting of StateSets that just got unreferenced by the scene
2017-03-14 19:27:55 +01:00
scrawl
eef63a880a
terrain: use a custom drawable for multi-pass render instead of osgFX::Effect
...
osgFX::Effect is awkward to use because of the lazy-definition of passes, no support for compileGLObjects, useless 'Technique' abstraction and having to define silly methods like 'effectAuthor()'
Handling the multi-pass rendering inside the Drawable also avoids redundant culling tests against the same bounding box for each pass.
2017-03-14 19:27:55 +01:00
scrawl
34130fc5cc
Fix handling in LightListCallback when the node is not a Group
2017-03-14 19:27:55 +01:00
scrawl
b78a9f89af
Refactor LightListCallback to allow for integration in custom Drawables.
2017-03-14 19:27:55 +01:00
scrawl
c1fe9f2a89
Avoid warping the mouse cursor more than necessary
...
Apparently, the SDL_WarpMouseInWindow can be very expensive (anywhere from 0.1-5ms) due to XSync() in the implementation.
This was causing no-grab=1 configurations to suffer from terrible stuttering when turning the view.
2017-03-14 00:31:27 +01:00
scrawl
928e2061f7
Remove redundant tolower
2017-03-13 02:48:23 +01:00
scrawl
13a6070629
Remove warning spam in skeleton.cpp
...
If the root bone is missing, that is caused by all bones being missing which will have been logged already.
2017-03-13 02:48:22 +01:00
scrawl
21aad00612
Don't pass key events to the viewer when Alt modifier is held
...
Fixes the stats panel briefly showing up when using 'Alt+F4' to exit.
2017-03-08 01:27:04 +01:00
scrawl
fc95a45cb6
Don't pass repeat key events to the viewer's eventQueue
2017-03-08 01:27:04 +01:00
Nikolay Kasyanov
7f429f26e1
Allow getting available version information even when clone is shallow
2017-03-07 21:53:49 +01:00
scrawl
c1b1d502ee
Fix up commit 330e5fefd1
2017-03-04 21:48:31 +01:00
scrawl
4051018862
optimizer: fix FlattenStaticTransformsVisitor not respecting the is permissible callback
2017-03-04 21:48:31 +01:00
scrawl
5866f0f80b
Add OPENMW_OPTIMIZE env variable to help debugging optimizer-related issues
...
Example:
OPENMW_OPTIMIZE=OFF
OPENMW_OPTIMIZE="~FLATTEN_STATIC_TRANSFORMS"
2017-03-04 21:48:31 +01:00
scrawl
29556a1802
More consistent wording of errors/warnings
...
A Warning indicates a potential problem in the content file(s) that the user told OpenMW to load. E.g. this might cause an object to not display at all or as intended, however the rest of the game will run fine.
An Error, however, is more likely to be a bug with the engine itself - it means that basic assumptions have been violated and the engine might not run correctly anymore.
The above mostly applies to errors/warnings during game-play; startup issues are handled differently: when a file is completely invalid/corrupted to the point that the engine can not start, that might cause messages that are worded as Error due to the severity of the issue but are not necessarily the engine's fault.
Hopefully, being a little more consistent here will alleviate confusion among users as to when a log message should be reported and to whom.
2017-03-04 21:48:31 +01:00
scrawl
62cc091414
Fix incorrect setting of TexMat in terrain material
2017-03-02 18:07:01 +01:00
scrawl
a759ef5d2e
Leave the MyGUI::PixelFormat as Unknown when loading from file as its not required.
2017-03-01 19:04:05 +01:00
scrawl
8fc7942d64
Refactor osgMyGUI::OSGTexture to store width/height inside the object
2017-03-01 19:04:05 +01:00
scrawl
d8505e4f48
Fix a multithreading crash caused by modification of live Geometry
2017-03-01 03:36:04 +01:00
scrawl
4e0011bfc8
Improve NPC loading performance by caching the cleaned objectRoot
2017-03-01 03:00:49 +01:00
scrawl
058681ad73
ShaderVisitor: avoid reset of rig geometry when not required
2017-03-01 03:00:08 +01:00
scrawl
1402e0b872
Don't optimize billboard nodes ( Fixes #3774 )
2017-02-27 00:39:35 +01:00
scrawl
706ac45c76
Fix missing particles caused by shallow copy of ParticleSystemController
2017-02-26 23:10:41 +01:00
scrawl
9b27ec4945
Remove redundant and ambiguous NiNode::makeBone()
...
Ambiguous because a skeleton can have multiple skinned meshes, with their own bone weights/bind matrix each.
2017-02-26 22:39:23 +01:00
scrawl
aba3c471a9
nifloader: fix setting of dataVariance for non-controlled bones and refactor the code
2017-02-26 22:34:45 +01:00
scrawl
5caf53b6a3
optimizer: avoid reordering nodes
...
Fixes an osgParticle cloning issue.
(Fixes #3773 )
2017-02-26 03:25:17 +01:00
scrawl
a95773beef
Fix unnecessary copy of ParticleSystem in SceneUtil::CopyOp
2017-02-26 03:15:57 +01:00
scrawl
585524805f
Add 'tri ' variant of part filters to optimizer ignore list
2017-02-25 21:48:07 +01:00
scrawl
48e0f098ff
Add missing copy of callbacks when a Transform is replaced by Group
...
(Fixes #3770 )
2017-02-24 07:38:03 +01:00
scrawl
330e5fefd1
optimizer: consider a Group with more than one child redundant as well
...
While there could be some value in this hierarchy (i.e. improved culling), we don't know if this is being used sensibly; and using a 'flat' hierarchy helps other optimizations.
2017-02-24 02:58:41 +01:00
scrawl
75677f03e7
Remove SceneManager::notifyAttached
2017-02-24 02:58:41 +01:00
scrawl
3df7a8c4d8
Avoid FLATTEN_STATIC_TRANSFORMS optimization for non-Geometry drawables
2017-02-24 02:58:41 +01:00
scrawl
e4c12e5e56
optimizer: don't merge Geometry that has transparency sorting enabled
2017-02-24 02:58:27 +01:00
scrawl
ebfd845eae
optimizer: run MERGE_GEOMETRY after removing redundant nodes
2017-02-23 23:28:50 +01:00
scrawl
43f31d6e54
optimizer: fix MERGE_GEOMETRY to work with Geometries not attached to a Geode
2017-02-23 23:28:50 +01:00
scrawl
f2a323238f
optimizer: merge groups as part of REMOVE_REDUNDANT_NODES
2017-02-23 23:28:50 +01:00
scrawl
af716d4b61
optimizer: remove hardcoded condition in RemoveRedundantNodesVisitor
2017-02-23 23:28:50 +01:00
scrawl
698738c649
optimizer: use asXYZ() instead of dynamic_cast
2017-02-23 23:28:50 +01:00
scrawl
f7cb4bd245
optimizer: remove some cruft
2017-02-23 23:28:50 +01:00
scrawl
e33829d493
Add fork of osgUtil::Optimizer with backported fixes that have not been released yet
...
Remove optimizers that won't be used.
2017-02-23 23:28:50 +01:00
scrawl
5e2335f250
Use the osgUtil::Optimizer post loading in the SceneManager
2017-02-23 23:28:50 +01:00
scrawl
305cccd263
Don't print Geometry data (vertices, triangles, etc.) in showscenegraph
2017-02-23 23:28:50 +01:00
scrawl
4e5a1e6123
nifloader: improve setting of DataVariance
2017-02-23 23:28:50 +01:00
scrawl
1d6b5b2a52
Add StringUtils::CiComp operator
2017-02-23 23:28:50 +01:00
scrawl
6e996bf2a3
Create TriShapes with an identity transform as a Group
2017-02-23 23:28:50 +01:00
scrawl
6e5d9efa93
Remove NifLoader::optimize, to be replaced with something better
2017-02-23 23:28:50 +01:00
scrawl
c231b06320
Remove boneOffset node after using it
2017-02-23 23:28:50 +01:00
scrawl
d75a3fd0fb
Add SharedStateManager to the stats panel
2017-02-23 23:28:49 +01:00
scrawl
8f79fa3d72
Add resource statistics panel opened with F4
2017-02-22 14:28:45 +01:00
scrawl
3693f05ef5
Transform world-space particle systems in update callback so that animations are accounted for
2017-02-21 23:27:20 +01:00
scrawl
c45013c983
Fix particle systems not being rendered in their first frame
2017-02-21 18:15:30 +01:00
scrawl
4aa40d16bc
Increase the importance of light radius when sorting lights (Bug #2759 )
2017-02-21 04:32:59 +01:00
scrawl
3f27c8cc97
Always print context for script warnings to remove the need for verbose option
...
(Fixes #2813 )
2017-02-21 04:32:59 +01:00
scrawl
3b24bb9a5e
Use OS X cursor workaround for GL_VENDOR ATI and add an environment variable for control
2017-02-19 13:46:40 +01:00
scrawl
aa8459b5c7
Revert "Remove redundant allocations for NIF meshes"
...
This reverts commit a7c5beb7c5
2017-02-18 02:33:41 +01:00
scrawl
6a37909ee7
Revert "Fix race conditions caused by Array <-> GLBufferObject interactions (Bug #3580 )"
...
This reverts commit 115e563a7a
2017-02-18 02:33:41 +01:00
scrawl
57b585570a
Preload magic effect visuals of the player's selected weapon/spell
2017-02-15 21:01:25 +01:00
scrawl
ddd6605608
Move WNAM out of LandData to avoid redundant (de)allocations on startup
2017-02-14 07:58:16 +01:00
scrawl
e00b420f68
Move saving of LandData into Land::save
2017-02-14 07:58:16 +01:00
scrawl
325bf66653
Return const Land in ESMStore
2017-02-14 07:58:16 +01:00
Marc Zinnschlag
93c5630e02
Merge remote-tracking branch 'matahualpa/openmw-cs_tablecontents'
2017-02-13 10:06:08 +01:00
scrawl
892d1b162d
nifloader: ignore nodes named 'bounding box' ( Fixes #3650 )
2017-02-12 15:44:09 +01:00
MAtahualpa
b4ef9e2314
Update loadbook.cpp
2017-02-12 13:53:10 +01:00
MAtahualpa
5a58ab1837
Update loadbook.hpp
2017-02-12 13:52:36 +01:00
scrawl
bbcba57495
Disable hitAttemptActorId saving code for now
2017-02-10 06:26:32 +01:00
scrawl
2ea0db1d1a
Merge pull request #1198 from Allofich/combat
...
Make combat engagement logic more like vanilla
2017-02-10 06:20:04 +01:00
scrawl
67e4a7e37b
Change some osg::clone's to direct copy constructor to avoid dynamic_cast overhead
2017-02-09 04:51:20 +01:00
scrawl
d141b98f0c
Add base animations to preloadCommonAssets
2017-02-09 03:32:40 +01:00
scrawl
839928e210
Fix light data being reset for the wrong light
2017-02-09 02:46:30 +01:00
scrawl
a46593fa74
Add PreloadItem::abort() to avoid no longer required cells from blocking the work thread
2017-02-09 01:08:07 +01:00
scrawl
d3e1dbe920
Fix race conditions in terrain loader caused by static variables
2017-02-09 00:53:48 +01:00
scrawl
4d53ab6c32
nifloader: attempt to remove redundant root node when a Skeleton is added
2017-02-08 20:04:17 +01:00
scrawl
2a42c4781e
nifloader: override animflags instead of accumulating them
2017-02-08 19:53:02 +01:00
scrawl
0187f2ce4c
nifloader: combine animFlags and particleFlags (Bug #2100 )
2017-02-08 19:53:02 +01:00
scrawl
bccfd6cef8
nifloader: handle textures with no image that are later assigned in a FlipController
...
As found in vurt's trees (Bug #2100 )
2017-02-08 19:52:33 +01:00
scrawl
792f505b2a
Fix potential crash in ShaderVisitor for textures with no image assigned
2017-02-08 19:16:07 +01:00
scrawl
45ae8d5ffa
Add support for GL_AMBIENT colorMode to shaders as required by particle systems
2017-02-08 18:39:24 +01:00
scrawl
c00532d82d
Add LightStateCache to avoid redundantly setting the same gl_Light
...
Normally, osg::State would do this for us (via lastAppliedAttribute), but since we're using a custom StateAttribute to apply all lights at once, we have to track ourselves.
Further reduction of GL calls in a typical scene by ~2%
2017-02-07 23:37:57 +01:00
scrawl
4d4dc1b9c1
Add specialized DisableLight state attribute for more efficient undoing of light state
...
Seems to reduce # of GL calls by 10-15% in a typical scene.
2017-02-07 23:01:36 +01:00
Allofich
5d2090684a
Store mHitAttemptActorId in save files
2017-02-07 01:26:26 +09:00
scrawl
a1069dce3c
Change UnrefQueue to accept osg::Referenced instead of osg::Object
2017-02-04 02:24:42 +01:00
scrawl
33e654f94d
Add explicit handling of most commonly used nodes to NodeVisitors to avoid excessive virtual function calls
2017-02-04 02:16:26 +01:00
scrawl
c95868969b
Early out for scene graphs with no update callbacks in SceneManager::notifyAttached
2017-02-04 01:22:43 +01:00
scrawl
767eba941f
Speed up finding of attachment node by using the cached nodeMap
2017-02-03 23:15:37 +01:00
scrawl
a76d693627
Speed up ControllerVisitor by skipping sub graphs that have no ChildrenRequiringUpdateTraversal()
2017-02-03 23:10:14 +01:00
scrawl
30b101b175
Fix build error in OSG_USE_FLOAT_MATRIX=OFF mode due to a double implicit conversion to double (pun doubly intended)
2017-02-03 06:49:34 +01:00
scrawl
b4a6b6387b
Create own instance of osgDB::SharedStateManager so we control when to call prune()
...
prune() is now called in the background thread, just like the resource cache update.
Seems to improve performance by ~0.3 ms/frame
2017-02-03 03:27:12 +01:00
scrawl
84a92e665c
Improve performance in RigGeometry by optimizing for the most common case of identity geomToSkelMatrix
2017-02-03 02:18:44 +01:00
scrawl
f3045331f1
Fix regression in handling of NiZBufferProperty
2017-02-03 01:49:49 +01:00
scrawl
53e4db8a8f
Add dummy serializer for CameraRelativeTransform to allow serializing content of Sky Root
2017-02-02 21:57:18 +01:00
scrawl
c5f8ff6e0e
Add names to several nodes for debugging purposes
2017-02-02 21:49:52 +01:00
scrawl
851f61ac82
Always assign osg::Material when a material controller is used
2017-02-01 21:10:43 +01:00
scrawl
9180089a3b
Add sharing for more State Attributes, most notably BlendFunc and AlphaFunc, to improve the state tracking in osg::State and reduce the number of GL calls
2017-02-01 06:00:14 +01:00
scrawl
960d4a96c3
Reduce the number of osg::Material state by setting the default state on the graph root
2017-02-01 06:00:14 +01:00
scrawl
e399e10607
Add missing lock in shareMaterial
2017-02-01 06:00:14 +01:00
scrawl
34deb6e7b1
Add 'showSceneGraph' command to export the scene or a particular object to .osgt for debugging purposes
2017-02-01 06:00:14 +01:00
scrawl
e90941a8b3
Wrap the scene template reference in another object for const correctness and to avoid it from being serialized with the osgDB serializer
2017-02-01 06:00:14 +01:00
Allofich
0f20312012
Fix MSVC warnings
2017-01-28 04:37:47 +09:00
scrawl
115e563a7a
Fix race conditions caused by Array <-> GLBufferObject interactions (Bug #3580 )
...
The first part of the fix is to assign VBO/EBO's upon loading the array in the Nif reader. This avoids triggering the 'addVertexBufferObjectIfRequired' code path in osg::Geometry which has the race condition when two threads add the same Array at the same time. Essentially, we want the Arrays to be 'const' when they come out of the Nif reader.
The second part of the fix is to make sure not to create empty arrays in the Nif reader (importantly, not assigning a VBO to the empty array). This empty array would be deleted when the NIFFile is cleaned up, and the detachment of the VBO assigned to it (which is still in use by other arrays) would cause threading issues.
This rare crash bug was first introduced with commit a7c5beb7c5
2017-01-19 22:23:41 +01:00
scrawl
ac61535d2c
optimize OSGVertexBuffer by double buffering the vertex array instead of recreating it on every modification
2017-01-19 03:19:17 +01:00
Leon Krieg
170e723cc7
Handle SDL event 0x304 by doing nothing ( #3670 )
2016-12-17 12:51:11 +01:00
scrawl
eae35af13d
Check if the bounding box changed before calling dirtyBound()
2016-12-17 00:23:22 +01:00
scrawl
aafff1deb6
Fix memory leak
2016-12-16 20:40:15 +01:00
scrawl
cca75499ee
Clear the Skeleton's bone cache when a node is added/removed ( Fixes #3663 )
2016-12-16 20:09:20 +01:00
scrawl
c0faeea938
RigGeometry check if mesh has normals ( Fixes #3667 )
2016-12-15 22:39:21 +01:00
Aussiemon
369272fc70
Handle SDL event 0x302 by doing nothing
2016-12-14 21:08:20 -07:00
mrohrlach
f0f78c9d64
Slight adjustments to disintegration fix
2016-12-09 19:55:26 -07:00
mrohrlach
9624d8aade
Added new method and variable to track float remainders of disintegration effections
2016-12-09 19:48:56 -07:00
MiroslavR
99bcf47167
Implement NiSphericalCollider ( Closes #3644 )
2016-12-06 01:32:13 +01:00
scrawl
5297d7b5be
Merge pull request #1137 from nikolaykasyanov/osx-structure
...
[macOS] Move all resources files inside application bundles (fixes #3566 )
2016-11-25 02:51:32 +01:00
Nikolay Kasyanov
db69342b5d
[macOS] Move all configs & resources into app bundles
...
Fixes #3566 (https://bugs.openmw.org/issues/3566 ).
2016-11-23 22:32:54 +01:00
scrawl
505250f6ec
Do not use architecture dependent type size_t in esm format ( Fixes #3633 )
2016-11-22 15:47:06 +01:00
scrawl
9d125bcaa2
Merge pull request #1129 from PhillipAnd/phillipand-cmake-fix
...
Fix various build issues with Visual Studio environment
2016-11-17 18:25:23 +01:00
Phillip Andrews
c18fc113e5
Changed missing library dependencies to simple fix
2016-11-14 00:01:22 -06:00
Allofich
3420121c3f
Fix shadowing warnings
2016-11-13 23:20:51 +09:00
Allofich
125e94ef0e
Fix shadowing warnings
2016-10-31 00:39:31 +09:00
Assumeru
f6ef1ce276
Fix Calm/Frenzy/Demoralize/Rally Creature weakness and resistance
2016-10-25 15:42:37 +02:00
MiroslavR
301dd77efb
Save controls state ( Fixes #3598 )
2016-10-20 02:12:01 +02:00
MiroslavR
11565b5966
Make actors with non-portable lights in inventory glow ( Closes #2042 , #3338 )
2016-10-08 23:17:12 +02:00
scrawl
5c94e2324f
Add missing use plugin macro for static build
2016-10-08 19:20:44 +02:00
Allofich
f6f16b68de
Don't let Weakness to Magicka affect paralysis
2016-10-08 17:56:12 +09:00
scrawl
37bfa88b2d
Merge pull request #1094 from Allofich/alchemy
...
Fix reversed use of alembics and retorts
2016-10-06 19:02:24 +02:00
Allofich
498976775a
Fix reversed use of alembics and retorts
2016-10-07 01:38:50 +09:00
scrawl
0c981b6fe5
Fix typo in script opcode ( Fixes #3583 )
2016-10-06 17:36:50 +02:00
Allofich
6ec37b5cfb
Fix shadowing warnings
2016-10-02 17:48:54 +09:00
scrawl
cd4b182091
Merge pull request #1051 from Allofich/textures
...
Use spell effect particle textures
2016-09-18 22:37:14 +02:00
Allofich
a8e9f2df67
Cleanup
2016-09-19 05:20:04 +09:00
Allofich
be96ff1fd1
Remove redundant parameter
2016-09-18 01:57:47 +09:00
scrawl
8f5347b79b
Update comment, osgAnimation::RigGeometry is no longer used
2016-09-17 18:31:39 +02:00
MiroslavR
55e670c5fe
Fix animation state not saving
...
References with animation state changed but otherwise identical to their content file counterparts
were previously considered unchanged and thus dropped while saving.
2016-09-15 16:11:54 +02:00
Allofich
a033ba3bd2
Override spell textures by NiTexturingProperty
2016-09-14 23:03:04 +09:00
emlai
fd2281e825
Fix typo
2016-09-10 21:25:28 +03:00
scrawl
4322e76cb6
Fix shadowing warnings
2016-08-29 12:38:24 +02:00
scrawl
a5da3a269e
Fix shadowing warnings
2016-08-29 12:20:00 +02:00
scrawl
c968ebee96
Merge pull request #1033 from Allofich/warnings
...
Remove unnecessary destructor
2016-08-22 14:44:57 +02:00
Allofich
73463cd12f
Remove unnecessary virtual destructor
2016-08-22 21:34:57 +09:00
scrawl
f92560986e
Merge pull request #1031 from kpp/fix_uninitiaized_escape_hash_filter
...
Fix uninitialized escape_hash_filter
2016-08-21 22:56:31 +02:00
Allofich
8c5aae0722
Add virtual destructors
2016-08-21 18:31:46 +09:00
Roman Proskuryakov
416466e53e
Fix uninitialized escape_hash_filter
2016-08-19 21:13:38 +03:00
scrawl
341e3846c0
Use initial particle state to compute the initial bounding box ( Fixes #3500 )
2016-08-16 23:28:03 +02:00
scrawl
dda5bfbc9f
CharacterPreview no longer depends on osgViewer
2016-08-16 22:47:45 +02:00
scrawl
641005b317
Remove Camera's children before removing the Camera
...
Should work around OSG race condition ( http://forum.openscenegraph.org/viewtopic.php?t=16077 )
2016-08-15 18:12:46 +02:00
scrawl
a44ba0e461
Merge pull request #966 from kpp/find_mygui
...
Find mygui
2016-08-15 16:36:48 +02:00
Roman Proskuryakov
4cffdb67d8
Uses case-sensitive MyGUI_* variables
2016-08-15 15:59:02 +03:00
scrawl
513e1da8a3
Remove unneeded casts
2016-08-14 16:44:11 +02:00
scrawl
33d27a2285
Use ref_ptr
2016-08-14 16:41:33 +02:00
scrawl
2f6075329b
Clang warning fixes
2016-08-14 15:10:50 +02:00
scrawl
46538b9438
Merge pull request #1011 from devnexen/master
...
Mainly making compilable under OpenBSD.
2016-08-07 20:34:03 +02:00
Marc Zinnschlag
aa1ed9b172
Merge remote-tracking branch 'aesylwinn/RenderWater'
2016-08-07 17:03:58 +02:00
David Carlier
83bab29e4b
Mainly making compilable under OpenBSD.
...
Renaming one resource file as the space led to issue for qt/moc.
2016-08-06 19:00:27 +01:00
Aesylwinn
5753f52b47
Move water mesh + simple state generation to components library.
2016-08-05 13:25:05 -04:00
MiroslavR
b65f379b7f
Save scripted animation state ( Fixes #1931 , #2150 , #3393 )
2016-08-03 03:52:35 +02:00
Marc Zinnschlag
63fd1e8df7
Merge remote-tracking branch 'origin/master'
2016-07-27 15:49:11 +02:00
AnyOldName3
a0699ce20d
Change some <> characters to double quotes, resolving compilation problems.
2016-07-27 01:19:05 +01:00
AnyOldName3
20f73f4a32
Relocate escape-related code to new files escape.hpp and escape.cpp.
2016-07-27 00:58:31 +01:00
MiroslavR
d790747389
Implement deletion of moved references (Bug #3471 )
2016-07-22 01:59:02 +02:00
AnyOldName3
7243583963
Change a switch to a series of if/else if/.../else, hopefully resolving compilation issues on OSX and Linux.
2016-07-21 01:36:14 +01:00
AnyOldName3
2b829f7f7b
Move some stuff to a header, removing the need for a dodgy hack.
2016-07-21 01:07:25 +01:00
AnyOldName3
becc053555
Trick the software into building by using what I assume is a really dirty hack.
2016-07-21 00:16:00 +01:00
AnyOldName3
519fbab864
Remove useless print
2016-07-20 23:18:09 +01:00
AnyOldName3
32f0ded8f6
Fix bug in unescape filter, but still manage not to fix build issue.
2016-07-20 23:15:44 +01:00
AnyOldName3
423919abb5
Make it not build again (but theoretically enable the desired functionality).
2016-07-20 15:19:34 +01:00
AnyOldName3
59639e3988
Make it build again (but remove the new functionality).
2016-07-20 15:16:53 +01:00
AnyOldName3
d9d5a6561b
Adjust the code so that it should (maybe) work, changing the compilation error to a less straighforward one.
2016-07-20 14:50:34 +01:00
AnyOldName3
95d2c7ea5c
Attempt to unescape characters when constructing file paths, introducing compilation errors.
2016-07-20 02:48:57 +01:00
Marc Zinnschlag
c17e1ca24a
Merge remote-tracking branch 'anyoldname3/ignore-hash-test'
2016-07-19 16:19:28 +02:00
MiroslavR
721fa28c1e
Fix assertion failure with NiTextureEffect missing source texture
2016-07-16 18:59:18 +02:00
AnyOldName3
f1b5ad5804
Remove unused unsafe function and properly remove inheritance from std::string, providing implementations of missing stream operators preventing boost reading and writing to escape strings.
2016-07-12 17:09:57 +01:00
AnyOldName3
e6f78ae5b7
Switch indentation to spaces to remain consistent with the rest of the project
2016-07-12 01:06:57 +01:00
AnyOldName3
08df463c94
Separate declaration and definition of some static members to hopefully calm Travis down.
2016-07-12 00:37:08 +01:00
AnyOldName3
7475d90693
Fix dodgy include by changing backslashes to forwardslashes
2016-07-12 00:14:19 +01:00
AnyOldName3
5121e77a95
Remove the cause of a warning which upset Travis (but not the thing that made the Travis build fail, as I have no idea why it wouldn't work or how to fix it
2016-07-12 00:00:29 +01:00
AnyOldName3
1a0642f1db
Make it work by realising that what boost::program_options calls validation is what any sane person would regard as parsing
2016-07-11 22:33:15 +01:00
AnyOldName3
195dd27780
Resolve obvious runtime error revealing more subtle one
2016-07-11 22:05:38 +01:00
MiroslavR
9c6739f1b3
Fix doubled particle spawn range
2016-07-11 22:40:58 +02:00
AnyOldName3
fbe6dc9704
Change compilation error to runtime exception and decide that inheriting from std::string may have been a bad idea in C++
2016-07-11 21:33:36 +01:00
AnyOldName3
7697406467
Partially fix '2 overloads have similar conversions' compilation error
2016-07-11 14:39:38 +01:00
AnyOldName3
2a9b12bb3f
Fix an issue preventing compilation, revealing another that doesn't make much sense.
2016-07-11 14:15:35 +01:00
AnyOldName3
c1ffc9e776
Remove a compilation error and set up framework to remove the others
2016-07-11 01:59:16 +01:00
AnyOldName3
e17e354e84
Make # only start a comment in openmw.cfg if it starts a line and introduct compilation errors
2016-07-11 01:16:32 +01:00
MiroslavR
2a987b6857
Do not skip inactive keyframe controllers (Bug #1942 )
2016-07-10 19:02:28 +02:00
scrawl
9375cbea44
Make NIFFilePtr const
2016-07-10 17:10:19 +02:00
scrawl
da0e20edcd
Merge pull request #991 from MiroslavR/opface
...
Implement Face instruction (Feature #1424 )
2016-07-10 02:10:23 +02:00
MiroslavR
f6f3f71db5
Improve format specifiers for message boxes
2016-07-09 03:18:45 +02:00
MiroslavR
dc0bc5b68c
Implement Face instruction (Feature #1424 )
2016-07-09 02:16:47 +02:00
scrawl
8f62ea2e80
Fix for "RigGeometry rendering with no skeleton" errors
2016-07-02 20:19:55 +02:00
scrawl
b9b73d7b12
Replace "sys::default" with ESM::CellId::sDefaultWorldspace
2016-07-02 19:48:11 +02:00
scrawl
d5f497c47d
Pass the node path instead of the node visitor
2016-07-02 19:27:19 +02:00
scrawl
6fa95e72c5
Pass the traversal number instead of the node visitor
2016-07-02 19:26:11 +02:00
MiroslavR
54f52f7bae
Implement effect removal for abilities ( Fixes #3455 )
2016-07-01 18:50:28 +02:00
MiroslavR
b99611a730
Initialize mSpecIncreases in ESM::NpcStats::load
2016-06-26 15:16:32 +02:00
MiroslavR
dfc62c99b4
Show correct class image in level-up dialog ( Fixes #3443 )
2016-06-26 03:22:58 +02:00
scrawl
824cd3be22
Do not set _boundingBoxComputed which is no longer used
2016-06-14 22:25:25 +02:00
scrawl
372f2e2f18
Merge pull request #962 from Allofich/AIPackageFixes
...
Duration fixes for Follow and Escort
2016-06-14 20:47:32 +02:00
Allofich
3bebbab78e
Duration fixes for Follow and Escort
2016-06-15 02:11:30 +09:00
scrawl
197e81206a
Assume mDeathAnimationFinished is true for older save files
2016-06-12 19:46:00 +02:00
scrawl
a825882c6b
Process death events at the end of the death animation ( Fixes #1873 )
2016-06-12 00:04:50 +02:00
scrawl
cb8daaaee1
Do not query the texture's image in osgMyGUI::OSGTexture
...
Doing so could result in a race condition if the draw thread is about to delete the image (UnRefImageDataAfterApply enabled)
2016-06-11 18:26:20 +02:00
Allofich
55ac1fab68
Change Wander duration to run on a counter
2016-06-10 04:36:18 +09:00
Marc Zinnschlag
b079db7913
Merge remote-tracking branch 'aesylwinn/EditPathgrid'
2016-06-07 08:35:16 +02:00
Roman Proskuryakov
3bcd23022a
Rewrites FindBullet using LibFindMacros handling version properly
2016-05-31 07:18:37 +03:00
Aesylwinn
b83f522ecd
Changes to color scheme, slight change to drag indicator,
...
change tooltip description.
2016-05-29 13:26:29 -04:00
Aesylwinn
564d0db68c
Move pathgrid abstraction handling to save code.
2016-05-26 22:11:27 -04:00
scrawl
3749821809
Choose a random death animation for actors that start the game as dead ( Fixes #3397 )
2016-05-19 21:40:05 +02:00
Aesylwinn
1781aaaa27
Drag indicator.
2016-05-18 12:17:26 -04:00
scrawl
04b537bf5f
Minor cleanup
2016-05-15 16:38:04 +02:00
scrawl
85b0c4393b
Remove obsolete code
2016-05-15 16:37:22 +02:00
scrawl
6e0c3b2413
Revert commit 16ac6e7aac ( Fixes #3394 )
2016-05-15 16:28:04 +02:00
scrawl
62018e802b
Minor fix to particle system AutoPlay flag handling
...
The previous commit broke some magic effects (e.g. shield). The controller's emit start/stop times should control the emitter, while the absence of the ParticleSystem's autoplay flag should freeze the whole particle system if no valid controller source gets assigned. This revised version works for both the Shield effect and the "dagoth ur death sparkles" effect.
2016-05-14 22:55:14 +02:00
scrawl
7202072196
Freeze particle systems on construction if the AutoPlay flag is missing
2016-05-14 22:38:49 +02:00
scrawl
0c08f705c5
Make the ParticleSystemController freeze the particle system instead of the emitter (Bug #3390 )
2016-05-14 22:36:53 +02:00
scrawl
e30bb31a79
Handle the particle node's AutoPlay flag (Bug #3390 )
2016-05-14 22:35:34 +02:00
Aesylwinn
32ba5bf8b8
Initial pathgrid editting, support for selection and movement.
2016-05-12 19:35:49 -04:00
scrawl
fcbcc004a3
Don't use unordered_map
2016-05-11 02:35:17 +02:00
scrawl
17a0353a85
Fix forward declaration mismatch
2016-05-10 17:36:25 +02:00
scrawl
a7e6219091
Merge pull request #939 from kpp/rewrite_esm_name_t
...
Rewrite ESM::NAME_T
2016-05-08 13:15:05 +02:00
Marc Zinnschlag
b4e341e1e2
Merge remote-tracking branch 'aesylwinn/RenderPathgrid'
2016-05-08 10:15:12 +02:00
Roman Proskuryakov
d5dfa89060
Rewrite NAME_T into FIXED_STRING.
2016-05-07 23:27:33 +03:00
Roman Proskuryakov
1e7d573f24
Fix uninitialized values in ESMWriter::save
2016-05-07 20:40:21 +03:00
Aesylwinn
14ae232938
Remove now unnecessary factory class.
...
It was originally used for storing normals, but that functionality
was removed.
2016-05-03 16:13:23 -04:00
Aesylwinn
b11f5b2717
Make edges differently colored.
2016-05-03 15:06:28 -04:00
Aesylwinn
0eb863d8fc
Change color to blue to match the pathgrid visibility selector in the
...
editor and slightly increase the scaling.
2016-05-03 03:29:34 -04:00
Aesylwinn
7f0cc6e583
Add a color gradiant to pathgrid nodes to make them less of an eyesore.
2016-05-03 03:29:30 -04:00
Aesylwinn
3d26ff08c4
Get rid of lighting.
2016-05-03 03:29:07 -04:00
Aesylwinn
d141672b53
Pathgrid geometry creator
2016-05-02 22:09:48 -04:00
scrawl
5f34fb0c41
Remove call to MYGUI_DBG_BREAK which was removed in mygui-git
2016-04-20 11:37:48 +02:00
scrawl
f3e9fd49f3
Don't add the autodetected mw path in global config file
...
The wizard takes care of detecting the MW installation path already. By having this path permanently in the global cfg-file, there exists no way to *not* use an autodetected installation, which is a problem.
2016-04-17 17:17:07 +02:00
scrawl
2f8be401cc
Add the unref work items to the front of the workqueue (Bug #3273 )
...
Ensures that memory still gets freed even if the workqueue is overloaded.
2016-03-29 00:27:56 +02:00
scrawl
bc36269617
When a controller is present more than once in the same keyframe file, pick the first one ( Fixes #2719 )
2016-03-26 14:59:49 +01:00
scrawl
8052225460
Remove leftover call to setTexCoordArrayList
2016-03-23 22:56:04 +01:00
scrawl
cc0afe901f
Store a pointer to tangents array to avoid potential type casting issue
2016-03-23 17:03:04 +01:00
scrawl
d1f6169889
Add special handling of RigGeometry tangents in ShaderVisitor
2016-03-23 16:48:41 +01:00
scrawl
95e80e7eff
RigGeometry: don't directly modify the primitive set list
...
This is to ensure that an element buffer object will be assigned to the primitive sets if necessary.
2016-03-23 00:10:22 +01:00
scrawl
c73ec71123
Revert "Store the RigGeometry's source vertices and normals directly"
...
This reverts commit 7a347e3483
2016-03-22 23:28:57 +01:00
scrawl
60c8c4fdda
Revert "Animate tangents in RigGeometry"
...
This reverts commit 9cf963b751
2016-03-22 23:28:52 +01:00
scrawl
9cf963b751
Animate tangents in RigGeometry
2016-03-22 22:14:35 +01:00
scrawl
7a347e3483
Store the RigGeometry's source vertices and normals directly
2016-03-22 22:01:56 +01:00
scrawl
6f31b3d79f
Add parallax mapping for objects
2016-03-22 21:46:15 +01:00
scrawl
df6fd5f206
Recognize normalHeightMap in the ShaderVisitor
2016-03-22 21:46:15 +01:00
scrawl
157c11398d
Add terrain parallax mapping
2016-03-22 21:46:15 +01:00
scrawl
24ae9f4ac1
Remove no longer needed apply(Geode&) in SetFilterSettingsVisitor and NodeToShapeVisitor
...
In OSG 3.4 (which is now a requirement), Drawables are normal Nodes attached in the scene graph. Geode is still provided for backwards compatibility, but does not need to be specially handled here because it now functions just like a normal Group node.
2016-03-14 00:38:22 +01:00
scrawl
e8caafa190
Remove no longer needed applyEffect(osgFX::Effect&) in SetFilterSettingsVisitor
...
No longer needed because terrain texture filtering is now updated manually in TerrainGrid::updateTextureFiltering.
2016-03-14 00:31:43 +01:00
scrawl
d7c7bb850b
ToggleAI cleanup
2016-03-12 20:32:42 +01:00
scrawl
d986b1a48b
Add comment
2016-03-11 19:28:53 +01:00
scrawl
1abb77f8a1
Cleanup
2016-03-11 19:18:51 +01:00
scrawl
9f03982e0b
Use a dedicated VBO for RigGeometry's vertices and normals
...
The VBO used by the source geometry's arrays may be unintentionally shared with other RigGeometries.
The vertices and normals are the only attributes that are modified at all, so using a dedicated VBO for these should improve performance further.
2016-03-11 19:08:48 +01:00
scrawl
50b8260a39
Disable VBOs in RigGeometry while investigating a crash possibly related to commit cda8a88f0d
2016-03-11 18:21:55 +01:00
scrawl
aae43dbff5
Set the MorphGeometry vertex buffer object usage to GL_DYNAMIC_DRAW
2016-03-11 16:10:39 +01:00
scrawl
4eb090a8d0
Set the RigGeometry vertex buffer object usage to GL_DYNAMIC_DRAW
2016-03-11 16:09:48 +01:00
scrawl
174dd82894
Manually apply the osg::Light state
...
Reduce the amount of virtual function calls. Don't use the osg::Light's lightNum. Don't set spotlight state that we're not using (yet).
2016-03-11 15:43:20 +01:00
scrawl
58e0e8bd4e
Enable vertex buffer objects in RigGeometry
2016-03-11 01:39:09 +01:00
scrawl
0dbf44b414
Enable vertex buffer objects in MyGUI RenderManager now that OSG 3.4 is a dependency
2016-03-11 01:35:57 +01:00
scrawl
3f08cbff71
Share the state attributes for terrain techniques
...
Reduces the total amount of GL calls / frame by about 14% - 50% depending on the scene.
2016-03-11 01:08:53 +01:00
scrawl
84b8da7a09
Share the osg::Material on drawables
...
Reduces the number of GL calls / frame by ~4%.
2016-03-11 01:06:54 +01:00
scrawl
abcfe9bcee
Don't add empty text key objects
2016-03-10 17:01:14 +01:00
scrawl
02d23564dc
Include cleanup
2016-03-10 14:29:45 +01:00
scrawl
f898bf493f
Don't use Geodes
2016-03-10 13:17:01 +01:00
scrawl
137dde7cf8
Include cleanup
2016-03-10 12:59:17 +01:00
scrawl
121bdd3e39
Update comment
2016-03-07 22:46:15 +01:00
scrawl
3e6cf17665
Warn about cellrefs with an empty refId (Bug #3238 )
2016-03-07 22:44:03 +01:00
scrawl
0df975a4d7
Properly detach nodes in CopyRigVisitor ( Fixes #3234 )
2016-03-06 11:33:07 +01:00
scrawl
82b792f808
Eliminate dynamic_cast in BillboardCallback
2016-03-05 20:02:33 +01:00
scrawl
2eaf96e3bf
Make ResourceManager destructor virtual
2016-03-02 21:58:11 +01:00
scrawl
dd2fbfc0a2
Fix windows build
2016-03-02 21:57:25 +01:00
scrawl
3d6323f13a
Force-enable hasWater() for exterior cells ( Fixes #3222 )
2016-03-02 17:02:30 +01:00
scrawl
563807ee53
Share the StateSet used to invert front face
2016-03-02 13:33:44 +01:00
scrawl
6e7c6fdd7e
Implement NiTexturingProperty::DecalTexture
2016-03-01 18:41:36 +01:00
scrawl
30d06bfe0e
Add comment
2016-03-01 17:27:54 +01:00
scrawl
64636bd85a
Improve error reporting
2016-03-01 17:05:02 +01:00
scrawl
2821f46a18
Corpse clearing fix
2016-03-01 11:31:08 +01:00
scrawl
8791063110
Fix "RigGeometry rendering with no skeleton" warnings in rare cases
2016-02-29 18:20:56 +01:00
scrawl
1e5b4bea0a
Don't create an unnecessary osg::Group when copying over a rig
2016-02-29 17:50:18 +01:00
scrawl
27577ce765
Add ESM::Land::DEFAULT_HEIGHT
2016-02-28 16:49:18 +01:00
Marc Zinnschlag
ebaeabc962
Merge remote-tracking branch 'scrawl/respawn'
2016-02-28 10:19:14 +01:00
scrawl
3a2dccad4b
Implement 'Show' script instruction
2016-02-27 13:40:53 +01:00
scrawl
c3ef387208
Vanilla-compatible creature/NPC respawning ( Fixes #2369 , Fixes #2467 )
2016-02-27 12:53:07 +01:00
scrawl
f99cd15f00
Vanilla-compatible activate / onActivate ( Fixes #1629 )
...
See https://forum.openmw.org/viewtopic.php?f=6&t=3074&p=34618#p34635
2016-02-26 13:08:35 +01:00
scrawl
195c3b9967
Merge pull request #904 from sandstranger/disable_opengles_anddroid
...
disable opengl es for Android by default
2016-02-25 21:39:25 +01:00
scrawl
cdccf03228
Fix mismatched delete
2016-02-25 21:32:42 +01:00
sandstranger
a7b78b37f5
disable opengles for Android by default
2016-02-25 22:39:18 +03:00
scrawl
5f4ace1bc2
Implement support for sphere map NiTextureEffects ( Fixes #1827 )
2016-02-24 21:06:41 +01:00
scrawl
062410bd8c
Don't incorrectly remove TexEnv state
2016-02-23 10:56:18 +01:00
scrawl
90a99991d1
Use empty() instead of !size()
2016-02-22 19:06:12 +01:00
scrawl
8bd16e4d5a
Don't compute the world matrix multiple times
2016-02-22 18:58:19 +01:00
scrawl
055d35a2b0
Revert "Warn about particle emitters that have multiple parent node paths"
...
Not working correctly because osg won't ignore camera nodes.
This reverts commit 1667c807be
2016-02-22 18:10:25 +01:00
scrawl
1667c807be
Warn about particle emitters that have multiple parent node paths
2016-02-22 15:21:06 +01:00
Marc Zinnschlag
f9f91d5386
Merge remote-tracking branch 'origin/master'
2016-02-21 09:01:17 +01:00
scrawl
cee608e31b
Make it work with appveyor's outdated OSG build
2016-02-21 01:41:50 +01:00
scrawl
8e826eefe6
Add missing initialization
2016-02-21 01:26:45 +01:00
scrawl
e25e0a0600
ShaderVisitor: assume the first texture unit is the diffuseMap
2016-02-20 23:47:32 +01:00
scrawl
e7682e04ae
Cleanup
2016-02-20 22:09:41 +01:00
scrawl
cdefee3e64
Add call to MultiObjectCache::releaseGLObjects
2016-02-20 20:38:37 +01:00
scrawl
4ca6e91292
Fix in-code default settings so that we don't attempt to use shaders in OpenCS
2016-02-20 20:36:29 +01:00
scrawl
8f81df2bd3
Cleanup
2016-02-20 20:34:56 +01:00
scrawl
0db7163363
Add specular mapping for terrain
2016-02-20 19:55:08 +01:00
scrawl
171e293641
ShaderManager: insert #line directives when including files
2016-02-20 19:55:08 +01:00
scrawl
f01e8a6950
Add specular mapping for objects
2016-02-20 19:55:08 +01:00
scrawl
5cf2441b10
ShaderVisitor: support automatic recognition of normal maps based on file pattern
...
Introduce new settings 'auto use object normal maps', 'auto use terrain normal maps', 'normal map pattern'
2016-02-20 18:00:43 +01:00
scrawl
6a0ac824bd
Fix terrain error in OpenCS
2016-02-19 15:00:58 +01:00
scrawl
7071d286e8
Fix inverted check for 16-bit indices
2016-02-19 14:59:47 +01:00
scrawl
4e5462bc19
Don't attempt to create a collision shape for an empty TriShape
2016-02-19 14:23:55 +01:00
scrawl
ca0e1fe0e0
Set the osg::Material on the terrain root node
2016-02-19 01:45:28 +01:00
scrawl
6000e48bba
Add terrain shaders and normal map support
...
Textures with _n filename suffix are automatically recognized as terrain normal maps.
2016-02-19 01:37:30 +01:00
scrawl
5e12a1b4ef
Add enchanted item glow to the shader
2016-02-18 23:05:44 +01:00
scrawl
268594dcf1
Recreate shader in NpcAnimation::setAlpha
2016-02-18 22:48:53 +01:00
scrawl
a73512afb7
Add shader settings to settings.cfg
2016-02-18 19:38:34 +01:00
scrawl
21c4dffed2
Add #include support in shaders
2016-02-18 19:37:58 +01:00
scrawl
22cc5c0965
Cache the Program
2016-02-18 19:37:58 +01:00
scrawl
456816f707
Use diffuse.a / vertex.a, use material emission
2016-02-18 19:37:58 +01:00
scrawl
3e854a84a2
Slightly more efficient applying of light state
2016-02-18 19:37:57 +01:00
scrawl
f93b7ec943
Fix light state issue
...
GLSL does not respect gl_Disable(GL_LIGHTX), so we have to set unused lights to zero.
Sadly, this change makes the applying of the modelView matrix less efficient. So far I couldn't find a better solution, osg's state tracker keeps getting in the way. :(
2016-02-18 19:37:57 +01:00
scrawl
9376811213
Vertex lighting shader
2016-02-18 19:37:57 +01:00
scrawl
a9ad1b09e2
Introduce ShaderManager & ShaderVisitor
...
Actual shaders still to be written.
2016-02-18 19:37:56 +01:00
scrawl
e647ee5424
Support RGB and RGBA embedded textures in NIF files ( Fixes #2295 )
2016-02-18 19:37:56 +01:00
scrawl
a9ac108382
Fully read NiPixelData
2016-02-18 19:37:56 +01:00
scrawl
606758d72f
NifLoader: create the BumpTexture slot, but don't use it yet
2016-02-18 19:37:56 +01:00
scrawl
4cd4131da9
NifLoader: assign a name to created textures
...
This name will tell the shader visitor how to handle that texture.
2016-02-18 19:37:56 +01:00
scrawl
50e92c8136
NifLoader: move texture property handling to a separate function
2016-02-18 19:37:56 +01:00
scrawl
acf44fd9e5
NifLoader: handleTextureControllers outside of the NumTextures loop
2016-02-18 19:37:55 +01:00
scrawl
e05d975020
Change the way that texture filtering settings are applied at runtime
2016-02-18 19:37:55 +01:00
scrawl
a94029267f
Fix an inverted condition (Bug #3209 )
2016-02-18 01:25:52 +01:00
scrawl
c4d38bb42d
Fix clang analyzer warnings
2016-02-16 19:17:04 +01:00
scrawl
ed57293e54
Allow '^' escape characters in books
...
http://forum.openmw.org/viewtopic.php?f=2&t=3373&p=37584&sid=1a0b015e6716b1bced37fd398ef876c7
2016-02-16 14:55:13 +01:00
scrawl
9eb96b9cb6
Parse the bullet version in FindBullet.cmake
2016-02-15 14:34:59 +01:00
scrawl
83a9a164bc
Raise the required bullet version to 2.83
...
2.82 appears to have a bug that causes the player to be able to phase through certain objects (bug #1587 ).
2016-02-15 00:33:17 +01:00
Marc Zinnschlag
28e3fe837f
Merge remote-tracking branch 'scrawl/osg_34'
2016-02-14 17:31:33 +01:00
scrawl
eaf3f5a829
Remove unused arguments
2016-02-13 04:14:05 +01:00
scrawl
6fc6913424
Do not set the cursor when creating it
2016-02-13 03:34:09 +01:00
scrawl
5824619a95
Clean up includes
2016-02-12 19:28:10 +01:00
scrawl
8b596dfcbe
Remove support for OSG 3.2
...
Since commit e8662bea31
2016-02-12 14:46:45 +01:00
scrawl
be6ea3d607
Account for UV coordinate flip in UVController ( Fixes #3203 )
2016-02-11 16:22:54 +01:00
Marc Zinnschlag
da6dcfc49e
Merge remote-tracking branch 'scrawl/resource'
2016-02-10 16:23:38 +01:00
scrawl
5e876b1379
Add missing include
2016-02-10 15:34:06 +01:00
scrawl
98c5e072f2
Swap the terrain cache update order to make more sense
2016-02-09 21:17:10 +01:00
scrawl
9f729667fb
Remove debug output
2016-02-09 21:16:11 +01:00
scrawl
0865cea211
Preload terrain
2016-02-09 21:16:11 +01:00
scrawl
98848c752a
Make getLayerInfo thread safe
2016-02-09 20:26:58 +01:00
scrawl
8aba74e6ee
Remove GridElement
2016-02-09 20:23:53 +01:00
scrawl
596fe56bfd
Make Land::loadData thread safe
2016-02-09 20:21:56 +01:00
scrawl
afe533e670
Accept a const Object in UnrefQueue
2016-02-09 19:00:30 +01:00
scrawl
246566cef4
Preload instances in BulletShapeManager
2016-02-09 18:48:49 +01:00
scrawl
e28dc3e72f
Preload instances in SceneManager
2016-02-09 18:35:26 +01:00
scrawl
2e62298bd3
Clean up ObjectCache includes
2016-02-09 18:11:07 +01:00
scrawl
40a6e05e17
Use a deque instead of vector in UnrefQueue
2016-02-09 16:09:55 +01:00
scrawl
d11c2864df
Introduce UnrefQueue to handle the deleting of no longer needed objects in the background thread
2016-02-09 15:45:35 +01:00
scrawl
84f01b7527
Remove unneeded forward declaration
2016-02-08 16:27:28 +01:00
scrawl
b2019d31c7
Mark thread safe methods in BsaFile
2016-02-08 15:55:05 +01:00
scrawl
e4e313fe12
Remove outdated comment
2016-02-08 14:41:21 +01:00
scrawl
c8054424c9
Preload items equipped by NPCs
2016-02-07 22:37:52 +01:00
scrawl
a81b10b415
Make the cache expiryDelay configurable
2016-02-07 19:05:55 +01:00
scrawl
41233fc8e5
Keep a reference to the original scene template for as long as the instance is used
2016-02-07 18:56:21 +01:00
scrawl
778bce3ae9
Remove unused ObjectCache functions
2016-02-07 18:27:12 +01:00
scrawl
49ecac4ced
Add a mutex lock around the SharedStateManager
2016-02-07 07:37:35 -08:00
scrawl
c3ad4dad75
Fix applying of filter settings on terrain textures
2016-02-07 05:53:56 -08:00
scrawl
8b981ab507
Crash fix
2016-02-07 05:53:42 -08:00
scrawl
c155680d3c
Customize ObjectCache for more efficient locking in removeExpiredObjectsInCache
2016-02-07 00:43:37 +01:00
scrawl
d855a13b44
Clear the resource cache from the worker thread
2016-02-07 00:36:31 +01:00
scrawl
6f9ca0f68f
Add basic cell preloader class
...
Not properly in use yet, but seems to be working.
2016-02-07 00:14:13 +01:00
scrawl
e055ae094a
Improve const-correctness in BulletShapeManager
...
Sadly, two const_cast's are needed to work around Bullet API quirks.
2016-02-07 00:14:13 +01:00
scrawl
b7e69cbc64
Refactor WorkQueue, merge WorkTicket and WorkItem
...
Allow the caller to hold on to the WorkItem. This makes it possible for a derived WorkItem to store the result of the work within the WorkItem itself.
2016-02-06 22:42:45 +01:00
scrawl
df57d4bfba
Use a common base class for resource managers
...
Implement updateCache to delete unreferenced cached objects when they have not been referenced for a while.
2016-02-06 17:22:17 +01:00
scrawl
e02f35264f
Work around OSG 3.2 not respecting the DEEP_COPY_CALLBACK flag ( Fixes #3183 )
2016-02-06 15:08:12 +01:00
scrawl
ea1efaac0c
Use the osgDB::ObjectCache in SceneManager, cleanup
2016-02-06 00:15:12 +01:00
scrawl
909c4d96b6
Use the osgDB::ObjectCache in BulletShapeManager
2016-02-05 23:59:37 +01:00
scrawl
6c1c653cba
Use the osgDB::ObjectCache in ImageManager
...
Should be thread safe now.
2016-02-05 23:31:59 +01:00
scrawl
9e5225bb6f
Do not unref a Texture's image data after applying it
2016-02-05 23:21:54 +01:00
scrawl
9e53e12c70
More renaming of TextureManager -> ImageManager
2016-02-05 23:10:27 +01:00
scrawl
5ee3d1698f
Remove getWarningTexture in favor of getWarningImage
2016-02-05 23:05:43 +01:00
scrawl
f99f403dda
Rename TextureManager to ImageManager
2016-02-05 23:03:53 +01:00
scrawl
6ef848b7c5
Remove TextureManager::getTexture2D
...
Instead use getImage and let the caller create the Texture. Sharing of textures is then handled in post by the SharedStateManager.
This is closer to what the OSG serializer does.
Streamlines the TextureManager and will make it easier to multithread.
2016-02-05 23:01:11 +01:00
scrawl
fbd4ad9b0c
Flip terrain textures
2016-02-05 22:46:15 +01:00
scrawl
71401aafe7
Handle multipass techniques in SetFilterSettingsVisitor
2016-02-05 21:08:32 +01:00
scrawl
31988ca4cc
Add a dont_override_filter description for textures that should be left alone
2016-02-05 21:07:08 +01:00
scrawl
e8662bea31
Change the way that image origin is converted to OpenGL's lower-left convention
...
Flip the texture coordinates instead of flipping textures.
This simplifies the TextureManager (no need to worry if the caller wants flipping or not), should make it easier to generalize & multithread it.
2016-02-05 21:03:11 +01:00
scrawl
6ac688c0e2
Change the way that texture filtering setting changes are applied at runtime to not require keeping a reference to textures
...
The references would be difficult to clean up because there may or may not be another reference to the texture in the osgDB::SharedStateManager.
2016-02-05 21:03:11 +01:00
scrawl
e2ee1d5689
Use separate textures for the MyGUI RenderManager
...
This means we can more reliably set the filter parameters.
I believe this commit creates a regression where non-DDS GUI textures would display upside down, which will be addressed by further refactoring in the next commits.
2016-02-05 21:03:10 +01:00
scrawl
5b972ee777
Move texture filtering settings to SceneManager
...
Practical benefits:
- Filter settings are now applied to native OSG format models. These models do not use TextureManager::getTexture2D since the model itself specifies a Texture.
- The GUI render manager will be able to use its own separate textures, making it easier to turn off filtering for them.
2016-02-05 21:03:10 +01:00
scrawl
b06730ac61
Fix terrain textureCompileDummy
2016-02-05 21:02:16 +01:00
scrawl
2eda495f89
Build fix for OSG 3.2
2016-02-03 19:05:15 +01:00
scrawl
06ed20abf8
Use the initial pose of a MorphGeometry for object placement ( Fixes #3136 )
2016-02-03 18:53:38 +01:00
scrawl
8360cccce7
Don't clone Drawable UpdateCallbacks twice
...
The Drawable copy constructor takes care of that already.
2016-02-01 21:02:48 +01:00
scrawl
6b48acaf0e
Don't optimize TriShapes with controllers ( Fixes #3143 )
2016-02-01 21:01:17 +01:00
scrawl
d9290b0ee0
Array fix
2016-01-25 21:13:38 +01:00
scrawl
aec8c38461
Move observer_ptr include where it belongs
2016-01-25 21:03:33 +01:00
scrawl
48f53e23bf
Allow alternate mesh formats for marker_error
2016-01-25 17:15:54 +01:00
Tobias Kortkamp
0659687bfb
Some fixes for building on FreeBSD
2016-01-25 14:13:16 +01:00
scrawl
f0971ee8ad
Implement Fixme script instruction
2016-01-20 04:07:07 +01:00
scrawl
41c571d4f4
Merge branch 'master' of https://github.com/OpenMW/openmw into lighting
...
Conflicts:
apps/opencs/view/render/instancemode.cpp
2016-01-15 15:46:10 +01:00
scrawl
62fe47b144
Load default terrain if there is none defined
2016-01-14 16:41:50 +01:00
scrawl
458a305bff
OpenCS: add lighting mask
2016-01-11 23:14:43 +01:00
scrawl
e1c7165bfb
Fix bounds calculation for addLight to a transform node
2016-01-11 23:14:43 +01:00
scrawl
93cc08a09c
Lighting fix for LightListCallbacks attached to a Transform node
2016-01-11 23:10:16 +01:00
scrawl
3089aeccc4
Factor out SceneUtil::addLight
2016-01-11 23:10:16 +01:00
scrawl
438b30d6f0
Move configureLight to a separate file
2016-01-11 23:10:16 +01:00
scrawl
11496b8075
Read fallback settings in OpenCS
2016-01-11 23:10:16 +01:00
scrawl
6546c05428
Move Fallback map to components/
2016-01-11 23:10:16 +01:00
Marc Zinnschlag
ece40b1e96
improved the remaining handling of extra arguments
2016-01-07 16:07:49 +01:00
Marc Zinnschlag
46e32de350
improved handling of extra arguments in DiscardParser
2016-01-07 16:01:01 +01:00
Marc Zinnschlag
f9607a47b3
improved handling of extra arguments in StringParser
2016-01-07 15:54:22 +01:00
Marc Zinnschlag
210c77968a
Don't report warning about extra arguments, if there are no extra arguments ( Fixes #3133 )
2016-01-07 15:38:23 +01:00
scrawl
daa94cc50e
Fix cppcheck warnings
2016-01-03 20:19:38 +01:00
scrawl
0597c8fd9c
Pass a Vec4f by reference
2016-01-03 16:43:20 +01:00
scrawl
ea0be6e737
Update ScriptArgs documentation
2016-01-03 00:13:01 +01:00
scrawl
23cd2056bf
Ignore extra arguments in playSound and playSound3D.
...
A common mistake in mods is to use playSound with volume/pitch arguments, which only playSoundVP supports. Previously these extra arguments raised a parser error, making the respective mod unusable.
2016-01-03 00:13:01 +01:00
scrawl
e695619aa5
ExprParser: Warn about ignored arguments
2016-01-03 00:02:58 +01:00
scrawl
3ebfb47983
Do not discard root node transformations if the root node is named 'bip01' (Bug #3118 )
2016-01-02 01:30:06 +01:00
Alexander "Ace" Olofsson
0efb8e2949
osgDB::ObjectCache was added in 3.3.3, not 3.4.0
...
Fixes redefinition error on builds with OSG >3.3.3 <3.4.0
2015-12-24 17:18:32 +01:00
cc9cii
90b76801f6
Reduce the call to tolower() for each character when the string is already in lower case.
...
- only a minor performance gain according to the MSVC profiler
2015-12-19 18:50:07 +11:00
cc9cii
abe6904a94
Minor performance gains on loading cell references.
...
- Use integers where possible
- Unfortunately many functions are simply duplicated for now, but over time the deprecated ones will be removed
2015-12-19 17:54:45 +11:00
cc9cii
003b0d48be
Move resource names listing code out of CSMWorld::Resources ctor in order to avoid multiple scan of the same resources.
...
- The resources are still scanned twice, once when the archive/directory is added and another time when the names are listed.
2015-12-19 17:39:02 +11:00
scrawl
deb7f3caf6
Print deletion state in ObjectReferenceInfo
2015-12-17 20:17:38 +01:00
scrawl
723c392a73
NifLoader: fall back to the first UV set when encountering invalid UV set references
2015-12-17 04:05:39 +01:00
scrawl
0731595c2b
Wrap a Texture2D in a ref_ptr
2015-12-17 03:38:38 +01:00
scrawl
31c3324705
Don't assume the emitter node is a Group ( Fixes #3082 )
...
This would be a correct assumption by default, but is no longer true when the NifLoader::optimize() function optimizes the graph.
2015-12-17 03:38:26 +01:00
scrawl
d5a2586f38
LoadingScreen: add support for important labels
...
Used in saveGame so the player can be sure whether or not the game was saved.
Fixes #3074
2015-12-15 21:16:20 +01:00
scrawl
625644e917
LoadingScreen: documentation updates
2015-12-15 21:03:56 +01:00
scrawl
ccbba5e926
LoadingScreen: remove indicateProgress, not used
2015-12-15 20:52:23 +01:00
scrawl
78a733a12c
Fix initialization of InputWrapper::mWindowHasFocus
2015-12-15 20:13:41 +01:00
scrawl
c70790ecb7
Remove outdated comment
2015-12-14 15:50:30 +01:00
scrawl
076dc539bc
KeyframeManager fix
2015-12-14 15:11:06 +01:00
Chris Robinson
f1faeeae3a
Use separate config options for min and mag texture filters
2015-12-13 17:05:19 -08:00
Chris Robinson
5c0a847eaf
Combine some duplicate code
2015-12-13 16:51:27 -08:00
scrawl
64424e7262
Move keyframe loading out of SceneManager to new KeyframeManager
2015-12-13 15:31:07 +01:00
scrawl
295563ba65
Minor fix
2015-12-13 15:31:07 +01:00
scrawl
6f966b8434
Don't use osg::notify
2015-12-11 16:18:08 +01:00
Paul Cercueil
06719df868
Use the standard cursor if the custom cursor can't be used
...
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
2015-12-11 15:59:59 +01:00
scrawl
0efce6cd4c
Fix typo in a comment
2015-12-10 00:15:55 +01:00
scrawl
eb92b853fe
BulletNifLoader: preallocate the btTriangleMesh's vertices/indices
2015-12-10 00:05:35 +01:00
scrawl
293f3f30b5
Indentation fix
2015-12-09 23:30:24 +01:00
scrawl
57b7cac13f
Merge pull request #850 from MatthewRock/fix-2952-2
...
Fix for bug #2952 : Enchantment Merchant Items reshuffled EVERY time 'barter' is clicked
2015-12-09 20:12:45 +01:00
MatthewRock
3b254ad631
Allows the same item to have multiple ancestors
2015-12-09 18:24:35 +01:00
scrawl
bdae572264
Merge pull request #840 from scrawl/movedrefs
...
Object movement between cells
2015-12-09 14:10:57 +01:00
cfcohen
d00d487c3d
Improved error reporting under POSIX using errno and strerror().
2015-12-08 23:35:03 -05:00
scrawl
de84452e5a
NifFile: close the stream after reading ( Fixes #3070 )
2015-12-09 04:52:00 +01:00
scrawl
39feb547a0
Broken lower casing fix ( Fixes #3068 )
2015-12-08 23:12:40 +01:00
MatthewRock
aa721fe1f6
Fix bug 2952 with merchant and levelled items
2015-12-08 22:39:11 +01:00
scrawl
624809c8dc
Minor fix for error handling in skeleton.cpp
2015-12-08 16:50:54 +01:00
scrawl
07b064f616
Rename to lowerCaseInPlace
2015-12-07 22:49:15 +01:00
scrawl
e3d3380c8c
Remove return value for in-place toLowerStr
2015-12-07 22:43:08 +01:00
scrawl
e4751c68e9
Typo fix
2015-12-07 22:30:02 +01:00
scrawl
42d68eb7fb
Build fix
2015-12-07 22:29:57 +01:00
scrawl
f875597be5
Don't use tolower()
...
See https://forum.openmw.org/viewtopic.php?f=8&t=3231&p=35968
2015-12-07 21:58:30 +01:00
scrawl
9d4af59860
Don't attempt to create quest log buttons if textures are unavailable ( Fixes #3063 )
2015-12-07 15:33:04 +01:00
scrawl
671561ea37
Write moved references to the save game file (not resolved on loading yet)
2015-12-06 19:11:25 +01:00
scrawl
1d5af3c9c8
Remove unneeded cast
2015-12-06 15:44:27 +01:00
scrawl
e39f49a88f
OSG extensions namespace fixes
2015-12-06 15:27:43 +01:00
cc9cii
19af94b73e
Reduce copying further by adding move constructors and move assignment operators to CellRef structs.
2015-12-06 15:20:45 +11:00
scrawl
c60f4ba7bd
Make RigGeometry bone references case-insensitive ( Fixes #3058 )
2015-12-05 15:02:35 +01:00
scrawl
3c02703876
Not found Land Textures are no longer a fatal error (Bug #3037 )
...
Log warning message and show the default texture when encountering invalid ESM::LandTexture references.
(cherry picked from commit 35fa1f5865
2015-12-05 18:14:55 +11:00
scrawl
a1939ae05f
StringUtils: use the locale-unaware tolower function
...
There is no change in behaviour since we were using the C locale.
The locale-aware tolower is much slower than the locale-unaware one. At least on Linux/GCC it calls dynamic_cast's, and is overall slower by an order of magnitude.
(cherry picked from commit 27e669296e
2015-12-05 18:11:21 +11:00
scrawl
0eca29eb62
Ignore Creature INDX subrecords
...
Found in some .ess files, not sure what they mean.
(cherry picked from commit 0bdfd1b0d7
2015-12-05 17:42:58 +11:00
cc9cii
1334091613
Resolve merge issues.
2015-12-05 17:28:32 +11:00
scrawl
c221be76dc
Tests: add dialogue_merging_test (requires some data files)
...
(cherry picked from commit 38c155c579
2015-12-05 11:26:24 +11:00
scrawl
41ee50c2b7
Move common subrecord definitions (NAME, DELE) to defs.hpp
...
(cherry picked from commit fc8e40889d
2015-12-05 11:25:14 +11:00
Stanislav Bas
d789d9369c
Make saving of deleted ESM records more consistent
...
(cherry picked from commit f9b0b7ede5
2015-12-05 11:24:21 +11:00
Stanislav Bas
3821bffbfa
Fix missing break in switch statement
...
(cherry picked from commit 9a8ca81907
2015-12-05 11:24:09 +11:00
Stanislav Bas
2abdeef2e0
Remove unused includes
...
(cherry picked from commit daaff1284e
2015-12-05 11:23:57 +11:00
Stanislav Bas
82363bf318
Make deleted flag a parameter of load/save methods (instead of a record member) in ESM records
...
(cherry picked from commit 4a16eba716
2015-12-05 11:20:31 +11:00
Stanislav Bas
7013ba751c
Fix build errors & warnings
...
(cherry picked from commit 1e8182220a
2015-12-05 11:19:22 +11:00
Stanislav Bas
d12f784e7e
Remove <cstdint> include file from loaddial.cpp
...
(cherry picked from commit f5745749a6
2015-12-05 11:19:11 +11:00
scrawl
258f7a2b42
LightController fixes
2015-12-05 00:38:06 +01:00
Stanislav Bas
696f7a942b
Some refactoring. Remove unused code
...
(cherry picked from commit 5fd48efd28
2015-12-05 09:46:20 +11:00
Stanislav Bas
b5c958c62a
More ESM records have DELE handling.
...
Changed records: Race, Land, Pathgrid, StartScript, DebugProfile, Filter
(cherry picked from commit e65ff723ce
2015-12-05 09:17:40 +11:00
Stanislav Bas
8b7b3d2a4e
Refine DELE handling in ESM records. Add position-independent DELE search
...
(cherry picked from commit ad353e6dd0
2015-12-05 07:20:36 +11:00
Stanislav Bas
3686c1e32d
Move DELE handling to CellRef record
...
(cherry picked from commit e8a9567be3
2015-12-05 07:20:09 +11:00
Stanislav Bas
82e1b0563c
Add NAME handling to DebugProfile and Filter records
...
(cherry picked from commit b55a4999ca
2015-12-05 07:19:32 +11:00
Stanislav Bas
72152d84ed
Move ID loading into a separate method for Dialogue and DialInfo records
...
(cherry picked from commit c8c79dc1ef
2015-12-05 07:19:07 +11:00
Stanislav Bas
d518d70212
Remove NAME and DELE handling from IdCollection
...
(cherry picked from commit 74a055f3cc
2015-12-05 07:18:39 +11:00
Stanislav Bas
377d606fc3
Load/read methods in MWWorld::Store return a pair (record ID, deleted flag)
...
(cherry picked from commit c266315a35
2015-12-05 07:17:56 +11:00
Stanislav Bas
2448aa05cb
Add removing of deleted Infos to Dialogue::clearDeletedInfos()
...
(cherry picked from commit adec0cb61d
2015-12-05 07:09:23 +11:00
Stanislav Bas
25a8cda9ac
Some fixes for ESM Dialogues and Infos
...
(cherry picked from commit e0983c815c
2015-12-05 07:09:05 +11:00
Stanislav Bas
80074f90bf
Set Deleted flag to false when initializing ESM records
...
(cherry picked from commit 7ecb54a776
2015-12-05 07:08:50 +11:00
Stanislav Bas
e0d5208d26
Remove explicit record ID in load/read methods of MWWorld::Store
...
(cherry picked from commit 89e44c8f1f
2015-12-05 07:07:14 +11:00
Stanislav Bas
c4fd4be3ea
Add NAME handling to GameSetting record
...
(cherry picked from commit b2f3ccb080
2015-12-05 07:05:41 +11:00
Stanislav Bas
711d787939
Add NAME and DELE handling to Global record
...
(cherry picked from commit 09a3358017
2015-12-05 07:05:28 +11:00
Stanislav Bas
1aa1336dcf
Remove redundant code
...
(cherry picked from commit 30b42bf4c0
2015-12-05 07:00:07 +11:00
Stanislav Bas
4f1601fe0d
Add NAME handling to Race record
...
(cherry picked from commit 8c3654af11
2015-12-05 06:59:53 +11:00
Stanislav Bas
7dc0c9138f
Add NAME and DELE handling to Cell record
...
(cherry picked from commit b667338a8f
2015-12-05 06:59:39 +11:00
Stanislav Bas
8c77cafc35
Add DELE handling to Info record
...
(cherry picked from commit 847614c26f
2015-12-05 06:59:24 +11:00
Stanislav Bas
d89de1ba30
Add NAME and DELE handling to Dialogue record
...
(cherry picked from commit 0b537186e5
2015-12-05 06:59:12 +11:00
Stanislav Bas
93736e9a81
Change DELE sub-record value to 0 (4 bytes)
...
(cherry picked from commit 19ac4e942a
2015-12-05 06:59:01 +11:00
Stanislav Bas
1b21d1b5f7
Add NAME and DELE handling to Script record
...
(cherry picked from commit d2c15647a3
2015-12-05 06:58:47 +11:00
Stanislav Bas
44c36a00f8
Add NAME and DELE handling to ESM records.
...
Changed records are those where DELE is inserted at the beginning of a
record (before NAME).
The record has all required sub-records in this case.
(cherry picked from commit 9ac20a3355
2015-12-05 06:58:34 +11:00
Stanislav Bas
e9a8eac6af
Add NAME and DELE handling to ESM records.
...
Changed records are those where DELE is located after NAME sub-record.
And DELE is the last sub-record.
(cherry picked from commit 926c825d0c
2015-12-05 06:58:16 +11:00
Marc Zinnschlag
70cb6f0238
fixed an interference with script warning mode and error downgrading ( Fixes #2990 )
...
(cherry picked from commit b61b732207
2015-12-05 06:40:10 +11:00
scrawl
368dd9bd8d
Compiler: remove unused mNameStartingWithDigit
...
(cherry picked from commit f7d0d06134
2015-12-05 06:34:32 +11:00
scrawl
4a9b37aa53
Fix copy constructor issue
2015-12-04 18:08:32 +01:00
scrawl
c442af09c5
Write more documentation for the lighting system
2015-12-04 18:08:32 +01:00
scrawl
462ef617ce
Don't read forward/backward values for Quaternion key lists
...
https://forum.openmw.org/viewtopic.php?f=8&t=3201&p=35867#p35867
2015-12-04 00:18:54 +01:00
scrawl
8e9571d155
Double buffer the light StateAttributes and StateSets
...
Fixes a race condition where the position of a light could jump a frame ahead.
2015-12-04 00:06:22 +01:00
scrawl
1f8ee9b8d1
StateSetUpdater: use the frameNumber
...
More robust in case a node is updated twice in the same frame (e.g. because it has multiple parents).
2015-12-03 23:46:25 +01:00
scrawl
f22982d251
Merge pull request #835 from sandstranger/opengles1
...
enable opengl es1
2015-12-03 21:25:00 +01:00
scrawl
eb458bf9c8
Fix inactive RigGeometry not rendering correctly
2015-12-03 19:49:45 +01:00
sandstranger
7d374b36fd
change cmake variables
2015-12-03 21:29:50 +03:00
Marc Zinnschlag
06efd72a89
allow keywords as strings in messagebox instruction ( Fixes #2991 )
2015-12-03 11:14:58 +01:00
sandstranger
238a5824be
add custom new variable fot Qt
2015-12-03 08:54:14 +03:00
sandstranger
bd5057aa3c
enable opengl es1
2015-12-02 22:40:04 +03:00
scrawl
647bed7f40
Do not read openmw.cfg from global path if one was found in the local path
2015-12-02 19:21:10 +01:00
scrawl
87e44bf627
Small fix
2015-12-02 15:21:13 +01:00
scrawl
d3fa8a8602
Add osgDB::ObjectCache to the repository to work around it not being available in OSG 3.2
2015-12-02 15:14:39 +01:00
scrawl
a29aef14f1
Eliminate a dynamic_cast in ParticleSystemController
2015-12-02 14:59:32 +01:00
scrawl
6cf2c35235
Don't rely on the _particles vector implementation details
...
This will allow compiling OpenMW with an osgParticle optimization to be pushed to OpenMW/osg.
2015-12-02 14:59:32 +01:00
scrawl
3d12b2ca9d
Add NifFileManager to avoid duplicate parsing of the NIFFile in SceneManager and BulletShapeManager.
2015-12-02 14:59:32 +01:00
scrawl
c9d710f334
Use a typedef to avoid conditional compiling
2015-12-01 16:18:19 +01:00
Alexander "Ace" Olofsson
cfcbd20d99
Let's put it as a MSVC-only fix for now
2015-12-01 04:19:30 +01:00
Alexander "Ace" Olofsson
e42f4999bd
Quick fix for building on MSVC
2015-12-01 04:06:34 +01:00
scrawl
e5ec4fe042
Add const specifier
2015-11-30 21:02:26 +01:00
scrawl
695fcf41c4
Optimize ValueInterpolator / KeyframeController
...
Cache the current position in the animation track and attempt to reuse it in the next frame.
Decent speed up for the Update phase, about 0.3 ms faster in Balmora.
2015-11-30 20:53:47 +01:00
scrawl
ac366f1603
Fix the rig bounds being updated twice per frame
...
Unlike what I expected, the osgUtil::UpdateVisitor is set to traverse all children (not only active children). The FrameSwitch was thus traversing both RigGeometries part of the double-buffering scheme, rather than only the one active in the current frame.
2015-11-30 05:42:31 +01:00
scrawl
e49bce7b40
Share the bvh of btBvhTriangleMeshShape's when possible
...
Results in decent cell-loading speed up. (only affects bullet versions < 2.83, since we use btScaledBvhTriangleMeshShape for >=2.83)
2015-11-30 02:06:29 +01:00
scrawl
d5a738bd39
Apply 27e669296e (locale-unaware tolower) to more code
...
In particular, the one in VFS::normalizeFilename was affecting cell loading performance.
2015-11-30 00:38:52 +01:00
scrawl
f962ce0bbe
Don't link against unnecessary OSG libraries
2015-11-29 19:56:43 +01:00
Marc Zinnschlag
2bef714d34
Merge remote-tracking branch 'emperorarthur/no_relative'
2015-11-28 10:01:05 +01:00
Arthur Moore
c66fd69c47
Fix #include error
2015-11-27 21:20:54 -05:00
Arthur Moore
4c0c20b1a0
Changed relative includes to library header format
2015-11-27 21:01:28 -05:00
scrawl
30cc633f2c
Missing include fix
2015-11-27 22:21:01 +01:00
scrawl
35fa1f5865
Not found Land Textures are no longer a fatal error (Bug #3037 )
...
Log warning message and show the default texture when encountering invalid ESM::LandTexture references.
2015-11-27 21:57:24 +01:00
scrawl
177a6f4a68
Launcher: ensure to clear previous settings when reloading settings
2015-11-27 20:52:29 +01:00
scrawl
ace4cfc0a8
Fix 'duplicate setting' errors when running installation wizard
2015-11-27 20:32:45 +01:00
Marc Zinnschlag
7cc950ed64
Merge remote-tracking branch 'origin/master'
2015-11-27 10:34:22 +01:00
scrawl
27e669296e
StringUtils: use the locale-unaware tolower function
...
There is no change in behaviour since we were using the C locale.
The locale-aware tolower is much slower than the locale-unaware one. At least on Linux/GCC it calls dynamic_cast's, and is overall slower by an order of magnitude.
2015-11-27 03:22:52 +01:00
scrawl
fbee32729a
Cache CellId
...
ESM::Cell::getCellId() was allocating a string on every call. This caused functions dealing with cellIds to be unnecessarily expensive.
For example, World::moveObject spent almost as much time comparing CellIds as it did updating Bullet's AABB after the move. OpGetDistance was by far the most expensive script instruction because it has to compare cellIds.
The total cost of getCellId() relative to the frame loop was about 0.3%.
2015-11-26 23:56:32 +01:00
cfcohen
7605912ece
Merge branch 'master' of https://github.com/OpenMW/openmw into config_writer_changes
2015-11-26 00:57:21 -05:00
cfcohen
ad5eaaa705
Update the OpenMW Launcher so that it only writes changed values to
...
the user settings.cfg file. Add a helpful header to the top of new
settings.cfg files. Remove old code involve whitespace management
that didn't work correctly anayway, and doesn't matter since we're not
adding comments to the file. Remove "automatically generated"
comments.
2015-11-25 21:30:04 -05:00
scrawl
8a3ec14bc6
Revert "Merge remote-tracking branch 'sandstranger/opengles'"
...
This reverts commit cc9cab6fd1da856eed95
2015-11-25 19:22:48 +01:00
Marc Zinnschlag
ef68e2aec4
Merge remote-tracking branch 'origin/master'
2015-11-25 19:18:17 +01:00
cfcohen
67c4b17581
Commit files that I thought wre in the previous commit. :-[ I'm
...
accustomed to the hg behavior of commiting all modified files by
default.
2015-11-25 13:17:03 -05:00
scrawl
1b77428c59
Use const reference, thanks ace13
2015-11-24 03:42:35 +01:00
cfcohen
6882e6451a
Remove tabs. :-[
2015-11-23 20:18:39 -05:00
cfcohen
9a975a2e68
Substantial rewrite of code to save settings.cfg file, allowing
...
comments to persist, ordering of settings to be retained, additional
reporting of changed settings, preservation of the settings.cfg
timestamp when no changes are made, and foundational changes for
possible future features. Due to poor interaction with the
openmw-launcher settings code, the launcher will still discard all of
these benefits.
2015-11-23 20:17:26 -05:00
sandstranger
16c6816a6f
add forgotten file for building on opengles
2015-11-23 20:42:30 +03:00
sandstranger
69acacefff
openmw building on Android with Opengl es
2015-11-23 20:28:35 +03:00
scrawl
38510a56c2
GeomMorpherController: do not dirty the MorphGeometry unless necessary
2015-11-22 21:24:00 +01:00
scrawl
0d49c7fa51
GeomMorpherController: fix double update of MorphGeometry
2015-11-22 21:23:46 +01:00
scrawl
28b20428b9
Remove dynamic_cast in GeomMorpherController
2015-11-22 20:33:22 +01:00
scrawl
94e8560bf8
RigGeometry: do not allocate new NodePath every frame
2015-11-22 20:01:09 +01:00
scrawl
6d5aa272fc
RigGeometry: do not update the geomToSkelMatrix more than once per frame
2015-11-22 19:54:27 +01:00
scrawl
75a464f7ec
Fix a typo
2015-11-22 19:54:27 +01:00
scrawl
fc7456e0a1
Explicitely opt for float matrices in performance critical places
2015-11-22 19:54:27 +01:00
scrawl
ffea9ec2c4
Remove comment
...
SharedStateManager::prune is run automatically during the update traversal.
2015-11-22 19:54:26 +01:00
scrawl
62169a7039
Use a single-precision PositionAttitudeTransform in speed critical places
2015-11-22 19:54:26 +01:00
scrawl
36e91617c9
Revert "NifOsg::Emitter: ignore psToWorld scale"
...
This reverts commit 7c16630874Fixes #3022
2015-11-19 22:09:32 +01:00
scrawl
9b96fcc224
Set the particle scaleReferenceFrame to local space
2015-11-19 15:49:42 +01:00
scrawl
3bd2aaddea
Adjust PulseSlow light controller ( Fixes #1963 )
2015-11-18 23:14:01 +01:00
scrawl
0bdfd1b0d7
Ignore Creature INDX subrecords
...
Found in some .ess files, not sure what they mean.
2015-11-18 16:47:03 +01:00
scrawl
d68ea994d5
Deal with empty meshes
2015-11-17 01:51:21 +01:00
scrawl
83e9a649e5
Cleanup
2015-11-17 01:45:38 +01:00
scrawl
e62470d674
Auto-generate the collision shape for native mesh formats
2015-11-17 00:20:15 +01:00
scrawl
8cf57ef6ac
Move BulletShapeManager and BulletShape to resource/
2015-11-17 00:20:15 +01:00
scrawl
eb2f16d682
Support for loading .osg mesh format
2015-11-16 23:26:43 +01:00
scrawl
21e25f4756
Use the traversalNumber as frame number
2015-11-16 20:03:45 +01:00
scrawl
52901ec10c
Do not create terrain geodes when built with OSG 3.4
2015-11-16 15:11:20 +01:00
Marc Zinnschlag
de98ee0062
Merge remote-tracking branch 'scrawl/esm_rewrite'
2015-11-14 14:25:08 +01:00
scrawl
38c155c579
Tests: add dialogue_merging_test (requires some data files)
2015-11-14 00:27:59 +01:00
scrawl
054c3eb24e
Do not deep copy PrimitiveSets when build with OSG 3.5
2015-11-13 20:39:44 +01:00
scrawl
fc8e40889d
Move common subrecord definitions (NAME, DELE) to defs.hpp
2015-11-13 18:07:18 +01:00
scrawl
b8e11cf197
Merge commit 'pull/upstream/678' into HEAD
...
Conflicts:
apps/esmtool/record.cpp
apps/opencs/model/doc/savingstages.cpp
apps/opencs/model/world/land.cpp
apps/opencs/model/world/land.hpp
apps/opencs/model/world/landtexture.cpp
apps/openmw/mwworld/store.cpp
components/esm/loadland.cpp
components/esm/loadland.hpp
2015-11-13 01:34:36 +01:00
scrawl
7c16630874
NifOsg::Emitter: ignore psToWorld scale
...
Seems wrong to me, but MW appears to do it that way. Without this fix, the light_de_candle_08_64 from http://www.nexusmods.com/morrowind/mods/41654/ has flame particles in the wrong spot.
2015-11-13 00:23:00 +01:00
scrawl
a29d1ace2b
Read NiSpotLight
2015-11-12 23:45:12 +01:00
scrawl
ba211ad9ad
Read NiPointLight ( Fixes #3011 )
2015-11-12 23:42:17 +01:00
scrawl
0965a9059d
Handle NiLODNode using osg::LOD ( Fixes #3008 )
2015-11-12 19:52:36 +01:00
scrawl
626281977e
Read NiLODNode (Bug #3008 )
2015-11-12 19:52:32 +01:00
scrawl
b4ce73f179
Rotations: remove LocalRotation
...
This never existed in vanilla MW in the first place. The reason we got confused was because of a strange behaviour where the order of applying rotations changes as soon as a script touches the object's rotation.
2015-11-12 01:16:37 +01:00
Marc Zinnschlag
b04a23bf43
Merge remote-tracking branch 'origin/openmw-37' into openmw-37
2015-11-11 19:55:42 +01:00
scrawl
1edcb219a7
Leak fix
2015-11-11 16:27:17 +01:00
scrawl
fc93dc6195
Remove a stray method declaration
2015-11-11 01:32:31 +01:00
MatthewRock
a662a00c62
Fixing bug for merchant
2015-11-10 19:18:02 +01:00
scrawl
7776c49fc1
GraphicsWindowSDL2: adjust the log levels
2015-11-10 18:42:59 +01:00
scrawl
0409e5a043
Use OSG_VERSION_GREATER_EQUAL / LESS_THAN rather than MIN_VERSION_REQUIRED (cosmetic change)
2015-11-10 18:28:58 +01:00
scrawl
f1ac408f35
Place Drawables directly in the scene graph when built with OSG 3.4
...
OSG 3.4 adds the ability to place Drawables directly in the scene graph, without a Geode decorating them. Leveraging this should give a small performance boost, because the redundant Geodes increase culling overhead.
There is still an oustanding issue with the RemoveDrawableVisitor no longer working correctly, because Drawables can have multiple parents.
2015-11-10 18:23:42 +01:00
scrawl
35459f20d5
Refactor lighting mask
2015-11-10 17:23:12 +01:00
scrawl
91583fc027
Fix MWRender::Mask_ParticleSystem
2015-11-10 17:00:33 +01:00
Alexander "Ace" Olofsson
37158df339
Update scalinglayer.cpp
...
MSVC Explicitly requires <algorithm> for std::min and/or max
2015-11-10 14:59:26 +01:00
scrawl
bd8332d2b0
Remove default copyop argument for nodecallback copy constructors
...
Works around a compiler warning with OSG 3.4:
warning: base class 'class osg::Callback' should be explicitly initialized in the copy constructor [-Wextra]
With no default argument for osg::CopyOp&, the compiler no longer sees the function as a real copy constructor and stops warning about the missing virtual initializations.
We don't care about this warning because there is nothing interesting to initialize in the osg::NodeCallback base anyway.
A proper fix for the warning would require to inserting OSG_VERSION conditional compiling all over the place, that is as long as we are still supporting OSG 3.2.
2015-11-09 18:57:17 +01:00
scrawl
1200ff9186
RigGeometry: fix incorrect bounding box in the first frame
...
The default computeBound() was overriding the manually set bounding box.
2015-11-09 18:31:41 +01:00
scrawl
64abdbabe3
Small refactor of controllers handling, print warning messages for unhandled controllers
2015-11-09 17:42:35 +01:00
scrawl
35f5be680b
Support for NiVisController on trishape nodes
2015-11-09 17:42:35 +01:00
Marc Zinnschlag
af5a1bc16b
Merge remote-tracking branch 'origin/master'
2015-11-09 09:07:37 +01:00
Marc Zinnschlag
b61b732207
fixed an interference with script warning mode and error downgrading ( Fixes #2990 )
2015-11-09 09:07:18 +01:00
scrawl
79b3f1e6a8
Small cleanup
2015-11-08 18:30:22 +01:00
scrawl
59aee04ddb
Implement ScalingLayer, for layouting of widgets in screen-relative coordinates
2015-11-08 18:30:21 +01:00
scrawl
57b9eafa0f
osgMyGUI: implement AdditiveLayer
2015-11-07 17:45:22 +01:00
scrawl
51f3a8fec6
osgMyGUI: move Platform methods to the .cpp file
2015-11-07 17:39:31 +01:00
scrawl
7ff168b787
osgMyGUI: add support for layers to insert custom rendering state
2015-11-07 17:33:32 +01:00
scrawl
0210b87ffc
Revert "Fix LightSource crash"
...
This reverts commit f336c6db87
2015-11-06 23:14:27 +01:00
scrawl
72252d4f32
Terrain: restore IncrementalCompileOperation
2015-11-06 20:22:07 +01:00
scrawl
7ca8e45d5d
Terrain: remove debug code
2015-11-06 20:21:39 +01:00
scrawl
ef18f4217f
Terrain: create 4x4 terrain chunks per ESM::Cell to improve performance
...
Improves performance because the number of splatting layers per chunk is reduced, and finer grained frustum culling can be done.
2015-11-06 20:14:57 +01:00
scrawl
95cf13e3f2
Terrain: make the blendmapSize and layerTileSize in FixedFunctionTechnique configurable
2015-11-06 15:23:37 +01:00
Marc Zinnschlag
e081eb2c34
Merge remote-tracking branch 'origin/master'
2015-11-05 07:56:57 +01:00
Marc Zinnschlag
7239481672
Merge remote-tracking branch 'scrawl/scrawl-patch-2'
2015-11-05 07:53:08 +01:00
scrawl
c996702b56
Fix some uninitialised variables found by static analysis
2015-11-04 20:34:50 +01:00
scrawl
f7d0d06134
Compiler: remove unused mNameStartingWithDigit
2015-11-04 20:31:23 +01:00
scrawl
c23609e22b
Cache the light list in LightListCallback
...
When multiple cameras are rendering, the later cameras can reuse the light lists from the first camera.
2015-11-04 00:19:15 +01:00
scrawl
fd1ccd21ff
Disable freezeOnCull for weather particles
2015-11-02 23:49:22 +01:00
scrawl
5ca0ae5232
Don't add the same AlphaFader to multiple nodes
2015-11-02 23:38:34 +01:00
Marc Zinnschlag
aa31704d5d
deal with script execution from within a script ( Fixes #2964 )
...
(cherry picked from commit 8eb6d337d5
2015-11-01 22:48:38 +11:00
Marc Zinnschlag
4677560859
adjusted a workaround for names starting with digits that interfered with some numerical expressions written without spaces
...
(cherry picked from commit 435e52306a
2015-11-01 21:37:30 +11:00
Marc Zinnschlag
c5235ea794
removed a redundant else and made unary + work also in the console
...
(cherry picked from commit ae54f34f25
2015-11-01 21:37:14 +11:00
Emmanuel Anne
890405bdb1
scripts: recognize '+' also as a unary operator
...
it fixes the armor sorter in "Blades safe house.esp"
(cherry picked from commit dace7ab706
2015-11-01 21:37:01 +11:00
scrawl
fcb9068c19
Fix tab indentations in apps/ and components/
...
(cherry picked from commit a47617c21f
2015-11-01 21:34:23 +11:00
Marc Zinnschlag
a2294117cd
replaced context-sensitive implementation of allowing digits at the beginning of names with a more general implementation ( Fixes #1730 )
...
(cherry picked from commit 4d94f38f4b
2015-11-01 21:33:37 +11:00
cc9cii
148ccb79e8
Set default creature scale to 1. Partially resolves bug #2880 . (no creature verifier yet)
...
(cherry picked from commit 192f01e3ac
2015-11-01 21:32:57 +11:00
cc9cii
2f76a1510e
Remove AI flag from the UI and instead auto-detect whether to save AIDT records. Should resolve bug #2879 .
...
(cherry picked from commit 45aee1b508
2015-11-01 21:32:34 +11:00
scrawl
c0f21bfb77
Add some comments to ESM::Land
...
(cherry picked from commit 5252dbcf1f
2015-11-01 19:08:52 +11:00
Marc Zinnschlag
25952369ae
merge land tables
...
(cherry picked from commit a8dc1c1198
2015-11-01 18:56:18 +11:00
Marc Zinnschlag
c4b34a077e
refactored loading of land data
...
(cherry picked from commit 69b9eadb52
2015-11-01 18:54:15 +11:00
Marc Zinnschlag
44020df65f
made return type of ESMTerrain::Storage::getLand const
...
(cherry picked from commit febf611c82
2015-11-01 13:40:56 +11:00
Marc Zinnschlag
35c4af9476
added copy constructor and assignment operator for Land record struct
...
(cherry picked from commit b0641934d4
2015-11-01 13:40:32 +11:00
scrawl
f336c6db87
Fix LightSource crash
2015-10-29 00:51:35 +01:00
scrawl
05fd4e123e
Use the format field instead of version field
...
(cherry picked from commit a081d402c5
2015-10-25 11:35:32 +11:00
scrawl
b9ba1067bf
Savegame loading optimization
...
(cherry picked from commit 4637750601
2015-10-25 11:35:15 +11:00
scrawl
49df6b7450
LightManager: fix incorrect view matrix for RELATIVE_RF cameras
2015-10-23 21:25:56 +02:00
scrawl
6dff11f847
Duplicate code fix
2015-10-23 18:16:26 +02:00
scrawl
8552a9d82c
Add multiple camera support to LightManager
2015-10-23 01:58:22 +02:00
scrawl
2ee6b41887
Handle NiAlphaProperty on a drawable basis
...
Removes the RenderBin nesting complication. Also results in leaner StateSets, so the cull phase should be a bit faster.
2015-10-19 15:46:53 +02:00
Marc Zinnschlag
8eb6d337d5
deal with script execution from within a script ( Fixes #2964 )
2015-10-09 12:14:56 +02:00
Emmanuel Anne
b911abd7d8
add a few more possible arguments to choice
...
this fixes some travel dialogs for "Antares Big Mod"
2015-10-07 12:28:35 +02:00
Marc Zinnschlag
435e52306a
adjusted a workaround for names starting with digits that interfered with some numerical expressions written without spaces
2015-09-26 11:34:46 +02:00
Marc Zinnschlag
ae54f34f25
removed a redundant else and made unary + work also in the console
2015-09-26 11:30:35 +02:00
Marc Zinnschlag
2158bfe285
Merge remote-tracking branch 'zelurker/scripts_unary_plus'
2015-09-26 11:25:40 +02:00
scrawl
8e69c80bf6
Add framenumber checks in various cull callbacks, so we don't update more than once per frame when multiple cameras are used
2015-09-26 01:21:33 +02:00
Emmanuel Anne
dace7ab706
scripts: recognize '+' also as a unary operator
...
it fixes the armor sorter in "Blades safe house.esp"
2015-09-25 14:22:57 +02:00
Alexander "Ace" Olofsson
7d4125d97f
Fixes for building with unity build
2015-09-24 15:21:42 +02:00
scrawl
f7e5a40143
Fix typo
2015-09-21 17:58:57 +02:00
scrawl
a47617c21f
Fix tab indentations in apps/ and components/
2015-09-16 20:45:37 +02:00
Marc Zinnschlag
4d94f38f4b
replaced context-sensitive implementation of allowing digits at the beginning of names with a more general implementation ( Fixes #1730 )
2015-09-15 14:57:07 +02:00
cc9cii
192f01e3ac
Set default creature scale to 1. Partially resolves bug #2880 . (no creature verifier yet)
2015-09-12 10:17:14 +10:00
cc9cii
45aee1b508
Remove AI flag from the UI and instead auto-detect whether to save AIDT records. Should resolve bug #2879 .
2015-09-12 10:15:32 +10:00
scrawl
5252dbcf1f
Add some comments to ESM::Land
2015-09-11 21:09:54 +02:00
Marc Zinnschlag
a445683312
Merge branch 'mergetool'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/tools/tools.cpp
2015-09-11 13:22:15 +02:00
scrawl
f8f66bffb0
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
2015-09-08 06:40:06 +10:00
scrawl
76fb68a9c0
Handle particle systems that don't have emitters
...
Fixes a crash in the Magic Diversity mod.
2015-09-07 22:07:09 +02:00
Marc Zinnschlag
c157fef2e0
allow use of IDs as function arguments, even if the ID matches a keyword ( Fixes #2830 )
2015-09-08 06:01:47 +10:00
Marc Zinnschlag
a8dc1c1198
merge land tables
2015-09-03 16:15:00 +02:00
Marc Zinnschlag
69b9eadb52
refactored loading of land data
2015-08-31 16:13:26 +02:00
Marc Zinnschlag
febf611c82
made return type of ESMTerrain::Storage::getLand const
2015-08-31 14:17:11 +02:00
Marc Zinnschlag
b0641934d4
added copy constructor and assignment operator for Land record struct
2015-08-31 11:06:32 +02:00
Marc Zinnschlag
7a96a04b75
Merge remote-tracking branch 'origin/master'
2015-08-31 09:22:19 +02:00
scrawl
e9acd135a6
Update todo comment
2015-08-30 20:43:39 +02:00
scrawl
cda8a88f0d
Use DEEP_COPY_PRIMITIVES to work around problem in osg::Geometry copy constructor (Bug #2754 )
2015-08-30 20:00:37 +02:00
slothlife
7817c52cbb
Discard old save game weather records
2015-08-27 09:57:32 -05:00
slothlife
54fa5273dc
Refactor weather transitions to act more like MW
...
Fixed several issues:
* Waiting/jail time/training all now properly skip remaining transitions
* ChangeWeather no longer permanently sets the region's weather
* ChangeWeather being called during a transition now correctly queues up
another transition
* Corrected transition delta and factor calculations
* ModRegion settings are now saved
2015-08-26 22:59:21 -05:00
scrawl
af3b0cd883
Improve some error messages
2015-08-21 00:31:43 +02:00
Nikolay Kasyanov
166df28906
OS X cursor workaround build fix
2015-08-19 21:23:16 +02:00
scrawl
4a68ceaeb7
Restrict the OS X cursor workaround to Intel graphics systems
2015-08-19 19:06:24 +02:00
scrawl
67bd6cd708
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
2015-08-18 23:06:12 +02:00
scrawl
af5ffa5548
Don't warn about SDL touch events
2015-08-15 22:53:29 +02:00
scrawl
47ac20af40
Workaround flipped cursor on OS X
2015-08-15 22:28:59 +02:00
cc9cii
2242920b85
Fix compiling with MSVC 2013 (typo mistake with the include file).
2015-08-13 13:11:17 +10:00
cc9cii
bb250a236b
Fix compilation when using 1.9 Ogre branch (i.e. the previous change on this file was in fact not related to MSVC 2015, but rather the use of the Ogre default branch).
2015-08-13 13:09:40 +10:00
cc9cii
b920e1bde7
Support MSVC 2015. Tested(*) with updated dependencies:
...
- Microsoft Visual Studio Community 2015 Version 14.0.23107.0 D14REL
- Qt 5.5, commit 1d3966833b5f27fb262f2d3727557ef2c8947828
- SDL2 default branch, Changeset: 9834 (d3fa6d0d3793)
- Ogre default branch, Changeset: 8048 (19479be2c7c5)
- Boost 1.59, commit 9a02cf8eb34eb31f0858c223ce95319f103addfa
- OpenAL commit 8fa4f276f89985be44007ce166109837cbfd5763
(*) only tested compilation and startup of the each app
2015-08-12 06:50:22 +10:00
Marc Zinnschlag
cbf9f83b85
allow use of IDs as function arguments, even if the ID matches a keyword ( Fixes #2830 )
2015-08-05 17:20:01 +02:00
cc9cii
da85b3a4ee
Update to keeping config comments (Feature #2535 )
...
-An attempt to fix Coverity-Scan warning (see: https://github.com/OpenMW/openmw/pull/618#discussion_r33641670 )
- Unable to test until a PR can be submitted.
2015-08-01 13:25:35 +10:00
scrawl
16b8ef3164
Don't use a shared Material in MaterialColorController
2015-07-31 00:01:55 +02:00
scrawl
de479e35c8
Fix AlphaController affecting all instances of the StateSet
2015-07-30 23:51:37 +02:00
Alexander "Ace" Olofsson
1f78ebd3c9
Oops?
2015-07-30 12:22:51 +02:00
Alexander "Ace" Olofsson
77a3a52b4e
What's wrong with this statement?
2015-07-30 12:16:15 +02:00
Alexander "Ace" Olofsson
e9ffbcc1b0
OSG 3.3.3 moves GL extensions out of osg::Texture
2015-07-30 11:45:10 +02:00
cc9cii
5bef43ac14
Remove duplicated config scanning (see: https://forum.openmw.org/viewtopic.php?f=7&t=2922&p=32940#p32940 )
...
* Requires boost::filesystem::canonical() from v1.48
* reduces startup time
* Fixes asset files being listed multiple times in tables
2015-07-30 16:30:59 +10:00
cc9cii
7247da5a77
Fix loading openmw-template.omwgame with debug builds (see: https://forum.openmw.org/viewtopic.php?f=7&p=34026#p34026 ). Script::load() was failing with debug assertion fail (vector subscript out of range)
2015-07-30 15:48:45 +10:00
Marc Zinnschlag
26d617d88b
allow keywords in quotes ( Fixes #2794 )
2015-07-30 09:34:46 +10:00
scrawl
5d3ad13868
Merge pull request #696 from EmperorArthur/verbose_errors
...
Be more descriptive when the NIF loader does not handle something.
2015-07-29 15:32:01 +02:00
Marc Zinnschlag
be1692f218
Merge remote-tracking branch 'origin/master'
2015-07-29 14:46:23 +02:00
Marc Zinnschlag
20106bb90f
allow keywords in quotes ( Fixes #2794 )
2015-07-29 14:45:56 +02:00
Arthur Moore
2d93a6f6cb
Be more verbose when dealing with unhandled nif texture properties
2015-07-28 18:46:11 -04:00
scrawl
d7ad0ee148
Print a sensible error message when S3TC support is missing ( Fixes #2800 )
2015-07-28 23:35:10 +02:00
scrawl
3a7d0d8dc8
Remove a file that isn't in use yet from build
2015-07-28 23:34:55 +02:00
Stanislav Bas
f9b0b7ede5
Make saving of deleted ESM records more consistent
2015-07-28 21:37:21 +03:00
scrawl
26656707dd
Use marker_error.nif as replacement when a mesh fails to load
2015-07-28 03:21:44 +02:00
scrawl
ac1f64b559
Fix StencilProperty front face mixup ( Fixes #2802 )
2015-07-28 03:20:18 +02:00
Koncord
386f545c67
Fix definition conflict
2015-07-27 15:22:19 +10:00
cc9cii
740c8bc6f1
Merge branch 'master' into cc9cii
...
Conflicts:
apps/opencs/model/settings/usersettings.cpp
apps/opencs/view/world/dialoguesubview.cpp
2015-07-27 10:53:39 +10:00
Stanislav Bas
9a8ca81907
Fix missing break in switch statement
2015-07-26 13:54:36 +03:00
scrawl
b3f5ac5dbb
Include cleanup
2015-07-25 02:11:49 +02:00
Stanislav Bas
daaff1284e
Remove unused includes
2015-07-22 22:18:26 +03:00
Stanislav Bas
4a16eba716
Make deleted flag a parameter of load/save methods (instead of a record member) in ESM records
2015-07-22 19:26:00 +03:00
Stanislav Bas
1e8182220a
Fix build errors & warnings
2015-07-19 23:44:16 +03:00
Stanislav Bas
f5745749a6
Remove <cstdint> include file from loaddial.cpp
2015-07-19 22:50:42 +03:00
Koncord
7924ecef3e
Fix definition conflict
2015-07-19 23:37:20 +09:00
Stanislav Bas
5fd48efd28
Some refactoring. Remove unused code
2015-07-19 14:58:14 +03:00
Stanislav Bas
e65ff723ce
More ESM records have DELE handling.
...
Changed records: Race, Land, Pathgrid, StartScript, DebugProfile, Filter
2015-07-19 14:58:13 +03:00
Stanislav Bas
ad353e6dd0
Refine DELE handling in ESM records. Add position-independent DELE search
2015-07-19 14:57:59 +03:00
Marc Zinnschlag
b3ad983f1f
Merge remote-tracking branch 'scrawl/version'
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
2015-07-18 12:22:37 +02:00
Marc Zinnschlag
edde1fb727
Merge remote-tracking branch 'scrawl/master'
2015-07-18 11:40:36 +02:00
scrawl
f09e4620b6
Move OpenMW version information to a textfile instead of compiling it in
...
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
2015-07-18 03:09:04 +02:00
slothlife
420789baa9
Remove an unused include
2015-07-17 15:26:04 -05:00
slothlife
1b3cc957f8
Move some OSG static library setup code
2015-07-17 15:13:43 -05:00
scrawl
41bed4c7d9
Use multimap to speed up custom map marker code
2015-07-17 20:49:10 +02:00
slothlife
df99d5a59d
Move setup code for OSG when statically linked
2015-07-17 09:56:21 -05:00
slothlife
43b1f15af9
Merge remote-tracking branch 'upstream/master' into static-deps-build
2015-07-17 01:03:19 -05:00
slothlife
83ef1f7eea
Add support for linking OpenSceneGraph statically
...
Added some basic support for linking to OpenSceneGraph and its plugins
statically. Also added a library necessary to statically link MyGUI
(previously Ogre pulled it in).
2015-07-17 00:56:15 -05:00
Stanislav Bas
e8a9567be3
Move DELE handling to CellRef record
2015-07-15 19:39:01 +03:00
Koncord
73731d27e9
Add ${MYGUI_LIBRARIES} to components/CMakeLists.txt
2015-07-14 23:54:47 +09:00
scrawl
de6dc21552
Create hardware cursors in advance ( Fixes #2660 )
2015-07-13 23:36:25 +02:00
Stanislav Bas
b55a4999ca
Add NAME handling to DebugProfile and Filter records
2015-07-13 22:37:14 +03:00
scrawl
c4866bdfc6
Disable mipmaps for GUI textures
...
For some reason, the mipmap generator seems to be broken on Linux Intel graphics (works on Nvidia). This was breaking the scrollbar arrows, which are minified enough to show using a mipmap.
2015-07-13 19:13:26 +02:00
Stanislav Bas
c8c79dc1ef
Move ID loading into a separate method for Dialogue and DialInfo records
2015-07-13 11:26:23 +03:00
Stanislav Bas
74a055f3cc
Remove NAME and DELE handling from IdCollection
2015-07-13 10:40:11 +03:00
Stanislav Bas
c266315a35
Load/read methods in MWWorld::Store return a pair (record ID, deleted flag)
2015-07-12 15:20:22 +03:00
Stanislav Bas
2ed182b144
Update to upstream/master. Resolve merge conflicts in MWWorld::Store
2015-07-12 12:01:18 +03:00
Stanislav Bas
adec0cb61d
Add removing of deleted Infos to Dialogue::clearDeletedInfos()
2015-07-12 00:19:04 +03:00
Stanislav Bas
e0983c815c
Some fixes for ESM Dialogues and Infos
2015-07-11 22:17:53 +03:00
scrawl
24ae1d5ace
Fix some issues found by coverity
2015-07-11 03:34:08 +02:00
Marc Zinnschlag
08d2b196bd
Merge remote-tracking branch 'ace/explicit-instantiation'
2015-07-10 08:58:53 +02:00
scrawl
72686c32ae
Fix runtime exceptions on MyGUI debug builds
2015-07-10 03:03:17 +02:00
Stanislav Bas
7ecb54a776
Set Deleted flag to false when initializing ESM records
2015-07-10 00:29:46 +03:00
Stanislav Bas
89e44c8f1f
Remove explicit record ID in load/read methods of MWWorld::Store
2015-07-10 00:29:36 +03:00
Stanislav Bas
b2f3ccb080
Add NAME handling to GameSetting record
2015-07-10 00:29:34 +03:00
Stanislav Bas
09a3358017
Add NAME and DELE handling to Global record
2015-07-10 00:29:32 +03:00
Stanislav Bas
30b42bf4c0
Remove redundant code
2015-07-10 00:29:30 +03:00
Stanislav Bas
8c3654af11
Add NAME handling to Race record
2015-07-10 00:29:28 +03:00
Stanislav Bas
b667338a8f
Add NAME and DELE handling to Cell record
2015-07-10 00:29:26 +03:00
Stanislav Bas
847614c26f
Add DELE handling to Info record
2015-07-10 00:29:24 +03:00
Stanislav Bas
0b537186e5
Add NAME and DELE handling to Dialogue record
2015-07-10 00:29:22 +03:00
Stanislav Bas
19ac4e942a
Change DELE sub-record value to 0 (4 bytes)
2015-07-10 00:29:20 +03:00
Stanislav Bas
d2c15647a3
Add NAME and DELE handling to Script record
2015-07-10 00:29:18 +03:00
Stanislav Bas
9ac20a3355
Add NAME and DELE handling to ESM records.
...
Changed records are those where DELE is inserted at the beginning of a
record (before NAME).
The record has all required sub-records in this case.
2015-07-10 00:25:54 +03:00
Stanislav Bas
926c825d0c
Add NAME and DELE handling to ESM records.
...
Changed records are those where DELE is located after NAME sub-record.
And DELE is the last sub-record.
2015-07-10 00:18:00 +03:00
Alexander "Ace" Olofsson
2bebfea38d
Instantiate struct as a struct
2015-07-09 22:45:25 +02:00
Alexander "Ace" Olofsson
3655ef16af
Explicitly instantiate ESM::StatState
2015-07-07 19:19:37 +02:00
scrawl
49c07de773
Merge pull request #643 from ace13/win-build-fix
...
Fix build error and a pair of warnings
2015-07-05 22:24:24 +02:00
Alexander "Ace" Olofsson
aaaee74a4d
Fix the comments
2015-07-05 21:56:04 +02:00
scrawl
631cec7304
Take the radius of lights into account when sorting
2015-07-02 20:46:34 +02:00
scrawl
bf9c62fa42
Fix for some coverity scan defects
2015-07-02 20:46:34 +02:00
scrawl
a1432b0255
Move attackingOrSpell flag to the CharacterController
2015-07-02 19:14:28 +02:00
scrawl
a081d402c5
Use the format field instead of version field
2015-06-30 17:26:33 +02:00
scrawl
4637750601
Savegame loading optimization
2015-06-30 16:47:41 +02:00
scrawl
43f9c7f295
Skip the Update traversal for inactive skeletons
2015-06-30 03:25:30 +02:00
scrawl
1956e2c988
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
2015-06-28 00:38:39 +02:00
scrawl
502cc852da
Handle encoding conversions when saving TES3 header ( Fixes #2727 )
2015-06-26 20:16:32 +02:00
scrawl
882e359008
Move attackStrength to the CharacterController, where it should have been to begin with
...
Only relevant for actors in active cells, so doesn't belong in CreatureStats. This change should slightly reduce the game's memory usage.
2015-06-26 05:15:07 +02:00
scrawl
5bc6513e2d
Fix projectile hit bug where the incorrect attackStrength would be used if a new attack has been performed in the meantime
2015-06-26 02:32:41 +02:00
cc9cii
273ff1cccb
Address review comments.
2015-06-26 07:48:48 +10:00
scrawl
1d76607005
Add ORI (ObjectReferenceInfo) alias for BetaComment ( Fixes #2723 )
2015-06-25 21:48:47 +02:00
scrawl
ea0339d471
Make the string argument to BetaComment optional
2015-06-25 21:45:59 +02:00
cc9cii
b1f07ba4fb
Resolve merge issues and change the getSpells() interface.
2015-06-25 18:57:32 +10:00
cc9cii
7af43a1155
Address review feedback.
2015-06-25 13:32:22 +10:00
cc9cii
91b9ad399f
Include <cmath> for fmod() and floor()
2015-06-24 21:38:38 +10:00
cc9cii
8af12788a4
Merge branch 'master' into autocalc
...
Conflicts:
apps/opencs/view/world/util.cpp
2015-06-24 21:16:48 +10:00
cc9cii
6b00d4ad91
Move NPC autocalc to a separate component so that it can be shared between OpenMW and OpenCS.
...
- Vanilla behaviour mimic'd where possible, except copying over autocalc spells to the npc's spell list when the status changes
2015-06-24 21:05:59 +10:00
scrawl
5ac502d104
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
2015-06-23 05:12:12 +02:00
scrawl
d3ef075952
Fix an uninitialized variable
2015-06-23 05:06:49 +02:00
scrawl
a5670b5133
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
apps/openmw/mwworld/player.hpp
2015-06-22 20:09:02 +02:00
scrawl
2ce269c0fc
Werewolf stats compatibility with old save files
2015-06-21 18:45:49 +02:00
scrawl
d6a7255391
Loading/saving for player's original skills/attributes (prior to becoming a werewolf)
2015-06-21 17:36:49 +02:00
scrawl
44582fe3b3
Don't use separate werewolf skills/attributes for non-player werewolves
...
Still need to deal with save files.
2015-06-21 17:28:18 +02:00
scrawl
efad4efe19
Star fading (Bug #2693 )
2015-06-19 20:55:04 +02:00
scrawl
7a5f220ac5
GlowTexture keeps the alpha channel from the previous texture stage
2015-06-19 17:43:13 +02:00
scrawl
39539603bf
Re-enable a warning message
2015-06-18 03:03:30 +02:00
scrawl
a7c5beb7c5
Remove redundant allocations for NIF meshes
2015-06-18 01:26:45 +02:00
scrawl
43384596d4
Style fix
2015-06-18 01:26:10 +02:00
scrawl
fabc5126f3
Include cleanup
2015-06-18 00:30:51 +02:00
scrawl
81a4a6da6b
Make better use of the available texture units (Bug #2702 )
...
Nvidia drivers only support a maximum of 4 fixed function texture units. To resolve this problem, bind texture units in order instead of binding to the NiTexturingProperty::TextureType unit.
2015-06-17 20:43:39 +02:00
scrawl
934166a853
Ignore the alpha value for particle materials (Bug #2699 )
2015-06-17 18:04:33 +02:00
scrawl
b648722d3b
Don't use the ParticleSystem for computing placeable bounds (Bug #2700 )
2015-06-17 15:13:41 +02:00
scrawl
6199c0bbc5
Use osgDB::SharedStateManager for sharing of StateSets across NIF files
2015-06-16 23:50:19 +02:00
scrawl
3663511cdb
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
2015-06-16 19:53:41 +02:00
cc9cii
cccf6c6bdd
Rebuild the list of available content files when opening the open/new dialogues. Should resolve Bug #2644 .
2015-06-16 12:48:45 +10:00
scrawl
aad8e7b6d0
Light culling fix
2015-06-15 19:37:44 +02:00
scrawl
18f4eaa8dc
Preliminary handling for overflowing light lists
2015-06-15 18:56:40 +02:00
scrawl
acf9fc2d37
Enable per-frame light list updates (Bug #2638 , Bug #2654 )
...
The performance impact isn't so big anymore since the last commit.
2015-06-15 18:15:26 +02:00
scrawl
1d198a5592
Keep the light list StateSet cache for more than one frame
2015-06-15 18:09:01 +02:00
Marc Zinnschlag
8fc0bdfac7
Merge remote-tracking branch 'cc9cii/keep-config-comments'
2015-06-15 16:22:48 +02:00
scrawl
d7a4a9fd66
Create NIF root nodes as Group instead of Transform when possible
2015-06-15 15:25:45 +02:00
cc9cii
6b28955f31
Fix attempt to erase using a const_iterator.
2015-06-15 10:26:16 +10:00
scrawl
b79ab1a3b8
Fix InverseWorldMatrix bug introduced by last commit
2015-06-15 02:22:52 +02:00
scrawl
ec25f1da95
Fix ParticleSystem bug introduced by last commit
2015-06-15 02:17:57 +02:00
scrawl
ad46ff7a98
Remove redundant Transform nodes for TriShapes/ParticleSystems with an identity transform
2015-06-15 02:06:04 +02:00
cc9cii
36aa4aa9bd
If a removed 'content=' item has comments, keep them in config file for later use.
2015-06-15 09:53:26 +10:00
scrawl
ab597f672e
State the filename in NIF loader warning messages
2015-06-15 01:49:46 +02:00
scrawl
6a788c3462
Minor cleanup
2015-06-15 01:29:32 +02:00
scrawl
a5b72a358b
Prune empty nodes in RemoveDrawableVisitor
...
Gets rid of 28 useless transform nodes in base_anim.1st.nif.
2015-06-14 23:56:35 +02:00
scrawl
9e049894e8
Reduce the number of StateSets created for NIF scene graphs
...
The Material state is now set on the NiTriShape's node rather than the Geode, thus merged with other state like NiTexturingProperties, etc that are typically attached to the NiTriShape.
Effectively cuts in half the number of StatSets for a NIF file, resulting in big speedup (~10%) in the Cull and Draw phases.
2015-06-14 21:22:44 +02:00
scrawl
b204396b57
Minor fix
2015-06-14 21:04:59 +02:00
scrawl
98571148b0
Remove custom license for terrain code
...
Now that it's no longer a stand-alone component, there's not much point in custom licensing it.
2015-06-14 20:44:29 +02:00
scrawl
cad18969e3
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/aitravel.cpp
2015-06-14 16:32:13 +02:00
Marc Zinnschlag
e17f7ac81a
Merge remote-tracking branch 'cc9cii/master'
2015-06-14 12:50:10 +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
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
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
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
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
c04f6cf167
Remove unused code
2015-06-12 01:58:13 +02:00
scrawl
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
2015-06-12 01:45:19 +02:00
scrawl
fc5176dc38
Refactor cmake scripts, reducing the amount of find_package(Qt4)
2015-06-11 23:38:08 +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
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
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
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
scrawl
93ee11c5e7
Fix particlesystem nested RenderBin issue (Bug #2631 )
2015-06-08 21:21:09 +02:00
scrawl
fc8e5dde3b
Fix crash when OSG_STEREO is enabled
2015-06-08 03:26:36 +02:00
scrawl
347c9b57b8
Copy constructor signature fix
2015-06-08 01:59:42 +02:00
scrawl
10457c1b28
Include fix
2015-06-08 01:14:26 +02:00
scrawl
5edf457ab7
Build fix
2015-06-08 01:13:23 +02:00
scrawl
9c9b83f8e2
Changes to compile with osg-svn 3.3.8
2015-06-07 23:51:54 +02:00
scrawl
ab626ca7b9
Improve MyGUI widget creation performance
2015-06-07 18:57:26 +02:00
scrawl
e66e9916db
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/document.hpp
2015-06-07 15:23:54 +02:00
scrawl
0a411cbd7c
Enable particle lighting
2015-06-07 04:41:55 +02:00
scrawl
68e322f969
Restore data directory verbose output that got lost
2015-06-07 01:47:19 +02:00
cc9cii
a439f49c4d
Fix loop where there was a potential for double entry.
2015-06-07 07:38:52 +10:00
cc9cii
4902c66792
Allow space characters in front of comments.
2015-06-07 07:21:15 +10:00
cc9cii
15fe5d88e2
Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535 .
...
- controlled via a checkbox in launcher settings
2015-06-06 20:35:55 +10:00
scrawl
0afc03b6b7
Build fix
2015-06-05 16:56:38 +02:00
scrawl
d8d43f94b9
Fix a typo
2015-06-05 02:06:13 +02:00
scrawl
e23775e338
Fix -Woverloaded-virtual clang warnings
2015-06-04 20:31:28 +02:00
scrawl
231b217664
Build fix for MyGUI 3.2.1
2015-06-04 17:13:42 +02:00
scrawl
e046119487
Fix for unnecessary terrain texture coordinate arrays
2015-06-04 16:15:26 +02:00
scrawl
4bb3cbf0fb
Remove last remains of Ogre
2015-06-03 23:04:35 +02:00
scrawl
b70383d127
Remove last remains of Ogre math
2015-06-03 21:37:21 +02:00
scrawl
2eec0caca0
Remove dependency on Ogre::StringConverter
2015-06-03 19:59:54 +02:00
scrawl
0cc9b1bb40
Remove dependency on OgrePlatform.h
2015-06-03 18:49:52 +02:00
scrawl
dd23981eab
Font workaround for older MyGUI versions, works with 3.2.2 now
2015-06-03 18:00:45 +02:00
scrawl
bd0233ce68
Error handling improvement
2015-06-03 18:00:34 +02:00
scrawl
e642f20a65
Restore screenshot key functionality
2015-06-03 17:25:18 +02:00
scrawl
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
2015-06-03 03:18:29 +02:00
scrawl
cd47dff196
Minor cleanup
2015-06-03 03:03:16 +02:00
scrawl
b978153edb
Enable VBO sharing for terrain geometry
2015-06-03 02:24:09 +02:00
scrawl
5666e02546
Fix for dark terrain in some cases
2015-06-03 02:22:04 +02:00
scrawl
cdd0623009
Terrain rendering
2015-06-03 01:35:41 +02:00
scrawl
10f938ff87
Add comment
2015-06-03 01:18:03 +02:00
scrawl
5a7f2a4f1f
Restore light attenuation settings
2015-06-02 17:02:56 +02:00
scrawl
01944c33f5
Basic water rendering
2015-06-02 16:35:35 +02:00
Marc Zinnschlag
67f04e0ba1
Merge remote-tracking branch 'origin/master'
2015-06-02 14:44:27 +02:00
Marc Zinnschlag
ee2763f2d4
Allow 5th parameter for PlaceAtMe (numeric value, ignored) ( Fixes #2591 )
2015-06-02 14:43:38 +02:00
Stanislav Bas
6cb221f8d0
Some minor changes to MWList
2015-06-02 11:55:09 +03:00
Stanislav Bas
959fe3eb87
Reset the scrollbar position in the topic list when DialogueWindow is closed
2015-06-01 23:49:40 +03:00
Stanislav Bas
5350ce59ef
MWList doesn't scroll to the very bottom when it's shown for first time
2015-06-01 22:42:41 +03:00
scrawl
de8e5f0db1
Restore projectiles
2015-06-01 21:41:13 +02:00
scrawl
c85764b654
Wireframe mode
2015-06-01 17:02:44 +02:00
scrawl
7f9f9a32d2
InitWorldSpaceParticles fix
2015-06-01 16:29:42 +02:00
scrawl
b0b55e2037
Delete niftest as it's currently broken
2015-06-01 02:48:15 +02:00
Stanislav Bas
5dc6cdeb99
Scroll to the top of the topic list when dialog is started
2015-06-01 01:14:11 +03:00
scrawl
a066b24303
Restore WeaponAnimation
2015-05-31 01:07:43 +02:00
Marc Zinnschlag
d7cd4203ad
Merge remote-tracking branch 'k1ll/mingw'
2015-05-30 11:39:53 +02:00
scrawl
0f8f19958a
NifLoader: Fix empty StateSets being created in some cases
2015-05-30 04:26:00 +02:00
scrawl
fd50be0fb8
Restore various gameplay
2015-05-30 01:00:24 +02:00
scrawl
6231cd8557
RigGeometry clone fix
2015-05-30 00:59:34 +02:00
scrawl
a56d0e9cc3
ControllerVisitor fix
2015-05-29 23:39:52 +02:00
scrawl
668d365ef9
MorphGeometry copy fix
2015-05-29 21:47:43 +02:00
scrawl
261ed1f4e5
Revert "Enable culling for particle emitters & programs"
...
This reverts commit 8b206e0aed
2015-05-29 20:31:26 +02:00
scrawl
1cdb440b77
glReadPixels *is* available on OpenGL ES
2015-05-28 17:23:06 +02:00
scrawl
9ee63dc3f4
Change stats viewer key to f3
2015-05-28 16:28:48 +02:00
scrawl
025a1a7866
Restore savegame screenshot display
2015-05-28 02:34:38 +02:00
scrawl
fe439e53ff
Bullet include cleanup
2015-05-27 22:32:11 +02:00
cc9cii
5fd107a95c
Fix crash with array out of bounds when refNum index is incorrect.
2015-05-27 10:19:26 +10:00
scrawl
723beb1cac
Move IncrementalCompileOperation to SceneManager
2015-05-26 20:20:18 +02:00
scrawl
5de24552a8
Leak fix
2015-05-26 19:12:29 +02:00
scrawl
3dcb167066
Map rendering
2015-05-26 16:40:44 +02:00
scrawl
da24e298ee
Fix -Wreorder warnings
2015-05-23 22:44:00 +02:00
scrawl
22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
2015-05-23 20:33:44 +02:00
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
2015-05-21 22:46:44 -05:00
scrawl
7882c3d7f0
Fix incorrect rotation for meshes with BoneOffset
2015-05-20 04:09:21 +02:00
scrawl
8d033f0558
Fix UpdateRigBounds not being copied properly
2015-05-20 03:12:42 +02:00
scrawl
8b768f4377
Minor fix for behaviour with non-existing LightManager
2015-05-18 21:06:42 +02:00
scrawl
314c1161ae
Minor addition to reading display
2015-05-18 21:05:17 +02:00
scrawl
99eb78fc19
Fix $DISPLAY not being accounted for in cursor decompression context
2015-05-17 22:16:14 +02:00
scrawl
737c2114dc
Change viewer stats keybinding to F9
2015-05-15 19:43:48 +02:00
scrawl
49df07ea7f
Implement UI scaling factor
2015-05-15 00:41:21 +02:00
scrawl
24bb2e152c
Apply texture filter setting changes
2015-05-14 21:42:04 +02:00
scrawl
5442bf23a6
Apply video mode & gamma setting changes
2015-05-14 20:31:16 +02:00
scrawl
b6cb73e6e8
Fix deep copying of controllers
...
This fixes the cell loading crash.
2015-05-14 15:07:58 +02:00
scrawl
a18663c8b3
Improve MyGUI texture updates
2015-05-14 01:26:10 +02:00
scrawl
5dd1b2ae86
Readded HW cursor rotation
2015-05-14 01:06:33 +02:00
scrawl
c775cbbbaa
Silence an annoying message
2015-05-14 00:40:51 +02:00
scrawl
9ea416b852
Readded HW cursor manager (no image rotation yet)
2015-05-13 18:56:14 +02:00
scrawl
39fb46601a
Readded input & event handling
2015-05-13 16:50:47 +02:00
scrawl
298b3ed2ef
Create the GraphicsWindowSDL2 directly
2015-05-13 15:08:47 +02:00
scrawl
0498e6e5f0
Readded window icon
2015-05-13 15:03:21 +02:00
cc9cii
7f12fc4770
Fix for Bug #2544 . Add a default mNpdtType to ESM::Npc::blank().
2015-05-13 13:39:04 +10:00
scrawl
375b736e74
Use SDL to create the window
...
No input nor event loop handling yet, so the window will "stop responding" after a few seconds.
Thanks to KittyCat for the GraphicsWindowSDL2 code.
2015-05-13 02:53:09 +02:00
scrawl
82316105de
BulletShapeManager kf loading fix
2015-05-12 16:49:53 +02:00
scrawl
65f0195c71
Readded animated collision shape support
2015-05-12 16:26:11 +02:00
scrawl
47758c11cd
Readded collision objects and movement physics
2015-05-12 03:02:15 +02:00
Marc Zinnschlag
107bf818e7
Revert "Use btScaledBvhTriangleMeshShape, bump required bullet version to 2.83"
...
This reverts commit 27751db99a
2015-05-10 13:35:21 +02:00
scrawl
c31b416ba1
Move physicssystem to a new mwphysics module
2015-05-10 01:09:00 +02:00
scrawl
fe15f31f3e
Remove strings.h wrapper
2015-05-10 00:36:04 +02:00
scrawl
c843cfc8e2
Physics stub in preparation for rewrite
2015-05-10 00:28:51 +02:00
scrawl
48ffeab191
Remove old BulletShapeManager
2015-05-09 01:06:55 +02:00
scrawl
0da1e0e905
Add comment
2015-05-09 00:17:08 +02:00
scrawl
d432a3ed08
Fix MyGUI rendering not taking DataVariance of textures into account
2015-05-09 00:13:22 +02:00
scrawl
af7cbb2e3b
Leak fix
2015-05-08 17:52:35 +02:00
scrawl
483dc9de45
Stop viewer threading before changing MyGUI textures
2015-05-07 23:17:47 +02:00
scrawl
604580d75d
Move toMatrix to Nif::Node
2015-05-07 21:17:15 +02:00
scrawl
f760aebc92
Disable MyGUI VBOs due to crashes (will look into proper fix)
2015-05-05 17:55:38 +02:00
Marc Zinnschlag
0c27869089
Merge remote-tracking branch 'scrawl/bullet283'
2015-05-05 10:52:18 +02:00
scrawl
100d6e5fff
Render MyGUI in background thread, i.e. refactor to get rid of DYNAMIC DataVariance
2015-05-05 02:38:59 +02:00
scrawl
ee60df1e27
Split MyGUI rendering into Update, Cull and Draw stages
2015-05-04 22:17:28 +02:00
scrawl
27751db99a
Use btScaledBvhTriangleMeshShape, bump required bullet version to 2.83
2015-05-04 16:23:33 +02:00
dteviot
b0c4be2316
Multi-select + context menu. ( Fixes #2480 )
...
Content selector, added multi-select + context menu to allow check/uncheck the multi-selected items.
2015-05-04 14:52:47 +12:00
scrawl
e1f4a7f647
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwgui/mainmenu.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwrender/animation.cpp
apps/openmw/mwrender/debugging.cpp
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/sky.cpp
components/nif/nifkey.hpp
components/nif/nifstream.hpp
components/nifbullet/bulletnifloader.cpp
components/nifogre/ogrenifloader.hpp
libs/openengine/bullet/physic.cpp
libs/openengine/gui/manager.cpp
2015-05-04 02:41:50 +02:00
scrawl
a37a83eaea
Use interleaved vertex data in MyGUI render manager, avoiding redundant copies
2015-05-03 22:15:53 +02:00
scrawl
5a759f8b0d
GUI cleanup fix
2015-05-03 18:35:29 +02:00
scrawl
140e67036c
Flip non-dds textures vertically
...
Fixes the up-side down loading screens.
2015-05-03 17:10:50 +02:00
Marc Zinnschlag
83a7eea2a9
Merge remote-tracking branch 'scrawl/master'
2015-05-03 09:54:32 +02:00
scrawl
1a5407af98
Reduce texture memory usage in OpenMW
2015-05-02 19:36:36 +02:00
scrawl
dc9b27acfe
Create manual GUI textures
2015-05-02 18:06:54 +02:00
scrawl
1b78acc2c0
Remove manual allocation for images
2015-05-02 18:06:17 +02:00
scrawl
cac288d5be
Remove OgreInit
2015-05-01 21:49:36 +02:00
scrawl
d9d84bd7b2
Remove bullet raycasting shapes, to be replaced with OSG ray casts
2015-05-01 21:43:21 +02:00
scrawl
82c4d01b37
Add back resource handling workarounds to the gui code
2015-05-01 18:37:24 +02:00
scrawl
9f74be8fcb
Add back the custom MyGUI log facility for utf8 paths on windows
2015-05-01 02:04:24 +02:00
scrawl
6afb0e43ef
Port FontLoader - requires MyGUI patch from https://github.com/MyGUI/mygui/pull/69
2015-05-01 01:44:21 +02:00
scrawl
a59940a2c7
Move MyGUI platform to components
2015-05-01 01:44:21 +02:00
scrawl
15bdb7db01
transformBoundingSphere optimization
2015-05-01 01:44:21 +02:00
scrawl
a98dc78cc5
Bounds fix
2015-04-30 15:46:16 +02:00
scrawl
83c6ba97c0
Disable skinning updates for actors beyond the AI processing distance
2015-04-30 00:10:24 +02:00
k1ll
8e094d6fa5
Add static bullet to components
2015-04-29 18:31:29 +02:00
k1ll
b194af4ab2
Add static qt to components
2015-04-29 18:31:29 +02:00
k1ll
a230050ec8
Boost tr1 unordered map does not work with mingw
2015-04-29 18:31:29 +02:00
k1ll
00b7712a59
Fix shlwapi include case and add the lib for linking when building for windows
2015-04-29 18:31:28 +02:00
Marc Zinnschlag
ba57a648db
Merge remote-tracking branch 'rohit-n/reorder'
2015-04-29 12:09:55 +02:00
Marc Zinnschlag
607a16eb01
removed leftover ignoreRefNum argument
2015-04-29 12:09:30 +02:00
Rohit Nirmal
997347b01e
Silence -Wreorder warnings.
2015-04-28 18:48:02 -05:00
Marc Zinnschlag
f1c0847897
Merge remote-tracking branch 'cc9cii/moveref'
2015-04-28 14:07:18 +02:00
Marc Zinnschlag
e69687b0f2
silenced a warning (potentially unintialised variable)
2015-04-28 14:06:52 +02:00
scrawl
63b69db617
Port skeleton based bounding boxes to the new skinning system
...
Not sure if going to keep this, there's a noticable performance impact.
2015-04-27 15:41:34 +02:00
cc9cii
7673be6d0f
Loading of moved refs complete.
2015-04-26 12:18:23 +10:00
scrawl
b4a06bd78d
Improve skinning performance
2015-04-25 19:32:07 +02:00
cc9cii
e668b35b02
Fix typo.
2015-04-25 17:51:31 +10:00
cc9cii
dcce59f76c
Pass MovedCellRef info to RefCollection. Still has debugging code.
2015-04-25 17:20:02 +10:00
cc9cii
acb800b8f9
Resolve merge issues and fix typos.
2015-04-25 09:39:37 +10:00
scrawl
372a54bbc7
Dead code removal
2015-04-25 01:28:01 +02:00
cc9cii
f1a58994c6
Merge branch 'master' into moveref
...
Conflicts:
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/commands.hpp
apps/opencs/model/world/ref.cpp
apps/opencs/view/world/dialoguesubview.cpp
apps/opencs/view/world/dialoguesubview.hpp
apps/opencs/view/world/util.cpp
components/esm/cellref.hpp
2015-04-25 06:52:53 +10:00
scrawl
09742d5b95
Animation playback works, no movement accumulation yet
2015-04-23 20:41:31 +02:00
scrawl
6fada6acf8
Remove tests for no longer existing code
2015-04-23 20:02:18 +02:00
scrawl
12f3198f68
Node name lookups should be case insensitive
...
Concerns "AttachLight", "BoneOffset" and equipment part attachment points, that are all case insensitive in vanilla MW.
2015-04-23 17:15:30 +02:00
scrawl
cd7808fc11
Cleanup in preparation for animation port
...
Scrapped previous idea for multiple animation sources, better approach incoming.
2015-04-22 23:16:08 +02:00
scrawl
148c041a43
Nif loader cleanup - forcing a skeleton is no longer needed
2015-04-22 19:16:49 +02:00
scrawl
1a19cd3607
Some cleanup
2015-04-22 19:08:56 +02:00
scrawl
8c810e3620
Move rng to components
2015-04-22 17:58:55 +02:00
scrawl
04accb7652
Add LightController
2015-04-22 17:37:39 +02:00
scrawl
5fbcf8a859
Mesh filtering fix
2015-04-22 16:59:23 +02:00
scrawl
a254877abe
Clone fix
2015-04-21 22:53:28 +02:00
scrawl
28643660d3
Change triangle indices to unsigned
2015-04-21 20:56:16 +02:00
scrawl
102eadf91c
Add some comments
2015-04-21 20:42:50 +02:00
scrawl
10644544ab
Dead code removal
2015-04-21 20:31:20 +02:00
scrawl
eaa4316ff8
Move skinning code to SceneUtil
2015-04-21 20:30:48 +02:00
scrawl
9246a668b9
Skeleton update fix
2015-04-21 20:22:32 +02:00
scrawl
bd88758962
Use the new skinning system in OpenMW
2015-04-21 18:54:03 +02:00
scrawl
111e3eb6db
Slightly improve bounding box for skinned meshes
2015-04-21 18:29:28 +02:00
scrawl
4ea6d4aa01
Rewrite of skinning code
...
Goals:
- get rid of the mesh pre-transform (this requires supporting different bind matrices for each mesh)
- bounding box should be relative to the bone the mesh is attached to, ideally we can then get rid of the expensive skeleton-based bounding boxes
- update bone matrices in CullCallback instead of UpdateCallback
Works OK, though the bounding boxes are not correct yet.
2015-04-21 16:02:40 +02:00
scrawl
167ae600c5
Implement gravity decay (previously unknown float)
2015-04-20 00:37:17 +02:00
scrawl
68f93294da
Port EffectManager
2015-04-19 17:55:56 +02:00
scrawl
f7d2a28930
Port BoneOffset
2015-04-19 14:25:36 +02:00
scrawl
1699759d12
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/view/render/cell.cpp
2015-04-19 02:29:16 +02:00
scrawl
edc5cad79e
Port Animation::addEffect
2015-04-19 01:57:52 +02:00
dteviot
4607c4b581
Add Modified DateTime to plug-in tooltip. ( Fixes #2479 )
2015-04-18 15:33:49 +12:00
scrawl
20af2b67a8
Change the triangle pattern used for terrain ( Fixes #2459 )
2015-04-17 18:54:14 +02:00
scrawl
083c41c950
Environment map for enchanted objects
2015-04-17 01:23:37 +02:00
scrawl
8f6d4fb3e0
Fix filtering bug
2015-04-16 01:26:58 +02:00
scrawl
57fd18b161
Fix frontface bug
2015-04-15 22:43:53 +02:00
scrawl
c334a76a6f
Fix skinning bug
2015-04-15 22:38:43 +02:00
scrawl
f7da979669
Add FrameSwitch (geometry "double buffering") for efficient updates of RigGeometry & MorphGeometry
2015-04-14 18:56:11 +02:00
scrawl
c516e897ee
Move Controller base classes to SceneUtil, add visitor to assign ControllerSources
2015-04-14 17:51:46 +02:00
scrawl
de2c85e0f8
Port nifloader to the more efficient StateSetController
2015-04-14 16:41:06 +02:00
scrawl
5dd1ab24fe
More efficient StateSetController, beginnings of sky rendering
2015-04-14 15:58:16 +02:00
scrawl
987e923790
LightManager optimization
2015-04-12 19:44:48 +02:00
scrawl
61aaf0cf70
Attach light lists to the object base nodes instead of each renderable
...
Apparently that is how Ogre worked (on the SceneNode) so let's roll with it for now. Have not tested yet what MW does.
2015-04-12 18:03:36 +02:00
scrawl
c92592493e
OpenMW: create a window and render the starting cell(s)
2015-04-12 15:38:30 +02:00
scrawl
a0b43f426e
Avoid setting DYNAMIC DataVariance on StateSets
2015-04-11 23:01:37 +02:00
scrawl
b0ea51a5c8
Colour conversion utility
2015-04-11 20:09:40 +02:00
scrawl
591a35b8d7
*very* early version of the LightManager
2015-04-10 23:16:17 +02:00
scrawl
433e29f297
MorphGeometry optimizations: static bounding box and vertices updated during cull traversal
2015-04-10 14:35:37 +02:00
scrawl
8b206e0aed
Enable culling for particle emitters & programs
...
Big speedup, though might cause timing inconsistencies that we should fix at some point.
2015-04-09 16:54:25 +02:00
scrawl
0b77ae43a4
Minor optimization for particle emitters
2015-04-09 16:51:57 +02:00
scrawl
74c56556cc
More fixes for scaled particle systems
2015-04-05 14:10:31 +02:00
scrawl
c4738b11b1
Identify unknown float in NiGravity
2015-04-05 00:09:05 +02:00
scrawl
1eafecd30c
Add magic factor as in vanilla MW to gravity affector (Bug #2147 )
2015-04-05 00:03:05 +02:00
scrawl
304d7e544f
Optimize RigGeometry to update skinning in CullCallback
2015-04-04 19:19:01 +02:00
scrawl
e5e1013c51
TextKeys attached to root node as user data, add .kf loading to scenemanager
2015-04-02 17:34:44 +02:00
scrawl
25f1c1ae76
Remove persistent flag which will be unused
2015-04-02 17:33:24 +02:00
scrawl
31adaf2495
Use simulationTime instead of referenceTime
2015-04-02 17:32:52 +02:00
scrawl
af67de73a5
Delete shiny
2015-04-01 17:06:31 +02:00
scrawl
4e69e7cc0f
OpenMW compiles and runs w/o render window
2015-04-01 17:02:15 +02:00
scrawl
12f27123f2
Billboard scaling fix and culling bug fix
2015-03-30 17:11:27 +02:00
scrawl
a474c72026
Archive priority fix
2015-03-30 17:11:15 +02:00
scrawl
9975ec1678
Missing clone function
2015-03-29 19:39:22 +02:00
scrawl
5162e9c09e
Add comment
2015-03-29 19:39:22 +02:00
scrawl
a7272b73d0
Add utility for assembling body parts / equipment
2015-03-29 19:39:22 +02:00
scrawl
6183926732
Particle fix
2015-03-28 22:21:16 +01:00
scrawl
173887c2d9
AlphaController copy fix
2015-03-28 21:19:16 +01:00
scrawl
232e34bddd
OpenCS: port lighting toolbar, fix multiple context GL objects issue
2015-03-28 20:15:17 +01:00
scrawl
c5fd92fde1
Show a default warning texture for not found textures
2015-03-28 02:58:04 +01:00
scrawl
bb32c761df
*very* early texture manager, need a lot more thought to design this properly
2015-03-28 02:27:59 +01:00
scrawl
322fcdc2d3
Transform world space particles when attaching to a node
2015-03-28 00:30:49 +01:00
scrawl
961aba5e2b
Revert part of e91d9d0903
2015-03-28 00:11:25 +01:00
scrawl
ac2612926e
Disable unRefImageDataAfterApply
2015-03-27 23:25:15 +01:00
scrawl
236d628884
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/documentmanager.cpp
components/CMakeLists.txt
components/bsa/resources.cpp
components/nif/data.hpp
components/nif/node.cpp
components/nifogre/mesh.hpp
components/nifogre/ogrenifloader.cpp
components/nifogre/particles.cpp
2015-03-27 17:30:48 +01:00
scrawl
e91d9d0903
Fix for behaviour of scaled particle nodes
...
Not sure if used in vanilla assets so may be low priority, but couldn't help looking into this.
2015-03-27 17:00:10 +01:00
scrawl
c10c146ad1
Skeleton based bounding box callback for RigGeometry (Bug #455 )
2015-03-26 23:15:46 +01:00
scrawl
99e1720980
Add SceneManager and clone utility
2015-03-26 18:02:51 +01:00
scrawl
60f288195f
Fix for copy construction of particle system templates
2015-03-26 17:39:33 +01:00
scrawl
99c9907ff3
Fix emitter/particlesystem scene graph order problems
2015-03-26 17:38:17 +01:00
scrawl
caa93f767b
Skip creating meshes for hidden nodes with no VisControllers
...
There's quite a bit of garbage in base_anim.nif, so this change should result in a much leaner scene graph.
2015-03-25 18:46:55 +01:00
scrawl
e938fa4a9d
Implement extrapolation mode in ControllerFunction (Bug #1871 )
2015-03-25 18:12:43 +01:00
scrawl
96d51f0bb7
NiParticleRotation seems to be unused
2015-03-25 16:34:51 +01:00
scrawl
46cbec9a4a
Add skinning auto-detection in nifosg loader
2015-03-25 15:39:41 +01:00
scrawl
b7867d6f0a
Stop warning about unused nif properties
2015-03-25 05:29:00 +01:00
scrawl
60ede8dede
Stop warning about NiFogProperty (unused in MW)
2015-03-25 05:14:07 +01:00
scrawl
6d9deaa386
Implement planar collider for particles ( Fixes #2149 )
2015-03-25 04:57:01 +01:00
scrawl
c179977f20
Fix quaternion rotation order
2015-03-25 01:58:41 +01:00
scrawl
20866b44f7
FlipController fix, DetailTexture & DarkTexture tested
2015-03-25 00:55:09 +01:00
scrawl
b072e803ce
Use correct ambient/diffuse default values when no NiMaterialProperty exists
2015-03-24 23:55:21 +01:00
scrawl
9ee99a751c
Stop warning about NiDitherProperty, ignore NiShadeProperty (unused)
2015-03-24 23:40:37 +01:00
scrawl
9141a8d801
Fully implement NiStencilProperty (Feature #1057 )
2015-03-24 23:05:20 +01:00
scrawl
baa152328a
Crash fix
2015-03-24 01:32:36 +01:00
scrawl
1affa497d5
Delete the old nifogre loader
2015-03-23 20:00:28 +01:00
scrawl
376f0f3ac1
Small cleanup
2015-03-23 17:49:06 +01:00
scrawl
018115601a
Move particle emitter/affector handling to separate functions
2015-03-23 16:49:33 +01:00
scrawl
36ad40827b
Move parent node attachment out of nifloader
2015-03-23 16:17:40 +01:00
scrawl
ff9e2b03a0
Hide NIF loader details in the implementation file
2015-03-23 16:10:18 +01:00
scrawl
5a582e7eb7
Reintroduce showMarkers flag
2015-03-23 01:57:14 +01:00
scrawl
6d85444d26
Add text key loading
2015-03-23 01:51:44 +01:00
scrawl
6219a7bbfc
Add .kf loader
2015-03-23 01:31:16 +01:00
scrawl
9242e6d256
Avoid copying keyframes in controller instances
2015-03-22 23:47:49 +01:00
scrawl
2db5df77f0
Change rotation/scale workaround in preparation for loading .kf controllers
2015-03-22 22:55:35 +01:00
scrawl
15f9c1ddcf
NiBSPArrayController works
2015-03-21 23:10:52 +01:00
Marc Zinnschlag
9ab25dbf6b
Merge remote-tracking branch 'dteviot/Rng'
2015-03-21 09:00:55 +01:00
dteviot
2cfc4c0286
script Random() command now returns correct range.
2015-03-21 18:21:01 +13:00
scrawl
71782462b7
Subclass ParticleSystem to support limit on the number of particles
2015-03-21 04:36:36 +01:00
scrawl
2e11642273
Fix BillboardNode overriding scale
2015-03-21 04:10:50 +01:00
scrawl
a9aee389c0
Emitters attached to correct node, a bit ugly
2015-03-21 03:50:50 +01:00
scrawl
32bb202290
Implement BillboardNode
2015-03-20 23:14:01 +01:00
scrawl
d486cde330
Fix broken VisControllers
2015-03-20 21:32:26 +01:00
scrawl
4957ceeb1d
Refactor controllers, now part of the scene graph as UpdateCallbacks
...
Practical benefits:
- The controller update is now run automatically
- Creating an instance of a scene graph should now work properly using the defined copy constructors
2015-03-20 19:51:54 +01:00
scrawl
af27a10b0c
OpenCS: preliminary port of PreviewWidget to OSG
2015-03-20 16:22:33 +01:00
scrawl
40fc097722
OpenCS: use the new VFS, restored resource tables
2015-03-20 16:22:33 +01:00
Marc Zinnschlag
5198a173fa
Merge remote-tracking branch 'corristo/osx-user-data-path'
2015-03-19 18:50:05 +01:00
scrawl
49c2da27b3
OpenCS compiles and runs again (no rendering)
2015-03-19 17:21:15 +01:00
scrawl
ab3c28eb96
Use template function for interpolation
2015-03-19 17:00:16 +01:00
scrawl
00ab474188
More work on copy constructors
2015-03-19 16:22:01 +01:00
scrawl
7bc0d41bb0
Marker collision fix ( Fixes #2461 )
2015-03-19 15:51:45 +01:00
scrawl
f8422c3ed4
Particles mostly completed, still need to attach emitters to the correct node and handle NiBSPArrayController
2015-03-19 03:01:11 +01:00
scrawl
79c2138e53
Port ResourceHelpers to new VFS
2015-03-19 01:45:01 +01:00
Nikolay Kasyanov
af2b08214b
#2460 : use Application Support as user data path on OS X
2015-03-18 23:48:03 +02:00
Nikolay Kasyanov
3e45e9a48a
Remove no longer required strnlen wrapper
...
It was used for MinGW & OS X < 10.7. Minimal OS X version was bumped to
10.7 and MinGW support was recently dropped (see
1eaa64c49c
2015-03-18 23:37:54 +02:00
Marc Zinnschlag
47bac13749
Merge remote-tracking branch 'scrawl/master'
2015-03-18 12:07:40 +01:00
scrawl
f843e12538
Add world space particle systems, will need more changes when emitters are added
2015-03-17 22:34:30 +01:00
scrawl
510375aa63
Add virtual file system (VFS) replacing the low level parts of the old resource system
2015-03-17 22:02:56 +01:00
Marc Zinnschlag
c032113247
Merge remote-tracking branch 'sandstranger/release-jni-memory'
2015-03-17 11:41:41 +01:00
scrawl
f7ecda68c9
Fix for unicode filenames in ContentModel ( Fixes #2451 )
2015-03-16 15:34:00 +01:00
sylar
db10c87b89
release jni memory
2015-03-16 18:21:38 +04:00
Nathan Aclander
48e2ec2840
Fix comparison of integers of different signs
...
Clang reported comparison of unsigned long with long. This cast should fix it.
2015-03-15 16:20:17 -07:00
Marc Zinnschlag
86d39cede9
Merge remote-tracking branch 'dteviot/Rng'
2015-03-15 22:04:26 +01:00
dteviot
3f28634d1f
consolidate random number logic
...
Note, I suspect Rng::rollClosedProbability() is not needed. The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
2015-03-15 14:07:47 +13:00
dteviot
1d7f3474fa
Fixed more MSVC 2013 warnings.
2015-03-15 08:49:03 +13:00
dteviot
2ef7fc4e2c
Installer work for Windows ( Fixes #1621 )
...
1. Correctly reads Windows registry for vanilla MW install location.
2. Populates existing installation page with location of vanilla, when found.
3. On Windows, installer wizard now gets to Import page.
2015-03-15 08:08:55 +13:00
cc9cii
488bc76da5
Fix saving land data.
2015-03-13 22:06:55 +11:00
Marc Zinnschlag
056bc66c6c
Merge remote-tracking branch 'scrawl/master'
2015-03-12 10:29:39 +01:00
scrawl
5f051b5bf2
Remove comment about GMST cleaning which was removed.
2015-03-12 00:32:57 +01:00
scrawl
16ddfbca14
Remove some outdated todo comments
2015-03-12 00:27:01 +01:00
scrawl
304277429f
Rename variable to not show up in search for "TODO" comments.
2015-03-12 00:21:46 +01:00
Scott Howard
e2ef8c4022
fix -Wnewline-eof warnings
2015-03-11 10:54:45 -04:00
scrawl
e30f240ba2
Add travel service support for creatures ( Fixes #2432 )
2015-03-09 03:15:11 +01:00
dteviot
36141b0c53
Merge remote-tracking branch 'OpenMW/master' into FixWarnings
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
extern/sdl4ogre/sdlcursormanager.cpp
2015-03-08 18:29:12 +13:00
dteviot
e197f5318b
fixing MSVC 2013 warning C4244: & C4305
...
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
2015-03-08 13:07:29 +13:00
Marc Zinnschlag
ba482fa41f
Merge remote-tracking branch 'dteviot/FixWarnings'
2015-03-07 18:34:29 +01:00
dteviot
f2ac939e61
reverted mShouldRepeat back to unsigned char.
...
As recommended by Scrawl.
2015-03-07 11:04:54 +13:00
Marc Zinnschlag
907ac5ef7f
Merge remote-tracking branch 'scrawl/master'
2015-03-06 19:24:15 +01:00
dteviot
45b6538820
fixed MSVC 2013 warning C4800
...
forcing value to bool 'true' or 'false'
2015-03-06 23:19:57 +13:00
dteviot
407cd50890
fixed warning C4099:
...
type name first seen using 'class' now seen using 'struct'
2015-03-06 21:36:42 +13:00
cc9cii
d28f257ada
Fix for bug #2428 . Set default flag value (mandatory) for containers.
2015-03-06 11:53:46 +11:00
dteviot
80fe24207c
correction from Scrawl.
...
Now correctly handles skills/attributes.
Also, document what ContentSelectorView::ContentSelector::slotAddonTableItemActivated() is doing.
2015-03-05 20:21:22 +13:00
Marc Zinnschlag
4e1c086d6a
load start up script records
2015-03-03 14:31:59 +01:00
Marc Zinnschlag
bf92d5cde9
removed redundant mScript field in ESM::StartScript
2015-03-03 13:04:57 +01:00
scrawl
a8cb4e807b
Warning fix
2015-03-03 11:24:23 +01:00
scrawl
17e3069896
Minor efficiency fix
2015-03-02 22:33:37 +01:00
scrawl
f6509fe53e
Another crash fix for land record without data
2015-03-02 22:23:00 +01:00
Marc Zinnschlag
8b84fa5579
Merge remote-tracking branch 'scrawl/master'
2015-03-02 20:01:31 +01:00
scrawl
0ad514b29b
Fix collision for nodes with MRK extra data ( Fixes #2415 )
2015-03-02 01:03:03 +01:00
cc9cii
1ee6153940
Remove unnecessary boolean passing between objects.
2015-03-02 06:51:31 +11:00
cc9cii
c4625b94e5
Fix OpenCS crashing since commit 9d6145 by showing gamefiles if the content selector was created from OpenCS.
2015-03-01 12:52:43 +11:00
dteviot
5e2839977b
file extension comparison needs to be case insensitive.
2015-02-28 20:25:03 +13:00
dteviot
54e3ebde63
addon list in launcher shows addon files with no dependencies ( Fixes #2348 )
...
Also, game files must end with ".esm" or ".omwgame".
2015-02-28 17:13:21 +13:00
scrawl
f91696723f
Fix compile error
2015-02-27 19:58:43 +01:00
Marc Zinnschlag
44d1f43b2b
Merge remote-tracking branch 'sandstranger/fixes-for-android'
2015-02-27 10:34:41 +01:00
Marc Zinnschlag
093c577895
Merge remote-tracking branch 'dteviot/Bug2344'
2015-02-26 19:05:30 +01:00
sylar
70398e2f9f
change Jni name method
2015-02-26 18:30:14 +04:00
dteviot
9d61457956
AddOn files can be checked if game file is checked, but dependencies do not exist.
2015-02-25 20:54:52 +13:00
dteviot
6878e317a7
launcher: decouple Combo Box model from Plug-ins model.
...
fixes bug reported by scrawl
1. openmw.cfg had content files in order 'Bloodmoon.esm, Tribunal.esm, Morrowind.esm'
2. Blank_ESM_2.0.esm is in the Data Files directory
3. Do an ini file import.
4. Imported profile will have Blank_ESM_2.0.esm as the game file. Should be Morrowind.esm.
Root cause: Game File combo box and Plugins Grid shared same data model, so changing plug-in file order also changed order of Game File combo box.
2015-02-24 20:06:06 +13:00
scrawl
8d64f2081e
Add particle system state loading
2015-02-24 01:25:31 +01:00
scrawl
2a92fb57f7
Add FlipController
2015-02-24 00:02:10 +01:00
scrawl
6c8613ae35
Add DarkTexture and DetailTexture
2015-02-23 23:21:56 +01:00
scrawl
c54ee16748
Add AlphaController and MaterialColorController
2015-02-23 21:55:32 +01:00
scrawl
3839d6f777
Simplify controller classes
2015-02-23 21:55:32 +01:00
scrawl
74dfb23e7b
Handle material properties in trishapeToGeometry
2015-02-23 21:55:32 +01:00
scrawl
6c63bab8e4
Change Nif::Property flags to unsigned
2015-02-23 21:08:25 +01:00
scrawl
8e01d8cb19
Add OSG nifloader, currently supports geometry, materials, basic texturing, skinning, morphing, and most controllers.
2015-02-23 21:06:10 +01:00
dteviot
63af9d848a
Add constraint: Bloodmoon.esm requires Tribunal.esm.
2015-02-23 19:58:31 +13:00
dteviot
6dc202cba3
Removed unneeded parameter from ContentModel::setContentList()
2015-02-23 19:41:41 +13:00
scrawl
6b36e55a4e
NIF reader cleanup: move definitions to cpp file
2015-02-22 19:17:28 +01:00
scrawl
387969bf42
Remove an old .gitignore
2015-02-22 18:05:46 +01:00
scrawl
da690c91b3
Delete the old Ogre DataStream class
2015-02-22 14:19:00 +01:00
scrawl
8f0ab7d09f
ESM component no longer relies on Ogre DataStreams
2015-02-22 14:12:05 +01:00
dteviot
accc078e0e
Morrowind.ini import progress bar. ( Fixes #2344 )
...
1. Show a "bouncing ball" Progress bar when importing from morrowind.ini.
2. Removed dialog that asks for content list name when import game files from morrowind.ini. Instead, name is time stamp.
3. Removed commented out code.
4. Additional bugfix. No longer create a empty content list when OpenMW.cfg has no content files.
2015-02-22 08:46:12 +13:00
scrawl
68bce7825e
Multiple definition fix
2015-02-20 17:57:18 +01:00
scrawl
f6f37e02df
NIF Transformation redundancy fix and include fixes
2015-02-20 17:56:49 +01:00
scrawl
8c10d4badb
NIF reader compiles without Ogre
2015-02-17 17:08:55 +01:00
scrawl
d4dff6ed55
Port BSAFile to istream, remove OGRE bsa resource system
2015-02-17 16:19:21 +01:00
scrawl
5a3d796578
Implement std::istream subclass for constrained file streams
2015-02-17 12:26:28 +01:00
Marc Zinnschlag
8686ffcedb
Merge remote-tracking branch 'scrawl/master'
2015-02-17 11:55:12 +01:00
Marc Zinnschlag
6cc9fa2b3f
Merge remote-tracking branch 'slothlife/cmake-release-build-fix'
2015-02-15 09:52:13 +01:00
scrawl
96a295c44f
Fix for deleting all items in a levelled list
2015-02-13 17:37:56 +01:00
scrawl
8b417c06db
Fix missing clear in ESM::Spell::load ( Fixes #2368 )
2015-02-13 17:26:33 +01:00
scrawl
a139e4efb0
Grey out completed quests in journal quests list
2015-02-13 16:51:34 +01:00
Kamil Bar
3b7a23aa72
Fixed charge checks for light and other objects, corrected CellRef charge union comments
2015-02-13 13:11:10 +01:00
scrawl
49d912e5b6
Don't rely on subrecord order part 2
...
Nice side effects:
- Subrecord name comparison now uses magic number instead of string (faster)
- Improves the error message for unknown subrecords: will print the record in question instead of failing to read the next record with a strange error
2015-02-12 05:43:22 +01:00
slothlife
cfe81bafe8
Remove setting CMAKE_BUILD_TYPE to Debug
...
Setting was causing single-target configurations (ninja, make) to
incorrectly link vs debug runtimes on Windows.
2015-02-11 21:46:00 -06:00
scrawl
9009889d24
Don't rely on subrecord order when reading ( Fixes #2361 )
2015-02-10 23:19:33 +01:00
scrawl
3ccf4642b4
Implement ToggleScripts
2015-02-10 20:25:57 +01:00
jacmoe
ee574e08ef
MIT License header added to all terrain component files.
2015-02-09 20:16:29 +01:00
scrawl
03257ecae5
QString encoding fix
2015-02-09 20:15:41 +01:00
scrawl
4c6b9f8266
Remove redundant decoder in ContentModel
2015-02-06 01:27:17 +01:00
scrawl
cff0127ce7
Update comment on merging levelled lists
2015-02-06 01:27:17 +01:00
scrawl
d18d2a1882
Skip rest of LEVI record if it has no items (Bug #2348 )
2015-02-06 01:27:17 +01:00
scrawl
bea88c3643
Stolen item tracking overhaul part 2 ( Fixes #2338 )
2015-02-06 01:27:16 +01:00
scrawl
f8b4ff3004
Documentation fix
2015-02-05 04:18:43 +01:00
scrawl
ab9100fa90
Prevent dropping item on itself in ContentModel ( Fixes #2334 )
...
Also improves the drop indicator, it is now shown in between items instead of on an item.
2015-02-05 04:18:43 +01:00
scrawl
27dc49a135
Rewrite game settings manager
...
Removes the abhorrent dependency on Ogre for this code and improves the error handling.
2015-02-05 04:18:42 +01:00
scrawl
6d097fbfbd
Normalise spelling of "levelled" throughout the code
2015-02-05 04:18:42 +01:00
scrawl
fec8cf91f5
Add exception handling to various uses of DataStream::read
2015-01-31 22:40:42 +01:00
scrawl
2abc033655
ConstrainedDataStream: print the name of the file in exceptions
2015-01-31 22:40:42 +01:00
scrawl
51e451e249
Tabs to spaces
2015-01-31 22:40:42 +01:00
scrawl
d541bc8064
Remove unused functions in nifstream
2015-01-31 22:40:42 +01:00
scrawl
2346c3528d
Remove NpcStats::mProfit and store it in the script instead
...
Also use the Profit label when the "minimumProfit" script variable exists, rather than hardcoding to NPCs.
2015-01-31 22:40:40 +01:00
scrawl
b9acf437fd
Remove friendly hits from the save file
...
The vanilla engine does not store friendly hits in the save file. Since there's no other mechanism that ever resets the friendly hits (at least not to my knowledge) this should be regarded a feature rather than a bug.
2015-01-31 22:40:39 +01:00
scrawl
ef3ba12cb6
Add silent mode to ConfigurationManager, used by essimporter
2015-01-31 22:40:39 +01:00
scrawl
081c8c8615
ESSImport: convert to utf8, based on encoding setting in openmw.cfg
2015-01-31 22:40:38 +01:00
scrawl
e712b0353b
Terrain refactoring, reduce game startup time and memory usage
2015-01-29 03:39:01 +01:00
scrawl
62a32220ff
Use low-LOD heightmap for world map rendering
...
Add vanilla-accurate colour palette (thanks Hrnchamd)
2015-01-29 03:39:01 +01:00
scrawl
431f540791
ESSImport: fix NPC factions
2015-01-27 23:12:21 +01:00
scrawl
875df46ae9
ESSImport: convert journal indices
2015-01-27 23:12:21 +01:00
scrawl
6367b4dc0b
Improve INFO struct naming
2015-01-27 23:12:21 +01:00
scrawl
9d3f0b2ed5
Remove some unused code, include cleanup
2015-01-27 23:12:13 +01:00
scrawl
d34086ac8f
ESSImport: convert running global scripts
2015-01-27 23:05:20 +01:00
scrawl
4921c6ef9e
Split window caption bars so that the caption can be transparent ( Fixes #531 )
...
Fix transparent window background not applying to the header bar (Fixes #2294 )
2015-01-27 23:05:19 +01:00
dteviot
946dd16696
Fixed Windows warning.
...
warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
2015-01-26 13:57:22 +13:00
dteviot
f95743ccc3
Fixed MSVC warning.
...
warning C4305: 'return' : truncation from 'double' to 'float'
2015-01-26 13:18:21 +13:00
dteviot
e02bab67ba
Fixed MSVC warnings.
...
warning C4099: 'ESM::ESMReader' : type name first seen using 'class' now seen using 'struct'
warning C4099: 'ESM::CellId' : type name first seen using 'struct' now seen using 'class'
2015-01-26 13:17:16 +13:00
Nathan Aclander
33ce03dfc5
Should be compared against uint only
2015-01-24 17:17:05 -08:00
scrawl
b1bd236345
ESSImport: convert script local variables
...
Had to add special reading code to openmw, because the variable names are not stored.
2015-01-24 16:45:36 +01:00
Marc Zinnschlag
7f905470fa
fixed moved reference loading
2015-01-24 15:01:38 +01:00
scrawl
7d76213374
Fix loading faction reactions for older savegames ( Fixes #2301 )
2015-01-24 14:32:02 +01:00
Marc Zinnschlag
89998a6a03
save MVRF subrecords
2015-01-24 14:22:29 +01:00
scrawl
79d2eebe54
Store selected enchant item in savegame ( Fixes #1702 )
2015-01-23 16:45:47 +01:00
scrawl
a619cff615
Implement EnableLevelupMenu to trigger level-up
2015-01-23 15:34:47 +01:00
scrawl
c883a73d30
Several warning fixes
2015-01-23 15:34:47 +01:00
scrawl
8b5effe3e0
Fix wrong magic number for JOUR in openmw savegames
2015-01-23 15:34:47 +01:00
scrawl
e203127952
ESSImport: read script variables (not converted yet)
2015-01-23 15:34:47 +01:00
scrawl
1e92cab3e7
ESSImport: read dialogue/journal records, not converted yet
2015-01-23 15:34:14 +01:00
scrawl
69676906ae
Don't clear known spells when reading from the savegame
...
This is needed because the .ess format doesn't include the racial spells in the player's spell list.
2015-01-23 15:34:14 +01:00
scrawl
c7d15e6f74
Revert "Revert "Light charge handling fix""
...
This reverts commit b95748d044
2015-01-23 15:33:39 +01:00
scrawl
d13335ba40
Ensure the item can be equipped in the given slot when loading inventory
2015-01-23 15:32:34 +01:00
scrawl
c65f9cb3c0
Revert "Change save format to store relative equipment index"
...
This reverts commit 89d9649b50
2015-01-23 02:32:43 +01:00
scrawl
b95748d044
Revert "Light charge handling fix"
...
This reverts commit 5e0428243b
2015-01-23 02:32:38 +01:00
Marc Zinnschlag
a97f599e65
fixed ref num saving in non-wide format
2015-01-22 13:41:09 +01:00
Marc Zinnschlag
764c155cec
moved code for writing/reading ref nums into RefNum struct
2015-01-22 13:33:23 +01:00
Marc Zinnschlag
fa4718283d
Merge remote-tracking branch 'scrawl/contentselector'
2015-01-21 15:23:38 +01:00
Marc Zinnschlag
cd62dbc5b7
Merge remote-tracking branch 'scrawl/essimporter'
2015-01-21 15:12:04 +01:00
scrawl
5e0428243b
Light charge handling fix
2015-01-21 01:59:45 +01:00
scrawl
db64ff6645
Fix actorId initialization
2015-01-21 01:34:00 +01:00
scrawl
89d9649b50
Change save format to store relative equipment index
...
Store the index for the allowedSlots vector instead of the absolute slot index. This will more gracefully handle edge cases like the available slots for an item having changed when loading the game, or the "allows stacking" property having changed. However the main reason this was done is to ease work on the essimporter.
2015-01-20 23:55:26 +01:00
scrawl
d473629dcd
Improve ESMReader error messages
2015-01-20 19:29:55 +01:00
scrawl
06736e9e03
ESSImport: convert faction reactions and known dialogue topics
2015-01-20 15:56:07 +01:00
Marc Zinnschlag
a266dffb4b
Merge remote-tracking branch 'scrawl/essimporter'
2015-01-20 15:53:48 +01:00
scrawl
5104a5a023
Add missing setFactionReaction instruction, use absolute storage instead of difference
...
Seems to be closer to how MW is storing it (it has the complete FACT record in the savegame, actually).
This (somewhat) breaks OMW savegame compatibility in that old changes are discarded, but I don't think the faction reactions are quest relevant anywhere.
2015-01-20 00:53:31 +01:00
scrawl
9014dc48ee
Don't require the object type id for reading references from savegames
...
This is redundant, since we can look it up from the RefID.
2015-01-20 00:42:25 +01:00
scrawl
8e1eeccbe1
ESSImport: container state
2015-01-19 13:16:12 +01:00
scrawl
a7b82e5107
ESSImport: inventory loading works, equipment slots need more work
2015-01-19 12:22:51 +01:00
scrawl
f7e32a24c9
Fix terrain assertion
2015-01-19 12:03:30 +01:00
scrawl
235683e449
Remove LightState from openmw save format to streamline inventory loading
2015-01-19 11:36:00 +01:00
scrawl
f9cf31fcd5
ESSImport: convert custom map markers, not working for interiors yet
2015-01-19 09:29:21 +01:00
scrawl
19ed047dec
ESSImport: add some subrecords to CellRef and others, most files should load now, importacdt/cellref class structure need some refactoring
2015-01-18 23:15:36 +01:00
scrawl
08ad4d73bb
ESSImport: player is placed in correct cell, npc cellrefs work
2015-01-18 20:01:50 +01:00
Marc Zinnschlag
e9af9b991d
Merge remote-tracking branch 'dteviot/master'
2015-01-18 09:50:56 +01:00
dteviot
71700d2cb1
Bugfix: OpenCS segfault when plug-in dependency not found.
...
When a file that a plug-in depends on cannot be found, the OpenCS file dialog crashes.
Similar problem exists in omwlauncher's "Data Files" dialog.
2015-01-18 11:55:58 +13:00
dteviot
017e4cd4ef
OpenCS shows plug-ins with load order issues.
...
1. FileDiaog in OpenCS now shows warning icon beside .esm./.esp files with load order problems.
2. omwlaucher -> replaced "stop" icon with "warning" icon for files with load order problems.
2015-01-17 18:11:03 +13:00
scrawl
cbf56dbb47
ESSImport: work on cell fog of war
2015-01-17 03:07:24 +01:00
scrawl
031eec4550
Starting ESS importer for Morrowind save files
2015-01-17 00:16:49 +01:00
scrawl
fc663addfa
Fix null character issue in ESMReader::getString
2015-01-17 00:10:49 +01:00
scrawl
1869d37cfc
Remove unused mLastDrowningHit
2015-01-17 00:10:45 +01:00
Marc Zinnschlag
9603325b99
Merge remote-tracking branch 'origin/master'
2015-01-15 17:33:20 +01:00
Marc Zinnschlag
375d426dd0
check for premature end of scripts more consistently
2015-01-15 11:35:17 +01:00
scrawl
d387c207d1
Fix initial scaling for btCompoundShape children ( Fixes #2234 )
2015-01-14 18:49:25 +01:00
scrawl
f11ec653d0
Add setting for showing MRK nodes to NIF loaders
...
This makes marker objects show up in OpenCS.
2015-01-13 17:29:25 +01:00
scrawl
883f7ec7ce
Move workaround for hiding markers from NIF loader to Scene
2015-01-13 17:19:39 +01:00
Marc Zinnschlag
7cc1ebc05b
Merge remote-tracking branch 'scrawl/master'
2015-01-13 10:38:02 +01:00
scrawl
7b4665c623
Terrain: documentation update
2015-01-13 05:37:44 +01:00
scrawl
261da8dd0a
Terrain: use 32-bit indices if necessary
2015-01-13 05:37:43 +01:00
scrawl
f7bac58b39
Terrain: change index buffer flags to unsigned
2015-01-13 05:37:43 +01:00
scrawl
41b3a9dba9
Rewrite animated collision shape support ( Fixes #2123 )
2015-01-13 05:37:37 +01:00
scrawl
de23ad5c8d
Change dynamic_cast to static_cast to make coverity happy
2015-01-12 23:29:58 +01:00
scrawl
04d6cead3b
Autogenerated collision should only be disabled if RootCollisionNode is a child of the root node ( Fixes #2133 )
2015-01-12 23:29:57 +01:00
Marc Zinnschlag
763e058ed2
Merge remote-tracking branch 'dteviot/master'
2015-01-12 10:41:04 +01:00
dteviot
e95b513cfc
Use icon to show files with problem ( Fixes #2268 )
...
Launcher now indicates files with problem using an icon.
Using red text for files with load order issue removed because it doesn't work well with dark themes.
2015-01-12 21:17:41 +13:00
Marc Zinnschlag
7c959c8494
Merge remote-tracking branch 'dteviot/Bug811'
2015-01-11 12:30:32 +01:00
dteviot
7aa0f887c0
Minor changes to ESM::RefNum
...
1. Changed mIndex to unsigned, to solve potential implementation defined behavior with right shift.
2. Refactoring to minimize use of magic number -1 to indicate "no Content File".
2015-01-11 12:20:22 +13:00
Marc Zinnschlag
e439065897
Merge remote-tracking branch 'scrawl/master'
2015-01-10 11:33:04 +01:00
dteviot
05b89be8bf
Launcher sets content list to match values in openmw.cfg ( Fixes #811 )
...
I took the liberty to add accessor & mutator functions for classes ContentListsGameSettings and LauncherSettings , as existing code can reverse order of entries.
Also replaced some "magic strings" with named constants.
2015-01-10 18:46:47 +13:00
scrawl
efbc8742a0
Remove some unnecessary includes
2015-01-09 21:13:57 +01:00
Marc Zinnschlag
d254bb0a34
Merge remote-tracking branch 'dteviot/FixLoadOrderReset'
2015-01-09 09:32:23 +01:00
scrawl
ef7e0070a6
Don't right-shift signed integers which is implementation-defined
2015-01-08 16:27:13 +01:00
Marc Zinnschlag
4b88ef5891
fixed QuickFileParser handling of begin line (skip it instead of trying to make sense of it)
2015-01-08 13:59:03 +01:00
dteviot
9d6efcecff
Merge remote-tracking branch 'OpenMW/master' into FixLoadOrderReset
...
Fixed Conflict:
components/contentselector/model/contentmodel.cpp
2015-01-08 12:15:48 +13:00
dteviot
083de62be5
Fixed issues found by Zinnschlag.
...
1. Errors found are added to default tool tip text. (Instead of replacing it.)
2. If multiple errors are found, all are shown in tool tip text, not just first one.
3. Load Order Errors are updated when files are activated/deactivated, not just when the files have their position in list changed.
2015-01-08 11:18:42 +13:00
Marc Zinnschlag
38a413a483
Merge remote-tracking branch 'scrawl/master'
2015-01-07 20:22:15 +01:00
Marc Zinnschlag
83e454e493
Merge remote-tracking branch 'marcoschulze/git-version-retrieval-fix'
2015-01-07 12:29:09 +01:00
scrawl
e19ab77d00
Store camera first person state in savegame ( Fixes #2255 )
2015-01-07 02:34:24 +01:00
scrawl
c6c7d102d0
Revert "components/nif/base.hpp now uses the templated get() function"
...
This reverts commit ad609bff789909c4abadc1315ed90c2619d57bb6f318ee0b8c4edc4142f3
2015-01-06 23:36:15 +01:00
scrawl
f267497c03
Allow separate summoned creature instances for each spell ID ( Fixes #2194 )
2015-01-06 16:11:05 +01:00
scrawl
afc961d19c
Workaround for random AABB assertion due to zero-sized particles ( Fixes #1663 )
2015-01-05 20:32:26 +01:00
Marc Zinnschlag
365bb3d3f0
Merge remote-tracking branch 'scrawl/unused'
2015-01-05 20:05:23 +01:00
scrawl
d919a0186e
Comment out unused opSkipOnZero
2015-01-05 18:54:52 +01:00
scrawl
4a734f5cd3
Fall back to top-level directory when looking for resources ( Fixes #2169 )
2015-01-03 19:10:15 +01:00
Marc Zinnschlag
ac7c2a1473
some cleanup
2015-01-03 13:59:59 +01:00
Marc Zinnschlag
bbbf431ae3
double bug in script name handling workaround ( Fixes #1730 )
2015-01-03 13:54:46 +01:00
Marc Zinnschlag
9f6a2d00e8
Merge remote-tracking branch 'thoronador/fix-uninitialized-members'
2015-01-02 18:17:25 +01:00
Thoronador
773669952b
remove initializing constructors from "dumb structs"
...
As suggested by Marc Zinnschlag:
https://github.com/OpenMW/openmw/pull/423#issuecomment-68526701
2015-01-02 16:30:14 +01:00
Arthur Moore
ad609bff78
components/nif/base.hpp now uses the templated get() function
2015-01-02 01:19:34 -05:00
Arthur Moore
9909c4abad
Made incorrect nif get error message more informative.
2015-01-02 01:16:47 -05:00
Arthur Moore
c1315ed90c
Build the nif file tester by default
...
It's extremely useful in determining if a nif file is bad without having to load up openmw or opencs.
Also updated the nif testing script to run at a low priority.
2015-01-01 22:49:33 -05:00
Arthur Moore
2619d57bb6
Converted most nifstream "get multiple" functions to the templated version
2015-01-01 22:49:05 -05:00
Arthur Moore
f318ee0b8c
Add a templated option for getting vectors to NIFStream
2015-01-01 22:45:55 -05:00
Arthur Moore
4edc4142f3
Made NIFStream getters templated
2015-01-01 21:39:44 -05:00
Thoronador
9cc219ff76
fix uninitialized members in Pathgrid::Point
2015-01-02 01:22:53 +01:00
Thoronador
87fac78823
fix uninitialized members in Cell and structures
2015-01-02 01:01:37 +01:00
dteviot
fb671fed20
Corrected issues found by Scrawl.
2015-01-01 15:53:35 +13:00
scrawl
01652bbcc5
Store original actor position in AiWander package ( Fixes #2200 )
2015-01-01 03:38:49 +01:00
dteviot
43dd9aee94
Fix for more errors found by Travis CI.
2015-01-01 10:13:27 +13:00
dteviot
93bbd7463a
Fixed errors and warnings from Travis CI.
2015-01-01 09:40:42 +13:00
dteviot
dfbd470613
Adjust plug-in order to match profile loading.
...
Also marks plug-ins with load order problems in red and changes tool tip to describe error.
2014-12-31 19:19:54 +13:00
scrawl
363d1f9207
Merge remote-tracking branch 'upstream/master'
2014-12-30 23:01:45 +01:00
Marco Schulze
3024c67995
Regenerate components/version/version.hpp as HEAD moves on a git checkout
...
Pull request #416 introduced a common bug where version.hpp wouldn't be
regenerated every build, poteantially leading to stale version data. This
commit adds a custom build target, git-version, which updates version.hpp
before the components library is built.
2014-12-30 18:37:33 -03:00
scrawl
e2346d7c37
Store permanent magic effects in savegame ( Fixes #1648 )
2014-12-30 01:36:31 +01:00
Marc Zinnschlag
82af524a58
Merge remote-tracking branch 'dteviot/master'
2014-12-26 16:21:18 +01:00
scrawl
59f21c6105
Use "hair" as filter for PRT_Hair parts ( Fixes #2218 )
2014-12-24 15:45:14 +01:00
scrawl
b35f87ae7e
Improve font file error handling
2014-12-24 15:45:13 +01:00
scrawl
c7be850162
Add messagebox escape characters for spell/weapon cycling hotkeys
2014-12-24 15:45:13 +01:00
scrawl
f931ba2efc
Fix some static analysis issues (coverity)
2014-12-24 15:45:12 +01:00
dteviot
ad5d884761
omwlauncher crash when can't read file in active profile ( Fixes #1069 )
2014-12-24 10:22:26 +13:00
MiroslavR
3cc32b641a
Fix some memory leaks
2014-12-23 20:44:25 +01:00
Marc Zinnschlag
120873a66d
another workaround for script translation messup
2014-12-18 10:40:51 +01:00
Marc Zinnschlag
057d0913d6
Merge branch 'scriptfixes'
2014-12-18 10:22:07 +01:00
Marc Zinnschlag
fc1d42a7d2
fixed exclusion for certain characters at the start of names
2014-12-18 09:55:26 +01:00
Marc Zinnschlag
b951251572
handle junk in argument lists ( Fixes #2206 )
2014-12-17 15:03:05 +01:00
Marc Zinnschlag
5cb94da9c5
compensate for incorrect minus character in translated dialogue script ( Fixes #2207 )
2014-12-17 11:56:54 +01:00
scrawl
31d28e727f
Implement leveled list script functions ( Fixes #1546 )
2014-12-17 01:24:22 +01:00
scrawl
84b0dcf2e3
Work around particles not being rendered in the first frame
2014-12-15 18:19:05 +01:00
scrawl
8f29f2667e
Fix rotation order for XYZ rotation keys ( Fixes #1067 )
2014-12-13 15:49:32 +01:00
Marc Zinnschlag
ed5387fb8c
replaced stay [ ignoring implementation with one that does not interfere with other workarounds ( Fixes #2205 )
2014-12-13 15:43:40 +01:00
Marc Zinnschlag
e4f75267d0
in case of arguments not separated with comma the fist token of the next argument was put back incorrectly
2014-12-13 15:40:24 +01:00
Marc Zinnschlag
33d905dc03
Merge remote-tracking branch 'scrawl/master'
2014-12-13 12:37:57 +01:00
scrawl
0ca11eab1c
Ignore extra argument for removeItem ( Fixes #2208 )
2014-12-13 02:39:56 +01:00
Arthur Moore
b8edd9bac3
Get a nif file's version string regardless of its length.
2014-12-12 02:01:46 -05:00
Arthur Moore
cd835152e1
Fix spacing issue for NIF file errors.
2014-12-12 02:01:46 -05:00
Arthur Moore
018f4e6895
Fail early if trying to read a string larger than the nif file size.
...
This is much better than failing after a few minutes with an out of memory error.
2014-12-12 02:01:46 -05:00
scrawl
2601b26217
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-12-11 22:44:58 +01:00
scrawl
886903d70e
Implement HitAttemptOnMe function (Bug #2078 )
2014-12-11 22:25:41 +01:00
scrawl
be16f1d0a5
Implement PcForce1stPerson, PcForce3rdPerson, PcGet3rdPerson (Bug #2078 )
2014-12-11 21:00:02 +01:00
Marc Zinnschlag
cda0363f29
allow a space in the middle of multi-character comparison operators ( Fixes #2185 )
2014-12-11 13:51:37 +01:00
scrawl
fb1aa096be
Settings: reduce scope for better readability
2014-12-10 21:46:36 +01:00
scrawl
6eebe9b44c
Read NiFogProperty, but don't use it yet (Feature #920 )
2014-12-10 20:51:32 +01:00
scrawl
e0c6f84546
AiFollow: target has to be seen in order to start following ( Fixes #1637 )
2014-12-09 22:25:28 +01:00
Marc Zinnschlag
0649373d2e
Merge branch 'report'
2014-12-08 19:01:38 +01:00
Marc Zinnschlag
109fbab546
changed column/row numbering in script compiler error messages from being starting at 0 to starting at 1
2014-12-07 16:02:28 +01:00
scrawl
9a1b7cbe52
Add SharedStateButton, used in spell window and controls box to apply mouseover effect to all buttons within one row ( Fixes #1986 )
2014-12-06 16:50:09 +01:00
scrawl
3f0bc6eecb
Ignore extra bytes after the SCVR string list ( Fixes #2184 )
2014-12-05 23:36:06 +01:00
scrawl
5a25649076
Implement XYZ rotation keys support ( Fixes #1067 )
2014-12-05 20:58:03 +01:00
scrawl
65536f0857
Load initial particle system state from NIF files ( Fixes #2178 )
2014-12-05 18:00:30 +01:00
Marc Zinnschlag
eb6e1576be
Merge remote-tracking branch 'scrawl/master'
2014-12-03 20:17:34 +01:00
scrawl
b650338d69
Implement drawMode of NiStencilProperty (Feature #1057 )
2014-12-03 18:28:35 +01:00
scrawl
e6c59f5585
Revert "Allow NIF rotation matrices that include scale values"
...
This reverts commit f57ddec6a2Fixes #2168 )
2014-12-03 18:28:35 +01:00
root
85b8fca1f0
fixes
2014-12-03 01:11:50 +04:00
root
4e756a2f4a
path to game get through jni
2014-12-03 01:03:27 +04:00
scrawl
59cde9b431
Don't use transparency override if there's no transparency (rug fix for Bug #2050 )
2014-12-01 23:09:46 +01:00
scrawl
077c619611
Implement Clamp mode for NiTexturingProperty ( Fixes #2050 )
2014-12-01 23:09:46 +01:00
scrawl
dffa8c6c14
Re-insert existing DialInfo records when they are modified by another content file ( Fixes #2170 )
2014-11-30 22:02:25 +01:00
Marc Zinnschlag
4c1906b999
Merge remote-tracking branch 'cc9cii/master'
2014-11-29 21:00:59 +01:00
cc9cii
5ae1554a75
Simplify skipping moved references (thanks scrawl)
2014-11-30 04:00:06 +11:00
scrawl
5fa7536427
Fix incorrect box shape translation reset
...
Fixes incorrect placement of collision box for "azura spirit_trib"
2014-11-29 16:50:42 +01:00
cc9cii
33c454e073
Check whether any subrecords remain after skipping moved references. Should resolve bug #2070 .
2014-11-29 20:39:25 +11:00
scrawl
c1e6b8608b
Always create a skeleton if there's an "ArrowBone" node ( Fixes #2117 )
2014-11-23 16:37:31 +01:00
Marc Zinnschlag
cd5d02402f
Merge remote-tracking branch 'scrawl/wizard'
2014-11-21 09:48:57 +01:00
scrawl
e11bec1a37
Fix the launcher not properly reloading data directories
2014-11-20 22:36:24 +01:00
scrawl
31fab533fe
OSX build fix
2014-11-20 18:14:49 +01:00
Marc Zinnschlag
86037149cd
add optional string argument for activate instruction (ignored)
2014-11-20 11:06:32 +01:00
scrawl
c6558fe487
Fix Ogre being initialised twice
2014-11-19 13:19:02 +01:00
scrawl
751211351c
Fix multi-line comment warning
2014-11-18 17:54:24 +01:00
scrawl
4fa303d7c4
Merge branch 'master' into HEAD
...
Conflicts:
CMakeLists.txt
apps/launcher/CMakeLists.txt
2014-11-18 17:43:51 +01:00
Marc Zinnschlag
95dfb07816
make [ a whitespace character in scripts ( Fixes #2126 )
2014-11-15 09:53:08 +01:00
scrawl
273a80e2c0
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-11-11 15:43:46 +01:00
scrawl
92ab292e18
Make MODL subrecord for light records optional ( Fixes #2114 )
2014-11-09 04:50:54 +01:00
MiroslavR
b8d5a9486a
Make Restore/Damage Attribute/Skill effects continuous
2014-11-08 00:57:03 +01:00
Arthur Moore
4a9a9855bf
NIFStream getUInt should return an unsigned integer
2014-10-31 05:01:26 -04:00
Arthur Moore
4583dc05db
Move NIFStream functions into a cpp file where they belong
2014-10-31 04:54:16 -04:00
scrawl
ccab8b1a92
Fix bug in TerrainGrid::getWorldBoundingBox ( Fixes #2075 )
2014-10-29 16:01:55 +01:00
scrawl
f7ba1dbfc8
Add error handling for getPcRank and similar defines ( Fixes #2071 )
2014-10-28 16:07:37 +01:00
scrawl
f57ddec6a2
Allow NIF rotation matrices that include scale values ( Fixes #2052 )
2014-10-27 21:53:00 +01:00
scrawl
fc1a897fbf
Add comment to WNAM in ESM::Land
2014-10-27 21:53:00 +01:00
scrawl
4047e3c928
Properly handle DialInfo records that were marked as Deleted ( Fixes #2035 )
2014-10-19 17:46:28 +02:00
Arthur Moore
38bcff2622
Moved base NIF classes into a separate file.
...
This resolves the dependency mess, and makes things more readable.
The dependency tree for nif records now looks like this:
Record.hpp
--base.hpp
----controlled.hpp
----controller.hpp
----data.hpp
----effect.hpp
----extra.hpp
----node.hpp
Node.hpp has many extra dependencies because nifogre only includes it instead of each of these files.
That should be fixed.
2014-10-19 03:01:30 -04:00
Arthur Moore
5abed1c32a
Print a NIF file's version information when an error occurs
2014-10-19 02:54:27 -04:00
Arthur Moore
9ebf3f2f10
Provide more data when nifstream throws a runtime_error
2014-10-19 02:42:28 -04:00
scrawl
bf0669e18c
Ignore some extra string arguments to ShowMap ( Fixes #2029 )
...
Required for a dialogue result script in Morrowind.esm ("ShowMap Dren Plantation").
This must do the same as "ShowMap Dren", which actually does work properly, since ShowMap supports partial string matching.
2014-10-18 00:56:41 +02:00
scrawl
6d7f4085a5
Add shader implementation of alpha test
2014-10-17 19:11:06 +02:00
Marc Zinnschlag
a3c894c1e2
Merge branch 'cellmarker'
2014-10-17 14:26:16 +02:00
scrawl
86280df55a
DialInfo: Clear SelectStructs from previous loadings when a record is overwritten ( Fixes #2017 )
2014-10-16 19:35:20 +02:00
scrawl
e413bebe99
Toggle addon files when activated or clicked on checkbox rather than clicked ( Fixes #1980 )
2014-10-16 15:07:51 +02:00
cc9cii
313aed078e
Merge remote-tracking branch 'remotes/upstream/master' into QtOgre
...
Conflicts:
apps/opencs/CMakeLists.txt
2014-10-13 20:45:30 +11:00
Thoronador
4d62541b62
fix usage of numeric_limits static functions min() and max()
...
Functions min() and max() of std::numeric_limits<T> are static
and can therefore be accessed via class name and :: operator.
2014-10-12 23:28:16 +02:00
cc9cii
809b8c6d5b
Conflicts:
...
apps/opencs/view/render/pagedworldspacewidget.cpp
2014-10-12 05:54:21 +11:00
Marc Zinnschlag
a0dbb40c8e
Allow script names starting with digits ( Fixes #1730 )
2014-10-11 14:48:52 +02:00
Marc Zinnschlag
21b16f8425
Merge branch 'tables'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/world/data.cpp
apps/opencs/model/world/data.hpp
2014-10-10 16:11:54 +02:00
cc9cii
406135ee96
Merge remote-tracking branch 'upstream/master' into terrain
2014-10-09 23:47:30 +01:00
Marc Zinnschlag
c85735abed
Merge remote-tracking branch 'scrawl/terrain'
2014-10-09 12:56:42 +02:00
scrawl
8786fb639f
Implement terrain rendering in OpenCS ( Fixes #1597 )
2014-10-08 17:17:31 +02:00
sylar
4c46da79de
changed android configs paths
2014-10-07 23:31:22 +04:00
cc9cii
c9e054cdd7
Merge remote-tracking branch 'remotes/upstream/master' into QtOgre
...
This reverts commit 0b133d5c2e0d258274ef5f272d7c1a185225673a, reversing
changes made to 3aea1bf5f9
2014-10-04 06:20:10 +10:00
scrawl
eda296f1e3
Remove workaround for Ogre 1.8 (no longer supported)
2014-10-02 16:50:10 +02:00
scrawl
861cc26aa6
Don't sell racial spells ( Fixes #1961 )
2014-10-02 16:50:05 +02:00
Marc Zinnschlag
f4c9897bbd
Merge branch 'master' into tables
2014-10-02 15:49:36 +02:00
Marc Zinnschlag
d64127106b
load and save pathgrid records
2014-10-02 12:30:15 +02:00
scrawl
c010c28337
Implement ToggleWorld instruction
2014-09-30 15:54:09 +02:00
cc9cii
687b62dfd3
Revert some changes (mostly iostream adds)
2014-09-30 18:46:26 +10:00
cc9cii
312b7cd571
Merge branch 'master' into QtOGre
...
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/pagedworldspacewidget.cpp
apps/opencs/view/render/pagedworldspacewidget.hpp
components/nif/niffile.hpp
libs/openengine/bullet/physic.hpp
2014-09-30 10:52:04 +10:00
scrawl
e9ed0211c9
Attempt to fix Clang warnings
2014-09-28 12:44:47 +02:00
scrawl
4b8ea25cf0
Add missing case folding for dependency filenames ( Fixes #1940 )
2014-09-26 20:47:53 +02:00
scrawl
7252cb63a6
Fix cppcheck issues
2014-09-26 17:48:14 +02:00
scrawl
790e0150b1
Fix global map markers being duplicated when cell is visited again
2014-09-26 16:51:48 +02:00
scrawl
6b82e3665b
Remove old nifbullet test
2014-09-26 16:10:55 +02:00
scrawl
487e318ede
Remove old niftool test
2014-09-26 15:25:51 +02:00
scrawl
fc4f069d0f
Remove old BSA tests
2014-09-26 15:22:08 +02:00
Marc Zinnschlag
850dbb55a5
improved magic effect IDs
2014-09-26 13:36:54 +02:00
scrawl
0bc840aadd
Add NumericEditBox widget
2014-09-25 21:04:51 +02:00
scrawl
e4c097b4f7
Fix wrong default ExpandDirection for AutoSizedButton
2014-09-25 19:22:26 +02:00
scrawl
6b65502557
Add properties for new widget classes to MyGUI plugin
2014-09-25 16:25:08 +02:00
Marc Zinnschlag
58a9176c18
preparing magic effects record for use in OpenCS
2014-09-25 14:16:00 +02:00
scrawl
1afcc7adb5
Add imported font colors from openmw.cfg to MyGUI plugin
2014-09-25 00:04:38 +02:00
scrawl
45b4304237
Store levitation/teleport enabled state in savegames ( Fixes #1923 )
2014-09-24 12:21:19 +02:00
Marc Zinnschlag
02247fe712
load and save sound gen records
2014-09-23 12:20:02 +02:00
Marc Zinnschlag
147bffa7dd
Merge remote-tracking branch 'slothlife/msvc-warning-fix'
...
Conflicts:
CMakeLists.txt
2014-09-23 08:57:49 +02:00
slothlife
35ced14e45
Fix for MSVC warnings
2014-09-22 21:33:09 -05:00
eroen
0738e862cb
Make GLOBAL_CONFIG_PATH, GLOBAL_DATA_PATH configurable
2014-09-22 15:36:42 +02:00
Marc Zinnschlag
89beecad8c
Merge remote-tracking branch 'scrawl/master'
2014-09-21 12:24:53 +02:00
scrawl
4d6ebfb496
Allow KeyFrameControllers on the RootCollisionNode and its children (Bug #1934 )
2014-09-20 17:13:51 +02:00
scrawl
144c818b41
Throw an exception if a required Ogre plugin is not found
2014-09-20 16:12:52 +02:00
scrawl
dec9ffdb6c
ESM: Make sure to clear old list when a list is overwritten by another content file ( Fixes #1932 )
2014-09-20 13:34:20 +02:00
Sebastian Wick
41094a8641
the global config path is not always $prefix/etc, so just define the whole path in the build system
2014-09-19 20:23:39 +02:00
Sebastian Wick
2ae8158ee9
SYSCONFDIR and LinuxPath should work with different install prefixs
2014-09-19 03:15:28 +02:00
Marc Zinnschlag
d1d861e1be
Merge branch 'run'
...
Conflicts:
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/CMakeLists.txt
2014-09-14 11:59:54 +02:00
Marc Zinnschlag
bf6150d009
allow project scope scripts
2014-09-14 11:41:28 +02:00
Marc Zinnschlag
9b7f61b4ba
Merge remote-tracking branch 'scrawl/myguiplugin'
2014-09-14 10:45:26 +02:00
scrawl
a413e91442
ImageButton: get texture size from MyGUI, rather than from Ogre
2014-09-12 05:17:45 +02:00
scrawl
c6bcd75058
Add various custom widgets used in OpenMW to the MyGUI plugin
2014-09-12 05:14:21 +02:00
scrawl
ee3b1e800c
Add FontLoader and transparent BG texture to the MyGUI plugin
2014-09-12 04:27:23 +02:00
scrawl
ecfc2ff5d0
Add a MyGUI plugin to register OpenMW resources, to use with MyGUI's standalone tools
2014-09-11 23:33:54 +02:00
Marc Zinnschlag
9ae9104a45
Merge branch 'openmw-32'
2014-09-11 14:22:07 +02:00
Marc Zinnschlag
14f32563e7
fixed script compiler code ordering issue
2014-09-09 13:55:10 +02:00
scrawl
f3f869e99a
Don't produce NaN's for 0-length controllers in NifOgre::DefaultFunction
2014-09-07 23:47:57 +02:00
Marc Zinnschlag
d4c27d4ce0
Merge remote-tracking branch 'mellotanica/master'
2014-09-07 10:10:54 +02:00
Rohit Nirmal
e315a72582
Remove extra semicolons at the end of some lines.
2014-09-06 13:04:52 -05:00
Marco Melletti
9b6faa2ffa
wrong rearrangement fixes
...
misleading comments fixed
2014-09-06 17:04:50 +02:00
Marco Melletti
e1393ad2df
reputation sorted out
2014-09-06 15:16:04 +02:00
Marco Melletti
2e47290ed0
finished loadnpc.hpp, fixed npdt 52byte structure
2014-09-05 21:23:25 +02:00
scrawl
1c178768f5
Allow Script records with missing SCDT (precompiled code, not used anyway)
...
Not sure on the exact conditions, but this was missing in a plugin that I made in the TES-CS, while vanilla MW would load it just fine.
2014-09-05 16:43:20 +02:00
Marco Melletti
bc7e154643
done with header files, unsure about mSkills and mReputation in
...
loadnpc.hpp
2014-09-04 13:23:29 +02:00
Marco Melletti
8bce460f34
loadnpc is still unfinished, bodypartcheck.cpp mFlags check fix
2014-09-03 14:40:32 +02:00
scrawl
819234cdfe
Use rbegin() instead of --end()
2014-09-02 05:46:12 +02:00
scrawl
9809748eba
Store NIF keys mapped by time and use lower_bound for searches
2014-09-02 04:29:30 +02:00
scrawl
0da4757ee6
Merge branch 'master' of github.com:scrawl/openmw
2014-09-01 02:04:18 +02:00
scrawl
267cf4e140
Implement ResetActors script instruction ( Fixes #1859 )
2014-08-30 18:27:32 +02:00
Marc Zinnschlag
2eadff54d4
Merge remote-tracking branch 'rohitnirmal/scan-build-fixes'
2014-08-29 13:40:37 +02:00
Rohit Nirmal
b5eb16b663
Silence some scan-build warnings.
2014-08-28 20:55:32 -05:00
cc9cii
df87859d7c
Move the workaround to loadscpt.cpp as per feedback comments.
2014-08-29 07:41:49 +10:00
Marc Zinnschlag
ce3d75bba2
Merge remote-tracking branch 'scrawl/master'
2014-08-28 12:34:08 +02:00
cc9cii
7ff1136d81
For compiling in Windows with MSVC.
2014-08-27 21:25:47 +10:00
scrawl
4f92044d71
Allow user-created markers on local map ( Fixes #1571 )
2014-08-26 17:45:23 +02:00
scrawl
c2a91148f3
Implement multiple emitter nodes for NiBSPArrayController
...
The particles for the flame, frost and storm atronachs work correctly now.
2014-08-26 03:06:30 +02:00
scrawl
44642ae21b
Fix incorrect Speed value in ESM::MagicEffect (thanks Hrnchamd)
2014-08-26 02:09:23 +02:00
Marc Zinnschlag
f1f38fc786
Merge remote-tracking branch 'miroslavr/master'
2014-08-25 22:03:40 +02:00
MiroslavR
46e9ee408f
Do not allow mods to change fixed effect properties in the legacy format, but allow it entirely in the new format.
2014-08-25 18:59:50 +02:00
MiroslavR
3823e36f05
Merge branch 'master' of github.com:OpenMW/openmw
2014-08-25 00:56:35 +02:00
MiroslavR
d16e0c063c
Enchanting, spellmaking dialog: check for flags when listing known effects
2014-08-24 21:59:52 +02:00
Arthur Moore
b7852b8215
Convert niffile.cpp to use std::map instead of a custom search function.
...
I haven't profiled this, but it should speed things up a decent bit.
2014-08-24 14:39:59 -04:00
Arthur Moore
8be6aefd95
Moved functions from niffile.cpp to where they belong.
...
Also cleaned up some #includes
Removed a few asserts. Vector already throws an out_of_range error.
2014-08-24 13:45:36 -04:00
Marc Zinnschlag
45c0be8f62
Merge remote-tracking branch 'emperorarthur/niftest'
2014-08-24 19:25:51 +02:00
Arthur Moore
cdfa24e15d
(Re) Wrote a tool to test NIF files in BSAs and on the filesystem.
...
Just give it a set of files, one file per argument, and it will make sure openmw can read them.
On linux/mac you can use "xargs --arg-file=nifs.txt ./niftest" to give it a list of files to check.
2014-08-24 12:09:39 -04:00
Marc Zinnschlag
111b55f48e
Merge remote-tracking branch 'scrawl/script'
2014-08-24 17:58:05 +02:00
scrawl
174153b2da
Revert "Fix member variable case problem"
...
This reverts commit f0354ea04cFixes #759 (again)
Conflicts:
components/compiler/lineparser.cpp
2014-08-24 17:46:08 +02:00
Marc Zinnschlag
52f6a2ec7b
remote local variable access was always using variable with index 1 instead of the index specified by the access request ( Fixes #1739 )
2014-08-24 11:58:08 +02:00
Marc Zinnschlag
736ab76f68
limit argument error workaround to PositionCell instruction ( Fixes #1732 )
2014-08-24 10:17:55 +02:00
Marc Zinnschlag
d024c1a93f
Merge remote-tracking branch 'scrawl/master'
2014-08-24 09:14:17 +02:00
scrawl
1a8acac40a
Share keyframe data in NIF resource ( Fixes #908 )
2014-08-24 02:37:59 +02:00
scrawl
2b407a9995
Refactor NIF cache
...
- Remove broken cache locking mechanism
This was supposed to unload NIFFiles after a cell transition completes, but it was never working due to a mistake on the line if (--sLockLevel), should have been if (--sLockLevel == 0). Repairing this would increase load times (NIF files would have to be reloaded more frequently), so just removed it for now.
- Decouple cache from NIFFile (now a new nifcache component)
- Add API for future background loading
- Provide a reliable way (SharedPtr) to hold on to loaded NIFFiles. This will be useful to avoid deep copies of keyframe and text key data, which is currently a performance bottleneck.
2014-08-24 02:37:50 +02:00
Marc Zinnschlag
7c1b32ae62
Merge remote-tracking branch 'miroslavr/corprus'
2014-08-23 09:15:27 +02:00
Marc Zinnschlag
f468c53281
renamed the script field in DebugProfile to improve consistency
2014-08-22 13:38:03 +02:00
Marc Zinnschlag
232c6c9ad3
Merge branch 'scriptedit' into run
2014-08-22 13:20:02 +02:00
MiroslavR
85aa237baf
Implement removal of corprus spells
2014-08-22 03:34:31 +02:00
MiroslavR
96e7ff666d
Implement saving/loading of corprus stats, remove redundant code
2014-08-19 03:17:31 +02:00
Bret Curtis
feb0ef8390
fixes building on systems with kFreeBSD kernel
2014-08-18 17:19:54 +02:00
scrawl
83037a1a91
Move fast-forward of particle systems outside of OgreNifLoader ( Fixes #1830 )
...
Particle systems were being fast-forwarded before the skeleton base was attached, so particles without the LocalSpace flag would spawn at an incorrect position.
2014-08-18 16:37:47 +02:00
scrawl
360c7f863c
Store magic effect Base values in savegame ( Fixes #1489 )
2014-08-17 05:38:48 +02:00
scrawl
2db50da8dd
Implement magic effect script instructions (Feature #1489 )
2014-08-17 05:09:14 +02:00
scrawl
6c6b3bd890
Remove extra setVisibilityFlags on SkelBase
...
SkelBase is already contained in mEntities.
2014-08-15 22:46:48 +02:00
Marc Zinnschlag
3486da0fb0
consolidated the debug profile flags into a single and added a global flag
2014-08-15 12:27:08 +02:00
scrawl
77a4e38c49
Remove -Wno-ignored-qualifiers and fix caused warnings
2014-08-14 19:18:30 +02:00
scrawl
28e61c9834
Add default values for fDifficultyMult and sDifficulty ( Fixes #1742 )
...
Also added values for some other GMSTs added in a Morrowind patch or Tribunal/BM
2014-08-13 17:32:52 +02:00
scrawl
e2ee3b2497
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwrender/terrainstorage.cpp
2014-08-12 19:53:37 +02:00
Marc Zinnschlag
40a33eb9f0
Merge remote-tracking branch 'miroslavr/master'
2014-08-12 17:49:03 +02:00
gus
5fd599b5de
minor corrections
2014-08-12 13:31:20 +02:00
MiroslavR
baa14511cf
Use ResourceHelpers to replace DDS hacks scattered throughout the code, fix prefix comparision
2014-08-12 12:18:38 +02:00
scrawl
28fe81df90
Make Lights with OffDefault flag not emit light nor particles when placed in a cell ( Fixes #1796 )
2014-08-11 20:39:56 +02:00
MiroslavR
4d403ed747
Rename and move functions for texture path correction
2014-08-11 20:04:44 +02:00
scrawl
4138c3e966
Reuse health of previous level rather than recalculating initial health ( Fixes #1787 )
2014-08-10 17:09:14 +02:00
Marc Zinnschlag
ee3acc31a8
minor correction to previous commit
2014-08-10 10:09:45 +02:00
cc9cii
c43bd3c345
Continue loading esm after detecting string table overflow condition. Should resolve bug #1774 .
2014-08-10 12:54:54 +10:00
MiroslavR
4873c4bd31
Generalize function for texture path correction ( Fixes #1779 )
2014-08-09 18:59:57 +02:00
scrawl
8c26f802e6
Move terrain grid implementation to a component so the editor can use it (Feature #1597 )
2014-08-08 15:46:33 +02:00
scrawl
982453d4f6
Move ESM terrain data handler to esmterrain component so it can be used by the editor (Feature #1597 )
2014-08-08 15:46:33 +02:00
scrawl
22d7d8a466
Implement Command creature/humanoid magic effects ( Fixes #1120 )
2014-08-07 17:21:07 +02:00
scrawl
2e7b5fde7c
Fix uninitialized QuestStatus in DialInfo ( Fixes #1694 )
2014-08-06 20:13:57 +02:00
Marc Zinnschlag
f4ddf2a7b9
Merge remote-tracking branch 'sandstranger/android'
2014-08-06 08:04:11 +02:00
root
32ebc90ba4
fix v9
2014-08-06 07:52:36 +04:00
root
713787d92f
fix v7
2014-08-06 07:48:16 +04:00
root
8978f9bcc6
fix v6
2014-08-06 02:10:47 +04:00
root
3cd98e5259
fix code v5
2014-09-06 02:02:39 +04:00
root
e27ca878a1
fixed v 4
2014-08-06 01:01:43 +04:00
root
174b528082
fixe v 3
2014-08-06 00:54:53 +04:00
root
d8772156a7
fixe all code v 2
2014-08-06 00:46:21 +04:00
root
8a8b91dfe1
fixed all code for building on all platforms inlcudng ANDROID
2014-09-04 22:47:03 +04:00
root
7cd2d4809c
android-build
2014-08-04 19:50:53 +04:00
Marc Zinnschlag
33c36bf0df
Merge remote-tracking branch 'scrawl/master'
2014-08-03 22:23:48 +02:00
Marc Zinnschlag
30f114873d
added debug profile record
2014-08-03 10:12:03 +02:00
Digmaster
a32ab842ae
Added ForceJump/ForceMoveJump commands
2014-08-02 22:42:40 -07:00
Marc Zinnschlag
1e6d557089
Merge branch 'visibility'
2014-07-31 14:34:25 +02:00
Marc Zinnschlag
a25758c3b1
fixed visibility flags setting
2014-07-31 14:02:55 +02:00
scrawl
0c1c468f70
Accept a useless extra integer argument for addItem ( Fixes #1726 )
2014-07-31 01:18:52 +02:00
scrawl
45af34d189
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-07-29 19:35:44 +02:00
scrawl
543bb22e8f
Implement collision script instructions ( Fixes #1111 )
2014-07-29 19:01:40 +02:00
scrawl
ccde462308
Fix typo (RefId -> RefNum)
2014-07-29 19:01:14 +02:00
scrawl
7dfb624ee2
Support loading text keys for objects without a skeleton
...
This means we can no longer map them to bone IDs, but they are unused anyway.
Required to load text keys from the default head models (such as Talk: Start/Stop and Blink: Start/Stop)
2014-07-29 00:23:00 +02:00
bogglez
c006393178
Fix http://bugs.openmw.org/issues/768
...
Changes application_name in configuration manager to OpenMW instead of
openmw, if on windows. This shouldn't break anything since Windows uses
case-insensitive filesystems. Strictly speaking the installation
directory must be OpenMW now though (not sure whether this is the case)
2014-07-28 21:52:34 +02:00
scrawl
4773d754c6
Remove redundant isHostile flag ( Fixes #1652 )
2014-07-28 16:41:12 +02:00
Marc Zinnschlag
7991dfb907
Merge remote-tracking branch 'scrawl/master'
2014-07-28 09:03:17 +02:00
Marc Zinnschlag
c9cd7fb6b7
Merge branch 'scripts'
2014-07-28 09:02:24 +02:00
Marc Zinnschlag
ad50b926f5
reducing some stray arguments again
2014-07-28 09:01:44 +02:00
Marc Zinnschlag
17bd094afd
allow a few more stray arguments
2014-07-27 20:55:54 +02:00
Marc Zinnschlag
2abc4e42c8
end parsing of line after parsing a declaration
2014-07-27 20:49:57 +02:00
scrawl
1a04501951
Handle faction save/load properly when player has faction reputation in a faction he is not a member of ( Fixes #1573 )
2014-07-27 20:33:45 +02:00
Marc Zinnschlag
6a745c014f
workaround for incorrect argument order for PositionCell instruction
2014-07-27 11:51:53 +02:00
Marc Zinnschlag
acb728195f
improved documentation of ESM::Script member variables
2014-07-25 10:37:34 +02:00
Marc Zinnschlag
2e355df8b3
removed function ScriptManager::getLocalIndex (was redundant and was also depending on precompiled scripts)
2014-07-25 07:59:50 +02:00
scrawl
75abe8db31
Ignore FLTV from old savegames
2014-07-24 20:52:14 +02:00
scrawl
d4ff17f1c5
Remove unused FLTV and NAM0 from CellRef
2014-07-24 02:20:16 +02:00
scrawl
4e0c133fb3
Add comment to Cell NAM0 (it's a RefId counter)
2014-07-24 02:19:36 +02:00
scrawl
75366b2e37
Implement CellRef's faction rank (rank requirement to use item)
2014-07-24 02:17:38 +02:00
Marc Zinnschlag
19f4c46fe4
alllow (and ignore) explicit references for StopScript and ScriptRunning
2014-07-23 12:33:35 +02:00
Marc Zinnschlag
aa8c0bccb4
added new argument type: z (optional, any)
2014-07-23 09:44:29 +02:00
scrawl
2b57c7fa67
Use CellRef's global variable to disable owner ( Fixes #1677 )
2014-07-22 17:06:40 +02:00
gus
2092e5fe22
compile fixes
2014-07-22 11:49:45 +02:00
Marc Zinnschlag
11a2c767cc
some argument parsing cleanup
2014-07-21 12:50:29 +02:00
scrawl
1320ac6983
Ensure non-negative particle life time, add size assertion
2014-07-18 16:11:08 +02:00
Marc Zinnschlag
e33ee52b91
make stray names in the begin line a warning instead of an error
2014-07-18 12:29:20 +02:00
scrawl
192d5ca08f
Allow overriding OGRE_PLUGIN_DIR in cmake command line
2014-07-17 22:31:57 +02:00
scrawl
4d39d77eaa
Fix incompatible encoding names in ContentModel (bug uncovered by 41c17bccb6)
2014-07-17 20:40:40 +02:00
scrawl
2a510573b8
Remove unused implementation file
2014-07-17 16:16:14 +02:00
scrawl
41c17bccb6
Exit if an unknown encoding option is specified
2014-07-17 16:16:14 +02:00
scrawl
876af8f529
Fix not saved Attacked flag ( Fixes #1657 )
2014-07-17 16:16:13 +02:00
Marc Zinnschlag
8952154488
inherit target ID when starting a script from another script
2014-07-17 13:37:57 +02:00
Marc Zinnschlag
27c84d6cb7
the reference for a targeted script is now determined when needed instead of at the start of the script execution
2014-07-17 13:36:55 +02:00
Marc Zinnschlag
35b27ea8cb
ignore stray string argument after GetDisabled
2014-07-17 11:29:04 +02:00
Marc Zinnschlag
e8322da663
added support for targeted scripts to script compiler
2014-07-17 08:36:34 +02:00
Marc Zinnschlag
75ab8de3d2
added opcode for running scripts with explicit references (targeted scripts)
2014-07-15 13:26:04 +02:00
Marc Zinnschlag
e9377ad5c4
include targeted script data in saved games
2014-07-15 13:05:38 +02:00
Marc Zinnschlag
563c2e5730
be a bit more relaxed about allowing - in names ( Fixes #1593 )
2014-07-15 10:39:11 +02:00
scrawl
41d73377b0
Use explicit C locale in Misc::StringUtils ( Fixes #1216 )
2014-07-12 18:53:22 +02:00
scrawl
1c41ce9b9d
Implement Hrnchamd's player and NPC autocalc spells (Some unclarities remaining, XXX)
2014-07-12 18:53:15 +02:00
scrawl
ad90d20ad8
Don't silently skip unknown NPC subrecords
2014-07-08 10:30:46 +02:00
Marc Zinnschlag
1ce60fa13b
Merge branch 'tables'
2014-07-03 12:03:21 +02:00
Marc Zinnschlag
d96ed38d49
added body part table
2014-07-01 12:37:22 +02:00
Marc Zinnschlag
e97fd35ae6
added enchantments table
2014-06-30 20:40:34 +02:00
scrawl
2506c16bf5
Add a dummy GetStat function returning 0 ( Fixes #1589 )
2014-06-30 17:49:01 +02:00
scrawl
e25fa6c157
Refactor non-distant land terrain path to a grid based implementation ( Fixes #1562 )
2014-06-29 02:42:36 +02:00
scrawl
4949aa1fbb
Add hack required for unnamed animated collision shapes (in_dagoth_bridge00.nif)
2014-06-28 18:21:56 +02:00
scrawl
1ab02d8072
Fix exception for box shapes ( Fixes #1580 )
2014-06-28 00:10:36 +02:00
scrawl
7b1e1d03d8
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwrender/sky.hpp
2014-06-26 04:29:03 +02:00
scrawl
2bcbc6ab7d
Potential crash fix, either way should have a better error message now
2014-06-25 14:52:12 +02:00
Marc Zinnschlag
85965bfd47
Merge remote-tracking branch 'scrawl/master'
2014-06-25 09:58:00 +02:00
scrawl
ee098de0a6
Don't ignore lighting values of particles not attached to a character
2014-06-25 01:14:21 +02:00
scrawl
b259c5def2
Make GetFactionReaction garbage argument optional
2014-06-25 01:12:57 +02:00
scrawl
8a8ecce1e5
Fix some uninitialized data written to savegames
2014-06-25 00:11:25 +02:00
scrawl
e274314548
Ignore alpha modifier for particle materials
...
This makes the tx_ash_flake.dds particles from ashcloud.nif appear.
2014-06-24 19:51:30 +02:00
scrawl
b52977e44c
Add dummy Face implementation for now (Bug #1541 )
2014-06-24 15:09:13 +02:00
scrawl
30be59c029
Implement auto-adjusting of particle emit rate
...
This makes ashcloud.nif and blightcloud.nif work properly.
2014-06-24 03:07:10 +02:00
scrawl
750d8b5589
Allow garbage integer argument for addSpell ( Fixes #1539 )
2014-06-23 22:02:22 +02:00
scrawl
0b34d8d2fd
Add support for animated collision shapes ( Fixes #1549 )
2014-06-23 20:43:24 +02:00
slothlife
9ea22324f7
Fix some MSVC warnings.
...
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
2014-06-23 01:13:30 -05:00
scrawl
0bed6d9d56
Physics: Recognize BBoxCollision flag, but don't use it for raycasting ( Fixes #1349 )
2014-06-22 00:16:47 +02:00
scrawl
e002acdeae
Physics: Create actor shapes outside of BulletNifLoader
...
This will allow to create a specialised shape instead, such as a capsule, which tends to work better for character controllers.
2014-06-21 23:37:16 +02:00
scrawl
7bf7daa846
Fix exception (getline will trigger failbit on the last line)
2014-06-20 21:33:03 +02:00
scrawl
9a26cf22e6
Implement toggleMenus
2014-06-20 18:51:00 +02:00
scrawl
218f916d6d
Savegame: Don't write stat modifiers that are zero
2014-06-19 17:17:26 +02:00
scrawl
c69a311ad8
Disable lighting for particles
...
Fixes magic cast visuals being too dark depending on the environment.
2014-06-19 04:57:46 +02:00
scrawl
4e71db7081
Savegame: Don't load/save deleted container items. This is currently pointless, and also causes new garbage being added on each load/save cycle: Container stores are first filled from ESM records, then cleared and filled from the savegame. The items from ESM records remain as deleted refs.
2014-06-18 21:39:17 +02:00
scrawl
5645c9185b
Fix location of local data path
2014-06-18 17:18:48 +02:00
scrawl
1dc9e151cb
Count werewolf kills ( Fixes #1525 )
2014-06-18 16:56:36 +02:00
scrawl
2477456f99
Implement Murder crimes and OnMurder instruction ( Fixes #1315 )
2014-06-17 04:05:27 +02:00
scrawl
ec66484472
Fix forceGreeting with explicit references ( Fixes #1518 )
2014-06-17 04:05:27 +02:00
scrawl
d5b97005ab
Make ESM::Faction skills optional ( Fixes #1508 )
...
Also increased size of mSkills array to 7. Some factions with 7 skills can be found in the vanilla CS. The previously "mUnknown" int appears to be the 7th element of the skills array.
2014-06-16 02:52:16 +02:00
scrawl
ee2b81763e
Savegame: Store AiSettings and summoned creatures
...
CreatureStats state is now completely stored (Closes #1174 )
Also play VFX_Summon_Start and VFX_Summon_End visual effects.
2014-06-15 21:19:37 +02:00
scrawl
fd59a4a79e
Fix some doxygen typos
2014-06-15 16:11:22 +02:00
scrawl
77388fe2ce
Implement BetaComment instruction (dumps reference info)
2014-06-15 16:11:16 +02:00
Marc Zinnschlag
c8c45d4923
Merge remote-tracking branch 'lgro/valgrind_fixes'
2014-06-15 10:57:01 +02:00
Lukasz Gromanowski
abeb1d4ab3
Valgrind: Added constructor for KeyListT class, and added initialziation of ver member field in NIFFile class.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-06-15 09:39:16 +02:00
scrawl
4f742fd468
Allow INFO records with no subrecords following DATA ( Fixes #1486 )
2014-06-13 21:54:03 +02:00
scrawl
e458cf1df2
Savegame: Store death counter ( Fixes #1477 )
2014-06-13 02:26:53 +02:00
scrawl
a54ac579a5
Savegame: Store AiSequence
2014-06-13 02:26:52 +02:00
scrawl
b158919c4b
Fix uninitialized variable use
2014-06-13 02:26:52 +02:00
scrawl
029e438c11
Don't check mInterpolationType each iteration
2014-06-11 23:57:39 +02:00
scrawl
73be457805
Merge ESM::Cell fields by subrecord
...
Fixes an issue with the Morrowind Patched mod where cell ambient values would become black due to the new cell records not including an AMBI subrecord.
Also fixes a bug where mLeasedRefs was incorrectly cleared when overwriting a cell (*oldcell = *cell;)
2014-06-11 16:13:33 +02:00
scrawl
47172fb8a2
ContentModel: Don't confuse file path with file name ( Fixes #1352 )
2014-06-10 19:23:42 +02:00
scrawl
3788fb042e
Implement MenuTest script instruction ( Fixes #1454 )
2014-06-10 18:49:42 +02:00
scrawl
2dd54dbcfc
Implement ClearInfoActor script instruction ( Fixes #1422 )
2014-06-10 18:49:41 +02:00
scrawl
98d7b6672a
Make MODL subrecord optional for potions ( Fixes #1419 )
2014-06-08 11:22:37 +02:00
scrawl
823ccb1b3d
Don't batch statics that have "references persist" set (temporary fix for Arkngthand door - Fixes #1386 )
2014-06-08 11:22:37 +02:00
scrawl
a0bff03560
Fix not handling failbit/badbit in ifstream (Bug #1355 )
2014-06-08 11:22:37 +02:00
Arthur Moore
f9f278f645
Fixed a capitalization error.
...
Changed Interpolations to unsigned.
Also explained what's happening in the comments.
2014-06-06 07:00:04 -04:00
Arthur Moore
b90e4db871
Actually read in XYZ_ROTATION_KEY data instead of discarding it.
2014-06-06 01:26:28 -04:00
dreamer-dead
e772bb88da
Remove RTTI usage in NIF reader.
2014-06-05 20:22:20 +04:00
Marc Zinnschlag
5313862a46
Merge remote-tracking branch 'scrawl/master'
2014-06-04 15:14:29 +02:00
scrawl
7376cb9b61
Fix loading ESX files cleaned with testool ( Fixes #1382 )
2014-06-03 22:49:37 +02:00
scrawl
ce14a6413b
Small optimization to ESM::Variant
2014-06-03 22:40:09 +02:00
scrawl
577ed3943b
Show wallpaper when loading a savegame
2014-06-02 23:26:43 +02:00
Arthur Moore
576c06d791
Fix Bug #1371
...
Not properly reading in the NIF file's QuaternionKeyList.
2014-06-01 18:01:44 -04:00
scrawl
c018319940
Addition to 7c9c0830a9: don't create useless BaseWhite clones
2014-06-01 02:21:47 +02:00
scrawl
7c9c0830a9
Fix errors due to BaseWhite material being removed
2014-05-31 19:50:01 +02:00
scrawl
16ac6e7aac
Merge DialInfo objects by subrecord instead of overwriting the object
...
Fixes #1360
2014-05-31 13:01:11 +02:00
Marc Zinnschlag
ecf3d52b46
Merge remote-tracking branch 'cc9cii/crash-fix-cg-shader'
2014-05-30 12:07:16 +02:00
Marc Zinnschlag
f5e587f566
Merge remote-tracking branch 'puppykevin/master'
2014-05-30 11:42:19 +02:00
cc9cii
11ce093a9e
Fix crashes caused when terrain materials don't get created (e.g. due to cg shader bug on Windows/D3D9). Should resolve Bug #1284 .
2014-05-30 18:46:18 +10:00
Marc Zinnschlag
be7f344eca
Merge branch 'refs'
...
Conflicts:
apps/opencs/model/doc/savingstate.cpp
components/esm/cellref.hpp
2014-05-30 10:38:38 +02:00
Marc Zinnschlag
be88168e91
Merge remote-tracking branch 'scrawl/master'
2014-05-30 10:07:18 +02:00
scrawl
50a72ed710
Fix ghosts in Cavern Of The Incarnate having -1 health
2014-05-29 18:09:13 +02:00
pvdk
38d825b004
Merge remote-tracking branch 'upstream/master' into wizard
...
Conflicts:
CMakeLists.txt
apps/launcher/maindialog.cpp
2014-05-29 16:42:16 +02:00
Kevin Poitra
18314b1707
We use spaces, not tabs.
2014-05-28 14:56:50 -05:00
Kevin Poitra
8e55eb8009
Fix some formatting.
2014-05-28 13:06:43 -05:00
Kevin Poitra
545c3c312c
Remove a superfluous clear.
2014-05-28 13:03:40 -05:00
Marc Zinnschlag
f112c78858
Merge remote-tracking branch 'scrawl/master'
2014-05-28 19:47:36 +02:00
scrawl
e68600eda2
Make Activate instruction work properly even when onActivate was not called in the same frame.
...
There are two major differences to the old implementation:
- Activate can now be called on its own, e.g. in the console. In Vanilla this appears to be a no-op, so it is unlikely to be used and the potential for breakage is low.
- The Action to execute is now determined when Activate is called, not when OnActivate is called. This however makes sense, since there may be a time difference between the two, and the object (or the player) could have changed in the meantime, requiring a different Action.
Fixes #1166 and #1346 .
2014-05-28 19:23:50 +02:00
Marc Zinnschlag
bb011f278e
Merge remote-tracking branch 'cc9cii/master'
2014-05-28 14:45:57 +02:00
cc9cii
bbe77d656a
Minor fixes from static analysis.
2014-05-28 21:15:50 +10:00
Arthur Moore
50a4d175da
Read NIF interpolation type 4 (XYZ_ROTATION_KEY)
...
Don't actually do anything with it yet, but without this the "MW Containers Animated" mod made containers inaccessible.
Partly implements Feature #1067
2014-05-28 03:42:26 -04:00
Marc Zinnschlag
be39395ce7
Merge remote-tracking branch 'scrawl/master'
2014-05-27 21:09:24 +02:00
Marc Zinnschlag
12fc0aaecb
removed an unused parser settings (implicitly fixing a case were this setting was not applied correctly)
2014-05-27 21:08:29 +02:00
scrawl
3e2eed9269
Implement getFactionReaction function
...
Strange bug when using value != 0 for the garbage argument?
2014-05-27 15:23:22 +02:00
scrawl
e266c39c5d
Implement modFactionReaction instruction ( Closes #1347 )
2014-05-27 14:54:29 +02:00
scrawl
0966755a0c
Store death animation index in CreatureStats
2014-05-26 20:52:32 +02:00
scrawl
3cd835e61a
Fix bsa file loading not being case insensitive ( Fixes #1178 )
2014-05-26 17:34:36 +02:00
scrawl
039398c8ae
Basic RefData and CellRef change tracking
...
Wrapped item charge handling in getItemHealth function
2014-05-25 14:30:07 +02:00
scrawl
b47b2b84f3
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwdialogue/filter.cpp
apps/openmw/mwgui/waitdialog.cpp
2014-05-23 08:39:48 +02:00
Marc Zinnschlag
244eb11651
Merge remote-tracking branch 'greye/widechar'
2014-05-23 07:48:26 +02:00
scrawl
e51300989c
Handle NiBSPArrayController as alias for NiParticleSystemController
...
The differences (if any) are unknown.
NiBSPArrayController is used by the Atronach_Fire.nif model. Its particles are now visible, but they don't look right yet. Need to handle NiAutoNormalParticlesData?
2014-05-22 23:07:06 +02:00
greye
663d5c314e
be more verbose on change reasons
2014-05-22 16:35:57 +04:00
greye
4346e3b4d0
try to load plugins from relative paths
2014-05-20 21:42:51 +04:00
Marc Zinnschlag
d8440e1fdc
implemented reference record merging
2014-05-20 09:02:22 +02:00
greye
444a07c01b
workaround OgreLog Unicode path handling
2014-05-19 18:12:13 +04:00
greye
493f8c6050
fix opening BSA on Unicode path
2014-05-19 13:39:07 +04:00
greye
417e07fbce
fix irrelevant error reporting
2014-05-19 10:59:36 +04:00
greye
6cb795ef7d
attempt to fix LowLevelFile, minor code reuse
2014-05-19 10:47:02 +04:00
greye
2c82da8e6e
load Ogre::ConfigFile from DataStream
2014-05-19 10:07:43 +04:00
scrawl
3dceb7ee4f
Fix overwriting DialInfo
2014-05-18 18:58:32 +02:00
scrawl
0aa1042fd7
Optimized dialogue merging with a lookup map
2014-05-18 16:01:16 +02:00
scrawl
1677fcf324
Dialogue merging
2014-05-18 15:25:16 +02:00
scrawl
5b76c0893a
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
components/esm/inventorystate.hpp
2014-05-18 12:55:43 +02:00
greye
e02b04536f
fix most vexing parse issue
2014-05-18 14:55:05 +04:00
greye
424d06a6f8
open fstreams from boost::filesystem::path, vol.2
2014-05-18 14:55:05 +04:00
greye
2236216344
minor simplification
2014-05-18 14:55:05 +04:00
greye
a22ec223d8
open fstreams from boost::filesystem::path, vol.1
2014-05-18 14:55:05 +04:00
greye
b4950509bc
use converted widechars in ini importer
2014-05-18 14:55:05 +04:00
greye
eafdefe999
using WindowsPath implies utf-8 for boost fs::path
2014-05-18 14:55:05 +04:00
greye
584c121f33
fix windows unicode path handling
2014-05-18 14:55:04 +04:00
scrawl
a872c9f83a
Feature #1323 : handle restocking levelled items
2014-05-18 12:53:21 +02:00
cc9cii
b36bb58e8c
Bug #1324 : Artem's solution
2014-05-18 07:34:13 +10:00
Marc Zinnschlag
f7c89015f9
Merge remote-tracking branch 'scrawl/master'
2014-05-17 11:50:31 +02:00
scrawl
ae66d28c87
Feature #32 : Implement respawn for containers, creatures and NPCs
2014-05-17 09:09:00 +02:00
scrawl
e266aff561
Savegame: store projectiles
2014-05-17 05:24:32 +02:00
scrawl
b3735981d6
Remove unused file_finder
2014-05-15 21:36:24 +02:00
Marc Zinnschlag
3b2ba4f6cd
Merge remote-tracking branch 'scrawl/master'
2014-05-15 14:25:36 +02:00
scrawl
a76e391ad0
Savegame: store door movement state ( Closes #747 )
2014-05-15 09:54:10 +02:00
scrawl
471bbd0021
Savegame: store levelled creature state and move to actorIds
...
(Closes #1332 )
2014-05-15 09:54:04 +02:00
Marc Zinnschlag
d08869a25d
Merge remote-tracking branch 'slothlife/msvc_warning_cleanup'
...
Conflicts:
apps/openmw/mwrender/localmap.cpp
2014-05-15 08:13:15 +02:00
slothlife
f33559fead
Fixes for MSVC warnings, less overall changes
...
Kept some fixes from the first round of review. Found out that several
targets weren't being built with the same basic warnings disabled.
Disabled a few warnings for external libraries specifically, rather than
applying them to all targets.
2014-05-14 20:12:52 -05:00
scrawl
9b67fcc4d7
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-05-14 23:54:25 +02:00
scrawl
9052cc4a57
Savegame: store ActiveSpells
2014-05-14 23:54:15 +02:00
scrawl
61187c2fef
Savegame: store actorIds
2014-05-14 09:47:49 +02:00
scrawl
51020fdb5f
Fix a bug for NpcStats::mUsedIds in savegames, and added a compile-time guard to prevent similar errors in the future.
2014-05-14 09:17:30 +02:00
Thomas
cbcf0f6039
Changed AiEScort to use new PathTo function
2014-05-14 01:44:11 -04:00
slothlife
c160a04ede
Revert "Fixes for warnings when building with MSVC"
...
This reverts commit 46eb20b98c
2014-05-14 00:03:30 -05:00
Thomas
085fb2c5a2
Simplified documentation a bit
2014-05-13 14:13:05 -04:00
Thomas
a61d804de6
now that I've found the documentation, fixed some stuff for extensions
2014-05-13 13:53:06 -04:00
Thomas
77d365e196
Forced some function arguments to take in a specific array size
2014-05-13 13:25:22 -04:00
Thomas
9dbe53c722
Merge remote-tracking branch 'upstream/master'
2014-05-13 04:11:07 -04:00
Thomas
2c74ea381e
Moved pathfinding code to aiPackage, implemented it's use with aiFollow and aiPursue
2014-05-12 21:05:32 -04:00
scrawl
6cc691115b
Savegame: store most of CreatureStats
2014-05-12 21:37:36 +02:00
Thomas
645d174a96
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwmechanics/aisequence.hpp
2014-05-12 14:49:08 -04:00
scrawl
a4a9794417
Savegame: store fog of war ( Closes #1177 )
2014-05-11 02:07:58 +02:00
scrawl
041319c43e
Fixes #1234 : Store dynamic record counter in savegame to prevent name clashes
2014-05-11 00:32:22 +02:00
slothlife
46eb20b98c
Fixes for warnings when building with MSVC
...
Most warnings are innocuous (wrong type-specifier for forward
declarations, conversion of literals into unsigned integers, warnings
about methods optimized out), but I believe actual bugs were revealed in
vartypedelegate.cpp and combat.cpp.
2014-05-09 08:32:52 -05:00
Thomas
dbf06d8c8b
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwmechanics/aipursue.hpp
apps/openmw/mwmechanics/aisequence.hpp
2014-05-04 02:06:43 -04:00
scrawl
7bddfc0025
Fix some spelling mistakes.
2014-05-03 12:23:22 +02:00
scrawl
122e606e30
Crime: improvement to arrest on sight for large bounties
...
iCrimeThreshold controls the needed bounty to have guards run to the player and force dialogue. In vanilla, the greeting dialogue is scripted to either arrest the player (< 5000 bounty) or present a death sentence and attack (>= 5000 bounty).
2014-05-03 12:17:44 +02:00
scrawl
8560b43464
Move to esm component
2014-05-02 12:48:07 +02:00
scrawl
17bb8d7f9a
Fixes #1252 : Add item/magic keybindings to savegame
2014-05-01 21:16:32 +02:00
scrawl
6f7fbc867f
Fix several leaks
2014-05-01 16:55:15 +02:00
Thomas
8f90dd43ec
Changed things to use typedef ScriptARgs/ScriptReturn, which makes finding out what those weird strings meant much much easier
2014-04-29 12:52:08 -04:00
Thomas
885228ec02
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
2014-04-28 12:27:57 -04:00
scrawl
27a05027f4
Fixes #1172 : Added basic loading/saving progress bar
...
The progress is not particularly accurate. It simply uses the current / total number of records written/read as indication. Cell records are currently the largest by far, but there is a good chance that could be optimized using a change tracking system.
2014-04-28 11:29:57 +02:00
Thomas
c2127845af
Added onKnockdown command
2014-04-27 20:54:22 -04:00
scrawl
30666f2cce
Fixes #1297 : Store global map markers in savegame
2014-04-26 13:42:32 +02:00
scrawl
f921f2e7db
Make PcRaiseRank, PcLowerRank and PcJoinFaction properly accept references instead of using the actor that the player talked to last.
...
This also solves a potential crash when no actor has been talked to yet, e.g. immediately after loading a savegame.
2014-04-26 12:04:37 +02:00
scrawl
45d2a00717
Fixes #1293 : Allow interpolation type 0 in case of 0 keys
2014-04-26 11:36:27 +02:00
Thomas
f6deca7c80
Fixed various issues caused by late-night coding. Also added "unlock" message to unlocked doors
2014-04-23 13:02:51 -04:00
Thomas
61341d4206
Removed mLocked, kept it as "Negative lock level means unlocked"
2014-04-23 10:00:18 -04:00
Thomas
420163d35f
Small changes to lock command (If no valid lockLevel exists, defaults to 100)
2014-04-23 05:19:34 -04:00
scrawl
6929e541dd
Fix texture name issue with Vality's Bitter Coast Mod
2014-04-21 05:30:14 +02:00
scrawl
2cb9f38a45
Changed crime IDs for legacy savegames. Not an issue, but it was inconsistent.
2014-04-20 19:34:58 +02:00
scrawl
262e959699
Remove unused slice_array
2014-04-20 19:28:39 +02:00
pvdk
aa07a33906
Fixed most of the memory leaks and started working on correctly exiting the thread
2014-04-18 13:17:37 +02:00
scrawl
d3d0b7362f
Fix older savegame compatibility regarding new crime feature.
2014-04-18 12:34:26 +02:00
pvdk
a2c129f655
Merge remote-tracking branch 'upstream/master' into wizard
2014-04-16 16:57:53 +02:00
pvdk
21c406316f
Working on the Settings tab: start the importer/wizard
2014-04-16 16:54:55 +02:00
Marc Zinnschlag
86e65944b8
Merge remote-tracking branch 'jeffreyhaines/master'
...
Conflicts:
apps/openmw/CMakeLists.txt
2014-04-15 11:31:48 +02:00
Marc Zinnschlag
300eb6f444
make FNAM sub-record optional for all record types
2014-04-13 13:23:50 +02:00
Jeffrey Haines
a274b48f2f
States are saved. Crime is reacted to.
...
Issues where some crime is ignored. Needs a lot more work
2014-04-05 22:45:40 -04:00
megaton
50af9bc0d3
General perfomance optimizations.
2014-03-30 19:45:27 +04:00
pvdk
ef38fae09d
Merge remote-tracking branch 'upstream/master' into wizard
2014-03-29 11:56:35 +01:00
Marc Zinnschlag
2c2106205d
Merge remote-tracking branch 'scrawl/master'
2014-03-28 09:56:35 +01:00
scrawl
d7df9cae21
Bug #1224 : Changed fix to potentially allow for language independent saves
2014-03-27 22:32:42 +01:00
scrawl
53ba23e303
Fixes #1224 : Store class name instead of id in savegame header
2014-03-26 19:56:12 +01:00
Marc Zinnschlag
1b6b4e3442
Merge remote-tracking branch 'slothlife/weather_save'
2014-03-23 08:36:45 +01:00
scrawl
452b522bc3
Fix typos
2014-03-22 19:01:41 +01:00
slothlife
00eac7d53a
Fixed header include guard to match filename
2014-03-21 01:22:54 -05:00
slothlife
6eab9c5179
Move weather state save/load to a new class
2014-03-21 01:19:40 -05:00
slothlife
1acd1bd913
Feature #1173 : Saved Game: include weather state
...
Removed some unused state in and changed Ogre::String to std::string in
WeatherManager.
2014-03-20 01:25:52 -05:00
Marek Kochanowicz
6416ae90d2
Merge branch 'preview' of https://github.com/zinnschlag/openmw into Editor-Dialog
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/view/world/subviews.cpp
2014-03-19 10:23:15 +01:00
scrawl
c8c0e5de38
Fixed code issues found with unity build. Missing include guards, duplicated functions, ...
2014-03-16 23:49:06 +01:00
pvdk
8fe837ae6e
Merge remote-tracking branch 'upstream/master' into wizard
2014-03-16 20:05:12 +01:00
scrawl
b0a1e1198a
Yet another terrain fix
2014-03-16 16:30:17 +01:00
scrawl
a9dcc90970
Another terrain fix
2014-03-09 11:59:23 +01:00
Marc Zinnschlag
2de862126a
moved resources group creation from Engine to bsa component
2014-03-09 11:42:39 +01:00
scrawl
b8ca067730
Small fix for terrain
2014-03-09 03:21:34 +01:00
Marc Zinnschlag
f1353dc84f
Merge branch 'scene'
2014-03-06 16:46:44 +01:00
scrawl
d0f98103e4
Terrain: re-added "distant land=off" path
...
Still a hack, but the overhead of building and traversing the quad tree appears negligible.
2014-03-06 03:04:23 +01:00
scrawl
1d926816b5
Terrain: background load blendmaps & layer textures. Refactor QuadTree update.
2014-03-05 21:46:37 +01:00
scrawl
4328e08162
Terrain: get rid of unneeded members
2014-03-05 21:46:37 +01:00
scrawl
6a002d19b3
Terrain: destroy no longer used materials
2014-03-05 21:46:37 +01:00
scrawl
97c3efb3ba
Terrain: decoupled Chunk from QuadTreeNode.
2014-03-05 21:46:37 +01:00
scrawl
edb5a54092
Include some more required Ogre headers explicitely.
2014-03-05 21:46:37 +01:00
scrawl
195071efc7
Terrain: geometry is now loaded in background threads.
...
TODO: background load layer textures and blendmaps.
"Distant land" setting has been removed for now (i.e. always enabled).
2014-03-05 21:46:37 +01:00
scrawl
b3fed853ae
Terrain: take cell world size into account for LOD selection
2014-03-05 21:46:37 +01:00
scrawl
6c863486e1
Terrain: fix an embarrassing copy&paste mistake.
2014-03-05 21:46:36 +01:00
scrawl
64c9932597
Terrain: remove hard dependency on shiny - can now be compiled without it (fixed function)
2014-03-05 21:46:36 +01:00
scrawl
c9e349f60f
Terrain: support alternate coordinate systems. Get rid of LoadingListener for now
2014-03-05 21:46:36 +01:00
Bret Curtis
ab224f93c9
remove our stdint.h version that uses boost and force usage of system stdint.h
2014-03-05 17:08:58 +01:00
Marc Zinnschlag
f9d2fde783
Merge branch 'openmw-29'
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
2014-03-04 09:34:38 +01:00
Marc Zinnschlag
6e8b9c88b2
changed name of default worldspace (should reduce chance of a name conflict)
2014-03-02 22:43:15 +01:00
cc9cii
46867ec0cf
Fix file handles being left open on windows builds
2014-03-01 07:24:20 +11:00
cc9cii
2421f23c2f
cleanup the mess...
2014-02-27 23:59:23 +11:00
pvdk
3792b301e9
Wizard now runs the ini-importer to import settings from Morrowind.ini
2014-02-25 15:33:30 +01:00
pvdk
fb59112b74
Merge remote-tracking branch 'upstream/master' into wizardhead
2014-02-24 13:58:51 +01:00
Marc Zinnschlag
bfcd768078
various bits of cleanup
2014-02-23 21:39:18 +01:00
cc9cii
1ab5948f19
merge upstream changes
2014-02-23 19:11:37 +11:00
Marc Zinnschlag
d780364842
fixed record size type
2014-02-22 17:31:44 +01:00
Marc Zinnschlag
b0ae5b8ab7
Merge remote-tracking branch 'cc9cii/windows-save-fix' into openmw-29
2014-02-22 17:16:55 +01:00
cc9cii
fcfc8fcccb
Revert "Allow MinGW64 compilation in Windows/msys"
...
This reverts commit c3f350e3fb
2014-02-22 23:45:13 +11:00
cc9cii
c241405d91
Fix Windows save & load.
2014-02-22 12:15:20 +11:00
cc9cii
c3f350e3fb
Allow MinGW64 compilation in Windows/msys
2014-02-22 12:06:50 +11:00
Marc Zinnschlag
c5b2c154f8
another esm writer fix
2014-02-20 12:49:56 +01:00
Marc Zinnschlag
72b29ddb79
fix broken esm writer header code
2014-02-20 12:35:57 +01:00
pvdk
c54217d008
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
CMakeLists.txt
components/CMakeLists.txt
components/config/gamesettings.cpp
2014-02-19 19:26:07 +01:00
scrawl
1fba5d1bb9
Terrain: change world bounds from AABB to 4 floats
2014-02-19 11:23:03 +01:00
scrawl
90f6cda4cc
Moved includes to appropriate place
2014-02-19 11:23:03 +01:00
Marc Zinnschlag
44f6f79bf5
Merge remote-tracking branch 'corristo/osx-ogre-19'
2014-02-16 17:12:52 +01:00
Marc Zinnschlag
9788bbcab9
partially store creature state in saved game files (only attributes and dynamics for now)
2014-02-16 15:56:36 +01:00
Marc Zinnschlag
b0532e0c85
store NPC state in saved game files
2014-02-16 15:51:45 +01:00
Marc Zinnschlag
9f721fd144
store list of known topics in saved game files
2014-02-16 12:54:27 +01:00
Marc Zinnschlag
6ac64bbe15
Merge branch 'script'
...
Conflicts:
readme.txt
2014-02-16 12:12:56 +01:00
Nikolay Kasyanov
8f99da084b
OS X: plugins are now in Frameworks dir, not in Plugins
2014-02-16 14:13:12 +04:00
Marc Zinnschlag
0d84adb2c6
allow x->(y) instead of (x->y)
2014-02-15 12:50:40 +01:00
Marc Zinnschlag
fd665a1994
ignore conditions after an else (only works if condition is put in parentheses)
2014-02-15 12:45:50 +01:00
Marc Zinnschlag
d213c6c36a
fixed a constness-issue
2014-02-14 12:23:00 +01:00
Marc Zinnschlag
451e1f413b
instead of using pre-compiled variable lists for remote member access get the variable list from the remote script on the fly
2014-02-14 11:15:16 +01:00
Marc Zinnschlag
e76ef92669
also allow the use of keywords as remote local variables in set statements
2014-02-14 09:06:06 +01:00
Marc Zinnschlag
2086ebe410
fix for inappropriate disable (2nd attempt)
2014-02-14 08:48:26 +01:00
Marc Zinnschlag
b01c6dad37
Revert "allow disable as an alias for getDisabled (in most cases)"
...
This reverts commit f7ff4fbd51
2014-02-14 08:29:18 +01:00
Nikolay Kasyanov
c2fe0d480a
Merge remote-tracking branch 'upstream/master' into osx-ogre-19
...
Conflicts:
CMakeLists.txt
2014-02-14 00:04:16 +04:00
Marc Zinnschlag
053b3dc371
Merge branch 'openmw-28'
...
Conflicts:
CMakeLists.txt
2014-02-13 20:57:28 +01:00
Nikolay Kasyanov
58add97676
Merge branch 'master' into osx-ogre-19
...
Conflicts:
CMakeLists.txt
2014-02-13 20:34:06 +04:00
Marc Zinnschlag
f7ff4fbd51
allow disable as an alias for getDisabled (in most cases)
2014-02-13 15:31:07 +01:00
Marc Zinnschlag
d6e212a02b
Merge branch 'master' into script
2014-02-13 15:02:02 +01:00
Marc Zinnschlag
309573a3ac
allow the use of the keyword end as a variable name in an expression
2014-02-13 14:15:48 +01:00
Marc Zinnschlag
d73097c2e4
Merge remote-tracking branch 'scrawl/master'
2014-02-13 13:13:37 +01:00
scrawl
d4a755d1aa
Fix some hardcoded literals
2014-02-13 11:15:55 +01:00
Marc Zinnschlag
9c52820754
Merge remote-tracking branch 'scrawl/master'
2014-02-13 10:54:51 +01:00
scrawl
c6fb0f2d9b
Removed terrain component's dependency on ESM
2014-02-13 10:13:53 +01:00
Marc Zinnschlag
ac8290c4d3
fixed problem with line endings in case of a local variable redeclaration
2014-02-13 09:59:22 +01:00
Marc Zinnschlag
dde4fbd818
allow one more integer argument in RemoveSoulGem and up to 6 more in AiFollow and then throw them all away
2014-02-13 09:52:44 +01:00
Marc Zinnschlag
87b51e47a9
fixed another case issue in remote member access
2014-02-13 09:40:07 +01:00
Marc Zinnschlag
c03bd8ebb6
allow [] as aliases for ()
2014-02-13 08:59:33 +01:00
Marc Zinnschlag
0313876d88
allow leaving out if in a top-level if-statement
2014-02-13 08:49:40 +01:00
Marc Zinnschlag
2eeb0eb4f3
allow lines to continue with other instructions after an legit else
2014-02-13 08:38:26 +01:00
Marc Zinnschlag
749136bf33
ignore attempts to set non-existing variables
2014-02-12 20:23:47 +01:00
Marc Zinnschlag
a85d3c7dcb
ignore unused explicit references for functions
2014-02-12 13:53:59 +01:00
Marc Zinnschlag
6e2e4d1adf
ignore stray begin
2014-02-12 13:45:01 +01:00
Marc Zinnschlag
93d4743012
interpret instruction keywords as names within expressions
2014-02-12 09:56:25 +01:00
Marc Zinnschlag
c0a6acfe6c
allow the use of keywords as variable names in more places
2014-02-12 09:23:23 +01:00
Marc Zinnschlag
b1b0877122
allow additional numeric argument for AiFollow and ignore it
2014-02-12 09:14:32 +01:00
Marc Zinnschlag
bfb0e62c4a
ignore additional string argument after enable/disable
2014-02-12 09:10:05 +01:00
Marc Zinnschlag
61626e90da
allow additional string argument for stopcombat and addspell (ignored)
2014-02-12 08:53:37 +01:00
Marc Zinnschlag
6a5d88b640
ignore stray else and endif in scripts
2014-02-12 08:42:42 +01:00
Marc Zinnschlag
697bda6371
allow (and discard) explicit reference on instructions that do not accept explicit references
2014-02-11 14:55:31 +01:00
Marc Zinnschlag
f26aa4f645
fixed while loop implementation
2014-02-11 13:31:04 +01:00
Emanuel Guevel
8c8f4cd420
Fix typo
2014-02-10 22:53:16 +01:00
Marc Zinnschlag
5c0071f320
fixed spelling of an error message
2014-02-10 14:59:20 +01:00
Marc Zinnschlag
3b990795c4
added access to remote access of local variables of global scripts
2014-02-10 14:45:55 +01:00
Marc Zinnschlag
3147aebf75
factored out declaration parser
2014-02-10 13:01:52 +01:00
scrawl
0cc1cd8f7e
Fix message box formatting bug
2014-02-05 05:18:11 +01:00
scrawl
2c0d46525b
Fast-forward particle systems to make cell loads less obvious.
2014-02-05 05:18:09 +01:00
scrawl
cf3812188f
Fix bounding box assertions due to negative particle life time
...
Other parts of the code could not deal with negative life times and produced negative particle sizes as a result (which Ogre could not handle)
2014-02-05 05:18:09 +01:00
pvdk
f263acdac6
Merge remote-tracking branch 'upstream/master' into versioninfo
2014-02-03 02:27:24 +01:00
Marc Zinnschlag
2b2ac6f62b
allow declaration of local variables with keywords as names
2014-02-02 15:43:48 +01:00
Marc Zinnschlag
32860a05e3
added dummy implementations for getPcInJail and getPcTraveling
2014-02-02 15:35:18 +01:00
Marc Zinnschlag
914ab1b8ab
allow 'x' instead of 'getjournalindex x'
2014-02-02 15:08:27 +01:00
Marc Zinnschlag
cd9b137129
allow elseif without matching if (grrrrr)
2014-02-02 14:24:58 +01:00
Marc Zinnschlag
8bcdf54570
added warning mode to script compiler error handler
2014-02-02 13:55:03 +01:00
scrawl
f89b3cac02
Feature #764 : Store the actor that gave the dialog response
2014-02-01 18:42:01 +01:00
Marc Zinnschlag
1b5301eec0
Merge branch 'savedgame'
...
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwbase/soundmanager.hpp
apps/openmw/mwgui/mapwindow.hpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwsound/soundmanagerimp.hpp
components/esm/loadcell.cpp
2014-02-01 18:16:32 +01:00
Marc Zinnschlag
5b04c10e1d
added creature/NPC state to saved games (only container/inventory for now)
2014-02-01 17:36:23 +01:00
Marc Zinnschlag
dd674566a2
store content of containers in saved game files
2014-01-31 13:25:32 +01:00
scrawl
bbd15b185d
Skip inactive controllers. Fixes those bloody bone boots again.
2014-01-31 05:59:58 +01:00
scrawl
5b300c1052
Handle controllers for the root node. Fixes #1147 (incorrect dwemer crossbow rotation)
2014-01-31 05:06:35 +01:00
scrawl
305a471c5a
Fix VisController in ascended sleeper's death animation
2014-01-31 05:06:08 +01:00
Marc Zinnschlag
900532a6ca
store additional state of lights in saved game files
2014-01-30 12:37:33 +01:00
Marc Zinnschlag
e0537a3253
made object state polymorphic
2014-01-28 13:53:24 +01:00
Marc Zinnschlag
a623f03850
reduced object state for objects in containers
2014-01-28 13:49:59 +01:00
mrcheko
e50e94af0b
remove CreatureStats::mAttackType, set/getAttackType()
2014-01-27 23:05:17 +02:00
Marc Zinnschlag
29c3a288e3
load and save of reference in cells (without CustomData state)
2014-01-27 13:27:42 +01:00
scrawl
e0de76a6f7
Save/load global map
2014-01-25 19:06:14 +01:00
scrawl
9c0ed69550
Fix CellRef loading issue causing a startup script failure when TR_Mainland.esm is loaded.
2014-01-25 15:10:25 +01:00
scrawl
a1ac99463f
Fix an uninitialized value
2014-01-24 22:52:04 +01:00
scrawl
03cf383be7
Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
...
Conflicts:
apps/openmw/mwgui/referenceinterface.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwscript/cellextensions.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/store.cpp
apps/openmw/mwworld/worldimp.cpp
2014-01-24 18:28:35 +01:00
scrawl
295aed3533
Implement savegame screenshots
2014-01-24 17:49:16 +01:00
scrawl
786ed6ca5b
Include some required Ogre headers explicitely
2014-01-24 15:02:34 +01:00
pvdk
19bef4fce8
Distinguish between release and development builds
2014-01-23 13:18:05 +01:00
Marc Zinnschlag
419e3a7d30
write references in cells to saved game file
2014-01-23 12:51:42 +01:00
Marc Zinnschlag
dd7d80ffbc
removed a redundant field from object state
2014-01-23 12:51:25 +01:00
Marc Zinnschlag
22cb4784b5
store cell state in saved game files (no references yet)
2014-01-23 11:29:40 +01:00
pvdk
d92ded3bcd
Forgot adding the version header CMake file
2014-01-22 19:30:41 +01:00
pvdk
c95b8bcb39
Moved the generated version header stuff into components
2014-01-22 17:33:55 +01:00
scrawl
f89c400305
Don't complain about greetings with no sound
2014-01-22 00:02:43 +01:00
scrawl
bd34b61f2a
Set all keyframe-controlled bones as manually controlled
2014-01-20 13:37:34 +01:00
scrawl
4c0045b418
Bug #1109 : Do not reset water level when loading a plugin with no water level record (for real this time)
2014-01-18 21:11:12 +01:00
scrawl
805843d7ff
Closes #1086 : Implement blood effects
2014-01-17 11:27:13 +01:00
Marc Zinnschlag
ce00639d31
added missing birthsign field to player state record
2014-01-17 10:51:52 +01:00
Marc Zinnschlag
d8d4f1a15e
some fixes to record structs
2014-01-16 12:02:45 +01:00
scrawl
d544551f61
Added getSkill to Class interface, since creatures also have skills (which are provided by generalized Combat, Magic and Stealth attributes which substitute for the specific skills, in the same way as specialization)
...
Information provided by Hrnchamd.
2014-01-15 15:50:45 +01:00
scrawl
0a8c61a7fe
Bug #1107 : Reverted previous fix, which caused problems with some actors not using a box shape as expected. Instead, do not create a bounding box collision shape for hidden nodes.
2014-01-15 14:53:29 +01:00
scrawl
79a6ffd216
Closes #1107 : Do not create box shapes unless the box collision flag is enabled
2014-01-15 14:53:29 +01:00
scrawl
3ea1407ed3
Closes #1109 : Don't reset water level when loading a plugin that does include water level records
2014-01-15 14:53:29 +01:00
scrawl
264736c139
Remove hopelessly outdated nifogre tests
2014-01-15 14:53:29 +01:00
scrawl
d0500e8124
Some unneeded includes cleanup
2014-01-15 14:53:28 +01:00
Marc Zinnschlag
bf1a37dc38
Merge remote-tracking branch 'sirherrbatka/referencables_verifer'
2014-01-15 14:29:54 +01:00
Marc Zinnschlag
8c5f313546
added savedgame-specifc record structs for objects state
2014-01-14 15:29:55 +01:00
scrawl
52b9ebff9d
Closes #1092 : Implement sleep interruption. Fix levelled list flags for creatures. Change World::copyObjectToCell to search for the correct cell.
2014-01-14 07:42:03 +01:00
scrawl
26d972280f
Fix a few text defines
2014-01-14 06:03:34 +01:00
Marc Zinnschlag
3e58eb34e4
Merge remote-tracking branch 'sergeyshambir/startcombat'
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2014-01-13 10:17:10 +01:00
Marc Zinnschlag
e453468eff
moved CellRef loading code to the CellRef class
2014-01-12 19:23:08 +01:00
Marc Zinnschlag
9025210965
Merge branch 'refnum' into savedgame
...
Conflicts:
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/manualref.hpp
components/esm/cellref.hpp
2014-01-12 16:58:06 +01:00
scrawl
1d19d36bd6
Remove unused magic effect flags and update esmtool output
2014-01-12 01:25:00 +01:00
scrawl
ce6aab89cf
Fix a possible permutation issue
2014-01-11 04:58:30 +01:00
scrawl
c64dc2c831
Terrain specular mapping: use a "_diffusespec" postfix to indicate specular information is present in the alpha channel. Use alpha directly instead of 1-alpha.
2014-01-11 00:51:03 +01:00
scrawl
bfdca3b738
Fix needTangents not being set for cached/shared materials
2014-01-09 23:13:31 +01:00
scrawl
aa855e9524
Include some required Ogre headers explicitely
2014-01-09 20:56:24 +01:00
scrawl
6f9113fe88
Add preliminary implementation of PayFine, PayFineThief and GoToJail instructions
2014-01-09 01:49:58 +01:00
Marc Zinnschlag
7c8f735004
Merge remote-tracking branch 'corristo/osx-fixes' into openmw-28
2014-01-08 20:16:39 +01:00
scrawl
7b33f6f2ac
Detect crime of sleeping in other NPC's beds. ShowRestMenu needs to support an explicit/implicit reference for this.
2014-01-08 17:19:43 +01:00
scrawl
0285d18fc2
Respect items belonging to a faction
2014-01-07 20:24:01 +01:00
Sergey Shambir
d5a0ff17fd
MWScript: updated vmformat.txt, changed opcodes to fix sequence.
...
Opcodes for StartCombat, StopCombat, GetTarget now follow the last
previous opcode.
2014-01-07 05:06:20 +04:00
Sergey Shambir
5c7e39a92f
Implemented script commands StartCombat, StopCombat, GetTarget.
...
Also renamed one field of AIWander class because it's not longer
unknown.
2014-01-07 04:43:06 +04:00
Marc Zinnschlag
fefaec5804
Merge remote-tracking branch 'scrawl/savedgame' into savedgame
2014-01-06 22:30:08 +01:00
scrawl
4ad43fdf92
Closes #1088 : Quick&dirty fix for NIF filters not working properly with some mods
2014-01-06 19:01:05 +01:00
Marc Zinnschlag
43dd3b8ef2
removed redundant deletion flag from CellRef
2014-01-06 13:53:20 +01:00
scrawl
62774fcc4a
Merge branch 'master' into HEAD
...
Conflicts:
apps/openmw/mwbase/world.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm/loadtes3.cpp
2014-01-06 00:23:17 +01:00
scrawl
b3764c504a
Implement GetPcJumping instruction
2014-01-05 19:08:12 +01:00
scrawl
c004fb778f
Get rid of underscore defines. They are reserved by the standard.
2014-01-05 18:22:29 +01:00
scrawl
b8e9343764
Extend NifOverrides to allow material overrides, useful for texture modding e.g. adding normal maps without having to edit the affected meshes
2014-01-05 18:09:50 +01:00
scrawl
14b70a3ce6
Implement AI related magic effects (calm, frenzy, rally, demoralize, turn undead)
2014-01-05 01:34:35 +01:00
scrawl
2a7d610f87
Implement GetSpellReadied instruction
2014-01-03 22:55:17 +01:00
scrawl
55c5d7cee4
Implement Resurrect instruction
2014-01-03 15:54:23 +01:00
scrawl
b4230f716e
Implement RemoveEffects instruction
2014-01-03 05:19:10 +01:00
scrawl
7d8ca91286
Implement RemoveSpellEffects instruction
2014-01-03 05:18:44 +01:00
scrawl
366801f3d5
Implement explodeSpell instruction (like Cast, with caster = target)
2014-01-03 04:44:50 +01:00
scrawl
93e1a2df73
Implement Cast script instruction (shrines work now)
2014-01-03 04:09:52 +01:00
scrawl
29acc3f722
Fix particles being too small. Looks like this should actually be size*2.
2014-01-02 16:56:31 +01:00
Marc Zinnschlag
a6e6411686
Merge remote-tracking branch 'scrawl/master'
2014-01-02 12:12:52 +01:00
scrawl
783c501d70
Some checks to prevent bound item abuse
2014-01-02 01:36:08 +01:00
Marc Zinnschlag
e1355be47c
Merge remote-tracking branch 'lgro/valgrind_warnings'
2014-01-01 19:41:52 +01:00
Lukasz Gromanowski
1ce4663065
Updated compiler opcodes for COE, and setHello.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-31 18:13:38 +01:00
scrawl
86b2211932
Don't warn about NiFlipController (already implemented)
2013-12-31 17:33:15 +01:00
scrawl
764ec9bc5f
Closes #716 : Use the particle controller's size instead of NiAutoNormalParticlesData particle radius. Same as NifSkope now.
2013-12-31 15:50:27 +01:00
scrawl
07a9b7623a
Enable skeleton-based bounding boxes added in Ogre 1.10
2013-12-31 13:22:57 +01:00
scrawl
254eba350e
Not handling interpolation type should be an error, since it will fail reading the next record if it hasn't read the previous one completely.
2013-12-31 00:56:04 +01:00
Lukasz Gromanowski
50b6e828cc
Added asserts in Interpreter::installSegmentX methods.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-30 23:51:44 +01:00
scrawl
f3a7321a43
Closes #856 : More aggressive supression of skeleton base: only create for keyframe controllers, not any controllers
2013-12-30 16:44:07 +01:00
Lukasz Gromanowski
60fb75b03a
Fixed valgrind warning about uninitialized variable:
...
==16814== Conditional jump or move depends on uninitialised value(s)
==16814== at 0xA945B8: Terrain::QuadTreeNode::update(Ogre::Vector3 const&, Loading::Listener*) (quadtreenode.cpp:269)
==16814== by 0xA94A77: Terrain::QuadTreeNode::update(Ogre::Vector3 const&, Loading::Listener*) (quadtreenode.cpp:354)
==16814== by 0xA77541: Terrain::World::update(Ogre::Vector3 const&) (world.cpp:159)
==16814== by 0x6EBA17: MWRender::RenderingManager::requestMap(MWWorld::CellStore*) (renderingmanager.cpp:649)
==16814== by 0x8A25C4: MWWorld::Scene::loadCell(MWWorld::CellStore*, Loading::Listener*) (scene.cpp:157)
==16814== by 0x8A2CEA: MWWorld::Scene::changeCell(int, int, ESM::Position const&, bool) (scene.cpp:296)
==16814== by 0x8A2DE0: MWWorld::Scene::changeToExteriorCell(ESM::Position const&) (scene.cpp:440)
==16814== by 0x85AC17: MWWorld::World::changeToExteriorCell(ESM::Position const&) (worldimp.cpp:761)
==16814== by 0x927E38: OMW::Engine::prepareEngine(Settings::Manager&) (engine.cpp:436)
==16814== by 0x92843D: OMW::Engine::go() (engine.cpp:483)
==16814== by 0x6C6B3F: main (main.cpp:279)
==16814== Uninitialised value was created by a heap allocation
==16814== at 0x4C27CC2: operator new(unsigned long) (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==16814== by 0xA93E60: Terrain::QuadTreeNode::createChild(Terrain::ChildDirection, float, Ogre::Vector2 const&) (quadtreenode.cpp:178)
==16814== by 0xA7733E: Terrain::World::buildQuadTree(Terrain::QuadTreeNode*) (world.cpp:139)
==16814== by 0xA76B18: Terrain::World::World(Loading::Listener*, Ogre::SceneManager*, Terrain::Storage*, int, bool, bool) (world.cpp:94)
==16814== by 0x6EC6EB: MWRender::RenderingManager::enableTerrain(bool) (renderingmanager.cpp:1013)
==16814== by 0x8A2A00: MWWorld::Scene::changeCell(int, int, ESM::Position const&, bool) (scene.cpp:206)
==16814== by 0x8A2DE0: MWWorld::Scene::changeToExteriorCell(ESM::Position const&) (scene.cpp:440)
==16814== by 0x85AC17: MWWorld::World::changeToExteriorCell(ESM::Position const&) (worldimp.cpp:761)
==16814== by 0x927E38: OMW::Engine::prepareEngine(Settings::Manager&) (engine.cpp:436)
==16814== by 0x92843D: OMW::Engine::go() (engine.cpp:483)
==16814== by 0x6C6B3F: main (main.cpp:279)
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-29 21:58:55 +01:00
Marc Zinnschlag
56a80da70c
Merge remote-tracking branch 'ace/win-fix'
2013-12-29 14:50:09 +01:00
Marc Zinnschlag
456b41f05b
Merge remote-tracking branch 'scrawl/master'
2013-12-29 14:45:22 +01:00
scrawl
c0dba2834b
Closes #855 : Don't try to look up bone if there's no skeleton
2013-12-29 01:20:57 +01:00
Alexander "Ace" Olofsson
b50151cb38
Quick build fix for windows
2013-12-28 18:16:01 +01:00
Marc Zinnschlag
f1be4656ec
Merge remote-tracking branch 'lgro/issue1042_TES3_header_data_wrong_encoding'
2013-12-28 17:14:41 +01:00
Marc Zinnschlag
60a8a9e684
Merge remote-tracking branch 'scrawl/master'
2013-12-28 17:03:54 +01:00
Lukasz Gromanowski
9b73d23139
Fix warning about uninitialized variable inside stream.peak():
...
openmw/mwgui/bookpage.cpp:394:13: warning: ‘*((void*)& stream +24)’ may be used uninitialized in this function [-Wmaybe-uninitialized]
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-28 13:55:54 +01:00
scrawl
6d47d710a0
Reimplement NiGeomMorpherController using Ogre's pose animation system
2013-12-28 00:51:09 +01:00
Marek Kochanowicz
03235bf0a2
NPC. Still WIP.
2013-12-27 22:13:55 +01:00
scrawl
a9526622b1
Particle improvements: particle systems now move with the particle bone, not the scene node. This difference is not noticable if the particle bone is static, but it makes the code *much* nicer and mirrors more closely what NifSkope does.
2013-12-27 18:58:24 +01:00
scrawl
9877db413c
Connect particle systems to the particle node, not the emitter node
2013-12-26 20:53:52 +01:00
scrawl
eab2c89346
Issue #983 : Fix controllers to affect objects attached to the base node
2013-12-26 20:53:52 +01:00
scrawl
5931fdcbde
Implement NiBillboardNode. Flags not handled yet.
2013-12-26 20:53:52 +01:00
scrawl
33389b9b63
XDG compliant paths
2013-12-26 20:53:51 +01:00
scrawl
aef0fd1460
Rename some path methods
2013-12-26 20:53:51 +01:00
scrawl
e68e2f82a2
Implement DarkTexture slot. Fix an issue with incorrect transparency override when base texture is empty.
2013-12-26 20:53:51 +01:00
scrawl
0050e6e67b
Support materials with no base (diffuse) texture (should be white). Support alternate UV set for diffuse texture.
2013-12-26 20:53:51 +01:00
scrawl
c5c3248376
Compile fixes for Ogre 1.10
2013-12-26 20:53:51 +01:00
scrawl
6d27ebabb6
Integrate AddGlow with material controllers
2013-12-26 20:53:45 +01:00
pvdk
095ff4e17a
Moved launcher settings stuff into components, so they can be reused in the wizard
2013-12-25 00:50:25 +01:00
Nikolay Kasyanov
892ff93489
OS X: attempt to fix #1045
2013-12-25 00:25:58 +04:00
Marek Kochanowicz
e4e7d50623
Added creatureCheck. I don't know meaning of all data fields here.
2013-12-23 12:32:35 +01:00
Lukasz Gromanowski
18a9878bdd
Fixes #1042 : TES3 header data wrong encoding
...
Changed loading of HEDR structure from all-in-once to field-by-field
so author and descryption could be converted to UTF-8.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-21 09:33:05 +01:00
scrawl
5fd98d7c3a
Add an assertion
2013-12-19 01:41:36 +01:00
scrawl
18c002a21d
Fix an awful typo.
2013-12-19 01:31:42 +01:00
Marc Zinnschlag
c22e38f825
removing 255 content file limitation
2013-12-17 21:19:05 +01:00
scrawl
19e5978a01
Merge branch 'master' of https://github.com/zinnschlag/openmw
...
Conflicts:
apps/openmw/main.cpp
2013-12-16 13:35:31 +01:00
Marc Zinnschlag
1cf1d49bc4
fix to content file reading error reporting in case of missing dependency
2013-12-16 11:39:24 +01:00
Marc Zinnschlag
bf4ffe94dc
fixed a memory leak in the script record
2013-12-15 16:19:45 +01:00
Marc Zinnschlag
3590fa40bd
store global script state in saved game files
2013-12-15 16:16:50 +01:00
scrawl
530d06ab54
Remove unused code
2013-12-14 05:07:08 +01:00
scrawl
0c3c3ed8e9
Fix wind gravity affector
2013-12-11 15:15:30 +01:00
Marc Zinnschlag
77a2179d1e
Merge remote-tracking branch 'scrawl/master'
2013-12-09 18:39:34 +01:00
scrawl
57a33c957e
Add possibly missing include
2013-12-09 14:26:08 +01:00
scrawl
37a7ee8fcd
Set alpha value of character animations according to Invisibility / Chameleon effects.
2013-12-08 23:05:21 +01:00
Lukasz Gromanowski
594cc693b2
Fixes #1006 : Many NPCs have 0 skill
...
Added calculation of skill values for NPC with mNpdtType
set to NPC_WITH_AUTOCALCULATED_STATS (their NPDT is 12).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-08 21:47:43 +01:00
scrawl
9fcb4fad5c
Implement NiFlipController
2013-12-08 18:51:56 +01:00
scrawl
51a9f0111c
Implement NiAlphaController and NiMaterialColorController
2013-12-08 16:38:13 +01:00
scrawl
1624e0fd8a
Rename ObjectList to ObjectScene. Wrap it in a SharedPtr so we can automate the destruction routine.
2013-12-07 20:15:39 +01:00
Marc Zinnschlag
ef8c0fab73
Merge remote-tracking branch 'scrawl/master'
2013-12-07 16:26:52 +01:00
scrawl
c5e543b91b
Implement NiGeomMorpherController
2013-12-07 14:10:33 +01:00
Marc Zinnschlag
030c733e2d
Merge branch 'master' into savedgame
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
files/settings-default.cfg
2013-12-07 12:27:06 +01:00
Marc Zinnschlag
674931a851
remove terminating 0 from strings read from ESM records
2013-12-06 14:24:14 +01:00
Lukasz Gromanowski
bfd79bfbe6
Various fixes for CppCheck warnings.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-06 07:36:16 +01:00
Marc Zinnschlag
07f692bdd2
Merge remote-tracking branch 'scrawl/master'
2013-12-05 16:04:50 +01:00
scrawl
062ea627b3
Add parallax mapping for objects
2013-12-05 15:51:07 +01:00
scrawl
69c0bb1723
Add normal, specular & parallax mapping for terrain
2013-12-05 15:51:01 +01:00
Alexander "Ace" Olofsson
47c60a7037
Fix C4716 (Must return a value) error on Windows MSVC
2013-12-04 21:48:25 +01:00
scrawl
3a82f8c193
Fix incorrect log file name for launcherOgre.log
2013-12-03 15:56:00 +01:00
Marc Zinnschlag
e269c9e689
changed a few sub record names to make them more unique
2013-12-03 14:30:18 +01:00
Marc Zinnschlag
7d8e3ac651
fixed QuestState::load/save
2013-12-03 13:51:44 +01:00
Marc Zinnschlag
16e2d67b1f
added overloaded start/endRecord functions to ESMWriter
2013-12-01 13:32:11 +01:00
Marc Zinnschlag
eec9821cd8
added records for storing journals in saved game files
2013-11-30 14:41:12 +01:00
pvdk
1512ac11ad
Fixed the content selector checkboxes appearing as partially checked
2013-11-30 12:16:57 +01:00
Marc Zinnschlag
750133c0dd
one more fix to SavedGame record saving
2013-11-30 11:05:07 +01:00
scrawl
e7ad503e30
Merge branch 'particles' into projectiles
2013-11-28 17:16:59 +01:00
Marc Zinnschlag
e432ab5e8a
fixed static problem in Land recrod save function
2013-11-28 11:51:21 +01:00
Marc Zinnschlag
b40c0f2a07
one more fix to SavedGame record saving
2013-11-26 09:56:08 +01:00
scrawl
9f5ff033d7
Handle the "GetLOS" alias for GetLineOfSight
2013-11-25 14:06:59 +01:00
scrawl
58dce88c7d
Handle the "tai" alias for ToggleAI
2013-11-25 14:03:51 +01:00
scrawl
6b81fd78f1
Particle improvements: Handle LocalSpace flag. Attach particle systems to the base node, since they need to be relative to that when LocalSpace is enabled. Get the bone in emitters/affectors so that resulting particle positions are the same. TODO: Fix Controllers to affect particle systems.
2013-11-25 13:50:33 +01:00
Marc Zinnschlag
1ecadccb28
fixed save function of SavedGame record
2013-11-25 12:59:40 +01:00
Marc Zinnschlag
67cd0887e6
added description field to saved game record; make use of description in GUI
2013-11-24 15:19:56 +01:00
Marc Zinnschlag
fc1501a510
store character profile information in saved game file
2013-11-21 10:53:42 +01:00
Marc Zinnschlag
d6e2701dd6
changed played time data type from float to double
2013-11-21 10:10:41 +01:00
scrawl
3452bd2e0b
Add glow effect for enchanted items
2013-11-20 00:13:12 +01:00
Marc Zinnschlag
9487bd33c3
removed broken save function from ESMWriter
2013-11-19 16:07:36 +01:00
Marc Zinnschlag
4c61deca8d
fixed save code for SavedGame record
2013-11-19 15:31:39 +01:00
Marc Zinnschlag
35bf98a940
modified esm reader/writer to use UTF8 when no encoder is given
2013-11-19 13:46:24 +01:00
Marc Zinnschlag
903e867c24
change to TES3 record (moved format field to the top)
2013-11-19 13:44:18 +01:00
Marc Zinnschlag
dc75627d53
added secondary saved game header record
2013-11-19 10:51:30 +01:00
Marc Zinnschlag
11e254aac8
Merge remote-tracking branch 'gus/AICombat'
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
2013-11-19 09:10:48 +01:00
gus
dff3cf162d
ToggleAI script instruction
2013-11-18 23:03:44 +01:00
scrawl
7fd5f1df83
Change setKeepParticlesInLocalSpace to false. Not correct for all particles, but the opposite isn't either. Plus it breaks pretty much all magic VFX.
2013-11-17 23:31:08 +01:00
scrawl
aa84ce3f0d
Copy paste mistake (oops)
2013-11-16 14:44:31 +01:00
scrawl
c5f1bbcc5f
Add functions to get the effect affecting resistance and weakness for another effect
2013-11-15 19:43:25 +01:00
scrawl
956d8adb99
Merge branch 'master' of https://github.com/zinnschlag/openmw into magic
...
Conflicts:
apps/openmw/mwgui/inventoryitemmodel.cpp
2013-11-14 14:25:22 +01:00
Marc Zinnschlag
d49b8e7443
Merge branch 'dialogue'
2013-11-14 11:40:50 +01:00
scrawl
a6e2f43b75
Stop continuous VFX when the effect is no longer active.
2013-11-13 15:44:43 +01:00
scrawl
ffdb91bb21
Add particles for Cast + Hit. Not looking quite right yet.
2013-11-11 23:43:28 +01:00
Marc Zinnschlag
2fff7fc843
save info records
2013-11-11 12:21:26 +01:00
scrawl
afafaf73e8
Fix a build error
2013-11-10 22:40:46 +01:00
Marc Zinnschlag
8c4303399f
Merge branch 'master' into dialogue
...
Conflicts:
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/esm/loadinfo.hpp
2013-11-10 13:21:39 +01:00
Marc Zinnschlag
418ccf705d
Merge branch 'openmw-27'
...
Conflicts:
apps/launcher/graphicspage.hpp
components/CMakeLists.txt
2013-11-06 10:21:25 +01:00
Marc Zinnschlag
2d4a6c0edf
cleaned up ID handling in INFO record (including a ESMTool bug fix)
2013-11-05 12:56:20 +01:00
Marc Zinnschlag
9d7695ea88
added missing columns to topic info table
2013-11-05 11:41:48 +01:00
graffy76
ed913936f8
Eliminated game & addon keys from profile configuration
2013-11-03 21:36:41 -06:00
graffy76
1d4b5a2425
Fix broken launcher content file display / selection scheme
...
Disable selection of content files with missing dependencies (grayed
out)
2013-11-03 14:02:41 -06:00
graffy76
12c06a5615
Fixed broken dependency check
2013-11-03 06:21:28 -06:00
graffy76
973803eb2f
Fixed pathing issues in launcher
2013-11-03 00:02:46 -05:00
graffy76
8d12e2b99d
fixed merge conflicts
...
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector
Conflicts:
apps/launcher/datafilespage.cpp
apps/launcher/settings/gamesettings.hpp
components/contentselector/model/contentmodel.cpp
2013-11-02 09:31:23 -05:00
graffy76
cddece4f9e
Another stab at fixing the pathing problem...
2013-11-01 21:47:26 -05:00
Marc Zinnschlag
767cb54e7c
added missing columns to journal info table
2013-10-31 12:54:55 +01:00
gus
d587f3c946
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwscript/docs/vmformat.txt
2013-10-31 09:51:17 +01:00
scrawl
636d399c7f
Refactored Ogre initialisation into a component
2013-10-30 14:04:33 +01:00
Marc Zinnschlag
ba88c94d58
first attempt at an info record collection
2013-10-29 13:18:22 +01:00
graffy76
b51bef0d98
fixed missing adjuster widget in file dialog open view
2013-10-27 20:21:19 -05:00
Lukasz Gromanowski
d51c9b64dd
Issue #913 : Merge --master and --plugin switches
...
Launcher part of master/plugin switches merge.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-10-27 20:03:12 +01:00
graffy76
9ce4a04a2d
merge from saving
...
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector
Conflicts:
apps/launcher/datafilespage.cpp
apps/opencs/editor.cpp
apps/opencs/view/doc/filedialog.cpp
apps/opencs/view/doc/filedialog.hpp
2013-10-25 14:44:22 -05:00
graffy76
16d87ea1d1
Merge branch 'master' into esxSelector
2013-10-25 08:11:24 -05:00
graffy76
2ca7f24731
Fixed filedialog new / edit content path issue
2013-10-24 17:33:28 -05:00
graffy76
b48f066f33
Reimplemented content selector for filedialog and datafilespage classes
2013-10-23 17:39:17 -05:00
graffy76
ba3589bc76
Revert "Implemented ContentSelector as a singleton "charm" modifier for"
...
This reverts commit 24b167b755
2013-10-22 22:20:21 -05:00
graffy76
f9591ddda6
Reimplemented constentselector view class
2013-10-22 21:52:35 -05:00
Marc Zinnschlag
c995533e07
Merge branch 'dialogue' into saving
...
Conflicts:
apps/opencs/model/world/columnimp.hpp
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/esm/loaddial.hpp
2013-10-21 16:45:43 +02:00
Marc Zinnschlag
adf3a41a83
added topic and journal tables
2013-10-20 17:15:32 +02:00
Nikolay Kasyanov
3993c34739
Merge remote-tracking branch 'upstream/master' into osx-ogre-19
2013-10-14 20:37:55 +04:00
Marc Zinnschlag
3c580fbc59
Merge remote-tracking branch 'jordan-ayers/topic/MagicEffectDisplayFormat'
2013-10-12 13:40:29 +02:00
Jordan Ayers
296b2ab870
Magic Effect: Recognize other display types.
...
Fill out the list of effects which use percentage formatting.
Add in types which use Feet and level labels.
2013-10-08 23:55:14 -05:00
Jordan Ayers
6ab7002908
MagicEffect: Put magnitude type into ESM::MagicEffect helper.
2013-10-07 22:28:55 -05:00
graffy76
4c72a9ffdf
Fixed non-loading files
2013-10-06 22:10:38 -05:00
graffy76
217a4d75b4
Implemented profile function in launcher datafiles page
...
Implemented dependency sorting to ensure dependent files appear latest
in the list.
2013-10-06 21:13:47 -05:00
Emanuel Guevel
496f786c2a
Implement Disable/EnableLevitation script functions
...
Totally copied on Disable/EnableTeleporting implementation.
Thanks KittyCat!
2013-10-02 15:33:20 +02:00
graffy76
a5a0f61533
Fixed missing profiles combobox
2013-10-01 22:36:49 -05:00
graffy76
00c78a4aa1
Implementing ContentSelector class in DataFilesPage
...
Moved AdjusterWidget / FileWidget to ContentSelectorView
2013-10-01 21:29:45 -05:00
graffy76
24b167b755
Implemented ContentSelector as a singleton "charm" modifier for
...
FileDialog...
2013-09-29 12:19:07 -05:00
Marc Zinnschlag
baae548106
added project scope filter saving
2013-09-27 13:56:40 +02:00
Marc Zinnschlag
4ea5191d7d
fixed write function for ESM variant type
2013-09-27 13:17:04 +02:00
Marc Zinnschlag
5779f799ab
create project file when saving content file
2013-09-27 11:36:06 +02:00
Marc Zinnschlag
c42e74dadf
make 4 byte record type accessable from record struct
2013-09-24 13:17:28 +02:00
graffy76
3b40192e90
Merge branch 'master' into esxSelector
2013-09-23 22:03:42 -05:00
graffy76
9d358dd44c
Further implemented auto-checking / unchecking of dependencies
2013-09-23 22:01:44 -05:00
graffy76
d7cff6361e
Fixed filter issue (all addons for a gamefile are enabled for checking).
...
Note: Other dependencies are not yet automatically selected when an
addon is checked.
2013-09-23 06:51:49 -05:00
Marc Zinnschlag
d4b2a6b9f1
Merge remote-tracking branch 'graffy76/esxSelector' into saving
2013-09-23 10:09:43 +02:00
graffy76
513f0c4b3e
Implemented file/adjuster widgets into new addon creation dialog
2013-09-22 23:52:53 -05:00
Xethik
9f533dbbe4
Fixed "most vexing parse" issue.
2013-09-22 04:57:01 -04:00
graffy76
cfdc19c427
Renamed esxSelector to contentSelector
...
Fixed datafilespage model implementation in launcher
Filtered addons in table view by selected game file
2013-09-21 23:06:29 -05:00
graffy76
7b7dfa122d
Merge branch 'master' into esxSelector
2013-09-19 16:24:28 -05:00
graffy76
244e581952
Finished implementing drag / drop
...
refactored datafilesmodel (now contentmodel)
refactored esmfil
2013-09-19 06:53:09 -05:00
graffy76
0eb06ada39
Implemneting drag and drop
2013-09-18 02:36:23 -05:00
Marc Zinnschlag
bf0fba68af
added save stage for globals
2013-09-16 12:51:57 +02:00
Marc Zinnschlag
874ce26bef
added missing consts to record save functions
2013-09-16 12:32:35 +02:00
Nikolay Kasyanov
25cd9ebf45
Plugins are frameworks in Ogre 1.9. Version hack removed.
2013-09-15 21:56:47 +04:00
Marc Zinnschlag
1ee228a566
fix for the ESMWriter fix
2013-09-15 15:30:17 +02:00
Marc Zinnschlag
bcd36bd378
various ESMWriter fixes
2013-09-15 15:00:15 +02:00
Marc Zinnschlag
bf8a25c2c6
Merge remote-tracking branch 'mckibbenta/tgm'
2013-09-12 19:07:35 +02:00
gus
f9bfbc8764
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat
2013-09-10 16:18:39 +02:00
gus
46a734852b
adding script instruction getLOS + some test about AI
2013-09-10 16:16:13 +02:00
Marc Zinnschlag
25b7cd33ea
added FileWidget; fixed OpenCS configuration
2013-09-08 14:31:20 +02:00
graffy76
a6e7cf9a8c
Implementing drag and drop
2013-09-07 15:57:40 -05:00
Marc Zinnschlag
9332684335
allow the use of value types in string filters
2013-09-05 15:05:49 +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
mckibbenta
06701467ab
Merge branch 'master' into tgm
2013-08-24 21:28:26 -04:00
mckibbenta
8998b90e8b
initial do-nothing implementation; registered opcode
2013-08-24 21:19:12 -04:00
Marc Zinnschlag
f605dcdd24
Merge branch 'filter'
2013-08-24 14:51:05 +02:00
Nikolay Kasyanov
dc6e15f38e
Replaced std::pow with shift since clang doesn't like int as a first argument
...
(reports that call is ambiguous)
2013-08-21 23:59:33 +04:00
Marc Zinnschlag
e03e2f0817
Merge remote-tracking branch 'scrawl/master'
2013-08-21 19:50:08 +02:00
scrawl
d086346b07
Fix loading of some cells in TR
2013-08-21 17:26:11 +02:00
scrawl
5f7e6f7b10
Fix a material issue, layers per pass wasn't entirely correct
2013-08-21 17:26:11 +02:00
scrawl
43313437dc
Fix composite map for cells without land data
2013-08-21 17:26:11 +02:00
scrawl
ce5ea6d7d2
Use a proper node hierarchy; disconnect the root when entering interior
2013-08-21 17:26:11 +02:00
Chris Robinson
602be9bbe7
Avoid swimming into the air from underwater
2013-08-21 07:24:54 -07:00
graffy76
e6fdc7e7fd
...
2013-08-20 12:34:39 -05:00
graffy76
6898321676
Reenabling features
...
Profile functions enabled
New/load file functions partially enabled
Layout reorganized
2013-08-20 08:16:56 -05:00
scrawl
fa76d1631b
Some terrain fixes
2013-08-20 12:08:46 +02:00
graffy76
b52645bf2a
Fixes to accommodate master/plugin loading
2013-08-20 03:23:32 -05:00
scrawl
8c8653160d
Crash fix, material fix
2013-08-20 09:52:27 +02:00
scrawl
b92da9ae93
Neighbour fix
2013-08-19 21:08:44 +02:00
scrawl
ebf9debb80
Enabled terrain self shadows, implemented getHeightAt, some optimizations
2013-08-19 20:39:37 +02:00
scrawl
e27437f8ed
New terrain renderer - improvements:
...
- Consistent triangle alignment, fixes a noticable crack near the census and excise office. Note that alignment is still not the same as vanilla. Vanilla uses a weird diagonal pattern. I hope there aren't more trouble spots that will force us to replicate vanilla, but at least we can do that now.
- Fixes several blending issues and cell border seams
- Fix map render to use the terrain bounding box instead of an arbitrary height
- Different LODs are now properly connected instead of using skirts
- Support self shadowing
- Normals and colors are stored in the vertices instead of a texture, this enables per-vertex lighting which should improve performance, fix compatibility issues due to the PS getting too large and mimic vanilla better
- Support a fixed function fallback (though the splatting shader usually performs better)
- Designed for distant land support - test: https://www.youtube.com/watch?v=2wnd9EuPJIY - we can't really enable this yet due to depth precision issues when using a large view distance
2013-08-19 20:34:20 +02:00
scrawl
a41a23c90a
Deleted old code
2013-08-19 20:34:19 +02:00
graffy76
e614ec3353
Fixing profile code in progress...
2013-08-18 17:11:23 -05:00
graffy76
f6217f9c6a
Moved esx selector classes out of global namespace
2013-08-18 15:11:29 -05:00
graffy76
a14e0b32d8
Restructured esxselector directory
...
Added ./view
Removed ./utils and ./model/esm
Relocated code accordingly.
2013-08-18 09:48:13 -05:00
graffy76
d0363b037c
Renamed components/fileorderlist to components/esxselector
2013-08-18 09:41:02 -05:00
graffy76
45277c0082
Minor changes
...
Stretched table columns to fit widget width
Reduced width of opencs file dialog
Hid the file size column for launcher
Added alternating row colors in table view
2013-08-18 09:34:33 -05:00
graffy76
66e50343ad
Fixed row-selection/check feature
2013-08-18 08:54:51 -05:00
graffy76
a9db983233
Fixing row-click selection
2013-08-18 07:29:48 -05:00
graffy76
2878f51cd3
Reimplemented dependency selection feature
...
Moved more code to ContentSelector
Added support for omwgame and omwaddon files
2013-08-17 19:40:28 -05:00
graffy76
b24dd5c6ac
Continued migration of code to ContentSelector
2013-08-17 05:55:43 -05:00
graffy76
0087b0d67c
Removed checkboxes from master list
...
Moved checkbox code from datafilesmodel to pluginsproxymodel
2013-08-17 05:37:23 -05:00
graffy76
61602789e1
Began migrating code to ContentSelector base
2013-08-16 22:23:21 -05:00
graffy76
4c8c6d6971
Moved init code to master / plugin proxy classes
2013-08-16 21:20:48 -05:00
graffy76
7389507eb5
Created masterproxylist class
2013-08-16 21:12:30 -05:00
graffy76
b850fe0289
Removed vertical headers from plugin view
2013-08-16 18:59:01 -05:00
graffy76
84e5c2610a
Implemented combobox for game file selection
2013-08-16 18:00:23 -05:00
graffy76
bfb71f23c9
Changed filter mechanism for game / addons
...
Filters by number of master references, regardless of extension
2013-08-16 17:26:23 -05:00
Chris Robinson
73437dfdca
GetEffect can accept an effect ID string as well
2013-08-13 19:18:21 -07:00
Chris Robinson
30973352e8
Implement ShowVars (SV) console function
2013-08-13 04:54:41 -07:00
Chris Robinson
6fd4cdb5fb
Play randomized werewolf sounds
2013-08-11 00:53:17 -07:00
Chris Robinson
5968165de0
Merge remote-tracking branch 'zini/master' into werewolf
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
2013-08-09 07:00:00 -07:00
Chris Robinson
db1036e5e5
Handle SetWerewolfAcrobatics
2013-08-09 05:37:56 -07:00
Chris Robinson
ae183cb3e4
Handle werewolf stats
2013-08-09 05:14:58 -07:00
Marc Zinnschlag
a95715b61d
added description field to filter record
2013-08-09 13:45:50 +02:00
Marc Zinnschlag
bf839d19cf
Merge branch 'columns'
2013-08-08 12:50:57 +02:00
Chris Robinson
2bac4566c0
Merge remote-tracking branch 'PotatoesMaster/werewolf' into werewolf
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwscript/statsextensions.cpp
2013-08-08 00:09:29 -07:00
Alex
b9579e085f
cleanup
2013-08-07 15:40:57 -04:00
Alex
a0931b01fe
Merge branch 'master' of https://github.com/zinnschlag/openmw into compiler-reorg
2013-08-07 13:19:23 -04:00
Alex
c3ca5b7c32
mild cleanup
2013-08-07 13:16:20 -04:00
Chris Robinson
57fb065a86
Add Ogre::Light objects to the object list
...
Note that NIFs actually have NiLight-based light records which could be
used to create Ogre::Light objects. However, no Morrowind NIF uses them,
as far as I can tell.
2013-08-06 19:49:01 -07:00
Alex
de1f423bd7
initial move of script opcodes and registerExtensions functions to components/compiler
2013-08-06 20:38:41 -04:00
Marc Zinnschlag
501753c01b
Merge remote-tracking branch 'scrawl/master' into columns
2013-08-03 15:06:30 +02:00
scrawl
7dc30a01cd
Some changes suggested by cppcheck
2013-07-31 18:46:32 +02:00
Marc Zinnschlag
adb05737ee
Merge branch 'master' into filter
...
Conflicts:
apps/opencs/model/world/universalid.cpp
apps/opencs/view/doc/view.cpp
apps/opencs/view/world/subviews.cpp
2013-07-30 15:55:50 +02:00
Chris Robinson
b7e81dbc5b
Ignore controllers on the root NiNode
...
I wonder if we should ignore the root NiNode completely.
2013-07-28 04:20:33 -07:00
Chris Robinson
fb0ee7f2fc
Improve constness of the Nif RecordPtr structs
2013-07-24 23:58:35 -07:00
Chris Robinson
8e24cab935
Strip trailing whitespace from textkeys
2013-07-24 23:21:19 -07:00
Marc Zinnschlag
6f90e071f4
added filter record (will not be used in OpenMW prior to 1.1)
2013-07-22 20:50:04 +02:00
Marc Zinnschlag
47f7bbd48a
fixed OpenCS crash during cell loading when loading multiple ESX files
2013-07-16 12:08:35 +02:00
Marc Zinnschlag
0fd49f10a9
Merge branch 'minus'
2013-07-07 16:09:44 +02:00
Marc Zinnschlag
4a75c7dcc0
allow backticks in names
2013-07-07 16:09:26 +02:00
Marc Zinnschlag
4986b7d65d
Merge branch 'master' into ref
2013-07-06 17:54:19 +02:00
graffy76
a73b97d125
Fixed broken references and other bugs
...
Removed references to CSVSettings::SamplePage class
Removed multiple QDebug references
Fixed custom LineEdits (window size user pref) would not accept data
2013-06-21 23:23:43 -05:00
Marc Zinnschlag
a2aa3aaa0e
workaround for - in names
2013-06-21 14:20:52 +02:00
Marc Zinnschlag
744198fc44
added blank function to CellRef and moved a function that was in the wrong file
2013-06-08 15:49:59 +02:00
scrawl
daab4f55a3
Use Morrowind's fonts
2013-06-06 22:26:06 +02:00
Miroslav Puda
dc17fa1636
Removal of duplicit enumeration and unnecessary conditions.
2013-05-29 00:01:18 +02:00
Miroslav Puda
b40e24c50c
Refactorization
2013-05-27 20:23:04 +02:00
Miroslav Puda
cfbdf3f779
Enum Type renamed to CastingStyle
2013-05-27 15:37:31 +02:00
Miroslav Puda
9e1eb8b3b1
Merge branch 'master' of https://github.com/zinnschlag/openmw into enchanting-mechanics
2013-05-27 14:45:22 +02:00
Miroslav Puda
4788b5e226
Better formula for enchantment cost and code refactorization.
2013-05-27 14:42:08 +02:00
eroen
886bc7e2f6
libc++ fixes: don't rely on tr1
...
libc++ doesn't ship tr1, but ships unordered_map as it is part of c++11.
Since this is the only tr1 header used in openmw, add a check for c++11
unordered_map and fallback to tr1 unordered_map if it's not found.
2013-05-26 12:44:30 +02:00
Miroslav Puda
7149439ace
Replacement of empty() method by assertion.
2013-05-22 13:23:49 +02:00
Miroslav Puda
cd57523601
Merge branch 'master' of https://github.com/zinnschlag/openmw
2013-05-20 14:01:47 +02:00
Marc Zinnschlag
c626e2b257
Merge branch 'ref'
...
Conflicts:
apps/opencs/view/doc/view.hpp
2013-05-19 14:59:01 +02:00
Miroslav Puda
d5689730eb
Removal of unnecessary variable.
...
empty variable duplicates empty() method of std::string. Check for empty value should be replaced by assert since it does not makes much sense to call scanInt with null character.
2013-05-18 22:57:27 +02:00
Chris Robinson
53d1c3939c
Merge remote-tracking branch 'zini/master' into animations
2013-05-17 06:26:34 -07:00
scrawl
ca81335319
Fix bug loading attribute values
2013-05-16 21:45:49 +02:00
scrawl
8a3d3f954b
NPC/creature persistence flag
2013-05-16 18:50:26 +02:00
Chris Robinson
822f130f79
Merge remote-tracking branch 'zini/master' into animations
2013-05-13 04:09:56 -07:00
Marc Zinnschlag
e2620a1edf
Issue #694 : allow float literals starting with .
2013-05-13 11:38:35 +02:00
Chris Robinson
eb4daaf512
Build a skeleton for Nifs that have a matching .kf file
2013-05-08 01:03:57 -07:00
Chris Robinson
bf94ffb839
Only support NiSequenceStreamHelper as a Kf root
...
Newer versions of the Nif foramt may have other record types, but we don't
support those.
2013-05-07 18:26:22 -07: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
Chris Robinson
6a3ba41170
Don't store camera nodes, we don't need them.
2013-05-06 21:46:11 -07:00
scrawl
757a26794a
Merge branch 'master' of https://github.com/zinnschlag/openmw into journal
2013-05-06 15:35:38 +02:00
Marc Zinnschlag
b21dae8d75
added blank function to all referencable record structs
2013-05-06 14:10:43 +02:00
scrawl
f0354ea04c
Fix member variable case problem
2013-05-04 19:14:19 +02:00
scrawl
78e6dab9d2
Dialogue history rewrite WIP
2013-05-04 14:15:47 +02:00
scrawl
1f58edb9db
Merge branch 'master' of https://github.com/zinnschlag/openmw into journal
2013-05-03 18:17:27 +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
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
2a42556aa5
Merge branch 'master' into HEAD
2013-04-30 14:54:10 +02:00
scrawl
20d5ba0eec
Revert "enable move construction/assignment to key ESM data structure to reduce sorting costs"
...
This reverts commit 6dbb53493b
2013-04-30 14:54:07 +02:00
scrawl
24f968623f
Revert "reworked Nif::KeyListT into Nif::CurveT"
...
This reverts commit e7665582ad
2013-04-30 14:53:51 +02:00
scrawl
de3c76a54b
Revert "reworked NIFStream to use a type-handler"
...
This reverts commit 03ee7663a3
2013-04-30 14:53:41 +02:00
Chris Robinson
15a2eeebb8
Merge remote-tracking branch 'zini/master' into animations
...
Conflicts:
apps/openmw/mwworld/worldimp.cpp
2013-04-29 10:16:29 -07:00
Marc Zinnschlag
93868c8bca
Merge remote-tracking branch 'scrawl/master'
2013-04-29 18:08:25 +02:00
scrawl
d5c7a26041
Fix broken loose file resources when using Ogre 1.9
2013-04-29 12:32:24 +02:00
scrawl
78596cad83
Fix enchantment points value
2013-04-29 10:19:09 +02:00
Chris Robinson
4cedf0fbab
Avoid colliding with AvoidNodes
...
These are placed under the RootCollisionNode hierarchy, but the shapes they
hold aren't collided with. Their exact function is unknown, but seems to be
related to lava? Maybe damage avoidance info for the AI.
2013-04-28 11:12:55 -07:00
Glorf
6ea82333d4
Headers cleanup
2013-04-28 16:38:33 +02:00
Glorf
98baf9fac1
Bugfix #718
2013-04-28 16:36:12 +02:00
Marc Zinnschlag
90b38cbfbe
fixed parsing of end statements in scripts with IDs matching keywords
2013-04-27 14:06:23 +02:00
Nathan Jeffords
c7ede9b523
port code to C++03
2013-04-24 20:22:57 -07:00
Nathan Jeffords
6e7c9ebbe6
fix for gcc not handling static constant initialized in class definition
2013-04-24 20:22:57 -07:00
Nathan Jeffords
75757cb675
Created a class to represent a stream of UTF8 characters.
2013-04-24 20:20:00 -07:00
Nathan Jeffords
6dbb53493b
enable move construction/assignment to key ESM data structure to reduce sorting costs
2013-04-24 20:20:00 -07:00
Nathan Jeffords
e7665582ad
reworked Nif::KeyListT into Nif::CurveT
...
Renamed Nif:KeyListT to Nif::CurveT, moved it into its own file and
changed its implementation so that on compatible platforms, the entire
array of key-frames can be read in a single read call. Added a helper
class called Nif::CurveT::interpolator to allow other code to easily
evaluate the curve. Reworked part of the skeletonLoader code to use
the interpolator to simplify its own logic.
2013-04-24 20:20:00 -07:00
Nathan Jeffords
03ee7663a3
reworked NIFStream to use a type-handler
...
Reworked NIFStream to use a type-handler system to decide how to extract
data from the NIF. It also has the capability to perform bulk reads on
compatible platforms, thus improving cell-load performance.
2013-04-24 20:20:00 -07:00
Chris Robinson
68a9a4de5f
Fix setting and getting KeyframeController transforms
2013-04-24 04:12:27 -07:00
Chris Robinson
26cc86ffdc
Use the Nif node's transform for skinned fixups
2013-04-24 00:42:45 -07:00
Chris Robinson
6f0b9a5f2c
Avoid unnecessary multimap copies
2013-04-23 21:42:59 -07:00
Chris Robinson
512ff3687a
Don't create Ogre animations for skeletons
2013-04-23 20:42:54 -07:00
Chris Robinson
634b0fd067
Fix for controller delta time going below start time
2013-04-23 17:57:40 -07:00
Chris Robinson
020bc410bf
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-23 16:57:59 -07:00
scrawl
44ac0a7c18
Use one vertex buffer for all UV coordinates
2013-04-23 22:47:57 +02:00
Chris Robinson
adc6a948c7
Add methods to get the rotation, translation, and scale from a NodeTargetValue
2013-04-22 03:41:38 -07:00
Chris Robinson
59137d93c9
Partially handle NiGeomMorpherController
...
The morphs aren't actually applied yet, but the Ogre controller is set up so
all that has to be done is to implement the setValue method.
2013-04-22 03:24:02 -07:00
Chris Robinson
d936291dbf
Remove an unused ostream operator<<
2013-04-22 02:53:32 -07:00
Chris Robinson
a3511c62cf
Don't store textkeys in user object bindings
...
It's a bit unwieldy to have them stored in the 'skeleton master' instead
of the skeleton instance. And although the text keys are extracted for
each created instance now, this shouldn't be much worse than the
multimap copying going on before.
Plus, proper serialization can help for future optimizations.
2013-04-22 00:01:30 -07:00
Chris Robinson
2345b5e8b3
Avoid storing text keys for each animation
2013-04-21 22:56:40 -07:00
Chris Robinson
7d59340ed6
Don't clip out the group name from the textkeys
2013-04-21 22:13:49 -07:00
Chris Robinson
ace7d647e5
Add a method to apply a NodeTargetValue-based controller to a specified node.
2013-04-20 15:35:19 -07:00
Chris Robinson
f37a71f025
Use a separate method to build node-based controllers
2013-04-19 23:56:47 -07:00
Chris Robinson
1051fa51a7
Recognize NiFlipController
2013-04-19 15:07:08 -07:00
Chris Robinson
6d59325bff
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-17 23:21:17 -07:00
scrawl
c519fc360d
Move away from fixed record names for body parts
2013-04-18 00:19:34 +02:00
Chris Robinson
3def2a0f45
Treat the particle random values as the max differential
2013-04-16 19:16:45 -07:00
Chris Robinson
cac793758b
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-16 11:52:19 -07:00
Chris Robinson
36170c5374
Use flag enums instead of hard-coded hex values
2013-04-16 01:20:32 -07:00
Chris Robinson
1b1f9f7921
Allow multiple ObjectLists to be created for Animations.
...
addObjectList may not currently be called outside of the related constructor.
2013-04-15 18:55:28 -07:00
Chris Robinson
7000a1aa3e
Add a ParticleSystemController
2013-04-14 13:50:55 -07:00
Chris Robinson
bf8bc989fc
Recognize and partly handle NiBSParticleNode
2013-04-14 12:52:20 -07:00
Marc Zinnschlag
f692fc1093
Merge branch 'cell'
2013-04-14 19:35:19 +02:00
Marc Zinnschlag
0c33dd86d5
added basic cell table
2013-04-14 17:04:55 +02:00
Chris Robinson
f4695ec4ac
Cleanup NIFObjectLoader some
2013-04-14 00:06:40 -07:00
Chris Robinson
acb1b5f002
Try to handle NiBSAnimationNode
...
This is still incomplete guess work. Currently it seems as though flag 0x20
specifies whether the controllers auto-play (if on), rather than follow the
object's animation time.
2013-04-13 22:54:32 -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
5b30677e41
Add the start of a custom gravity affector
2013-04-12 14:39:06 -07:00
Marc Zinnschlag
a1ece7de30
Bug #613 : fixed assert in string literal access function
2013-04-12 14:48:53 +02:00
scrawl
23b477a938
Fix normal maps with spaces in filename not getting loaded
2013-04-12 04:36:28 +02:00
Marc Zinnschlag
5bfa691f14
Merge branch 'script'
2013-04-11 10:50:46 +02:00
Marc Zinnschlag
6d3a2cd5a0
added comment token (for use in syntax colouring)
2013-04-11 10:50:22 +02:00
Chris Robinson
d26ffe9de0
Move a method to the Node class
2013-04-10 23:19:47 -07:00
Chris Robinson
62e0abd945
Move the mesh loader to its own source file
2013-04-10 22:38:46 -07:00
Chris Robinson
75489b1e9d
Move NIFMaterialLoader to a separate file
2013-04-10 20:24:44 -07:00
Chris Robinson
3970407772
Use actual classes for properties
2013-04-10 20:22:13 -07:00
Chris Robinson
caff28e20a
Move NIFSkeletonLoader to a separate file
2013-04-10 19:58:17 -07:00
Marc Zinnschlag
74145410f2
basic syntax highlighting in script subview
2013-04-10 22:49:22 +02:00
Chris Robinson
6c6750342c
Specified particle size is actually the radius
2013-04-10 13:37:20 -07:00
Chris Robinson
9d29921913
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-09 15:12:19 -07:00
Marc Zinnschlag
ec6dff38b1
added basic spell table
2013-04-09 11:40:36 +02:00
Chris Robinson
973fdeb2e0
Improve particle system placement when no emitters are specified
2013-04-08 15:21:28 -07:00
Chris Robinson
e7c0f2a211
Minor cleanup to loading texture UV coords
2013-04-08 14:54:13 -07:00
Chris Robinson
01a1a0b846
Merge remote-tracking branch 'zini/master' into nifogre
...
Conflicts:
components/nifogre/ogrenifloader.cpp
2013-04-08 11:46:57 -07:00
Marc Zinnschlag
85e5bd212b
Merge remote-tracking branch 'scrawl/master'
2013-04-08 20:05:52 +02:00
Chris Robinson
23097ac9dc
Minor cleanup of NiMorphData
2013-04-08 09:47:03 -07:00
scrawl
343e2027af
Support NIF detail maps
2013-04-08 15:17:30 +02:00
scrawl
a5c868c9f5
Create a separate vertex buffer for each UV set
2013-04-08 14:54:19 +02:00
Chris Robinson
c6c67a1bb4
Read NiGravity fields
2013-04-07 18:15:23 -07:00
Chris Robinson
3768e04a0c
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-07 17:24:47 -07:00
Chris Robinson
dba7308248
Recognize NiParticleRotation
2013-04-07 17:16:49 -07:00
Chris Robinson
3c633e275e
Don't create a controller for empty keyframe data
2013-04-07 15:42:07 -07:00
Chris Robinson
261ea1fe5e
Implement a KeyframeController
2013-04-07 14:56:23 -07:00
Chris Robinson
f69a8259e1
Update animation source controller targets
2013-04-07 13:51:04 -07:00
Chris Robinson
44a59e1b87
Fix a couple messages
2013-04-07 13:03:41 -07:00
Chris Robinson
2362e920f3
Use an unconnected object list for animation sources
...
We'll want the controllers, as the plan is to use their keyframe controllers
to animate the actual skeleton used for the meshes.
2013-04-07 12:41:27 -07:00
scrawl
f3c8cd2065
Don't buy/sell keys which are set to open a lock
2013-04-07 21:38:53 +02:00
scrawl
2d2196b0d6
Implemented levelled items
2013-04-07 21:01:02 +02:00
Marc Zinnschlag
60cc95305d
added basic birthsign table
2013-04-07 20:26:39 +02:00
Chris Robinson
399394ff10
Don't restrict animations to the keyframe time limits
2013-04-07 10:03:13 -07:00
Chris Robinson
ab5980ae18
Let the default controller function use absolute input
...
And convert the VisController to use it.
2013-04-07 08:29:56 -07:00
Chris Robinson
fe9a7f12b6
Material fixes
2013-04-07 07:53:01 -07:00
Marc Zinnschlag
e25f5c6dfe
added basic region table
2013-04-07 16:32:06 +02:00
Chris Robinson
2e067e95a9
Handle NiWireframeProperty
2013-04-07 07:12:52 -07:00
Chris Robinson
ebff64a7a4
Fix UVController and add warn about unhandled material controllers
2013-04-07 06:56:12 -07:00
Marc Zinnschlag
ff1d908af4
added script table
2013-04-07 15:17:35 +02:00
Chris Robinson
be419bc891
Handle NiCamera nodes
2013-04-07 02:28:15 -07:00
Chris Robinson
2db72ae607
Rename EntityList to ObjectList
2013-04-07 01:52:35 -07:00
Chris Robinson
834a6a1f00
Remove old, unused code
2013-04-07 01:14:26 -07:00
Chris Robinson
d97b341dc6
Rename NIFMeshLoader to NIFObjectLoader
2013-04-07 01:02:21 -07:00
Marc Zinnschlag
ec7a8f1add
small fix
2013-04-06 21:58:28 +02:00
Chris Robinson
63cbf7ddeb
Specify a default return for failed lookups
2013-04-06 12:41:40 -07:00
Chris Robinson
ca289a317c
Separate the UVController function out and make it generic
...
Also fix a timing bug in it.
2013-04-06 12:26:58 -07:00
Marc Zinnschlag
8bf569d58a
added basic sound table
2013-04-06 21:21:10 +02:00
Chris Robinson
6b151be3f4
Create particle systems even when MRK was specified
2013-04-06 11:26:51 -07:00
Chris Robinson
41e410347e
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-06 10:35:01 -07:00
Chris Robinson
c283991126
Remove an unneeded method
2013-04-06 10:33:07 -07:00
Marc Zinnschlag
0f34c79d0a
Merge branch 'race'
2013-04-06 19:21:38 +02:00
Chris Robinson
ebcb4c66c3
Properly read and use the NIF root record list
2013-04-06 10:17:09 -07:00
Chris Robinson
59f1d4b047
Add support for NiUVController on meshes
2013-04-06 09:44:10 -07:00
Chris Robinson
e0da265972
Use accurate bone lookups for attaching objects
...
NIFs don't requires nodes to have unique names, which means looking up a
bone by name may get the wrong one. Instead, use a NifIndex:BoneHandle
map to make sure we can get the proper bone from a given Nif::Node.
2013-04-06 08:15:12 -07:00
Chris Robinson
95730cc127
Create entities and particle systems for hidden objects
...
They're set as (in)visible as appropriate.
2013-04-06 06:53:08 -07:00
Chris Robinson
f764f243d2
Fix the particle quota
2013-04-06 06:44:34 -07:00
Chris Robinson
41ce5464c9
Recognize NiBSAnimationNode as a record type
...
And don't warn about animated nodes without textkeys
2013-04-06 05:00:19 -07:00
Chris Robinson
99b915e652
Fix some material warnings
2013-04-06 00:54:53 -07:00
Chris Robinson
af756bfa9c
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-06 00:22:31 -07:00
Chris Robinson
b5017e0543
Implement NiParticleGrowFade
2013-04-06 00:19:05 -07:00
Chris Robinson
aa9df818a5
Add support for NiVisController
2013-04-05 10:38:27 -07:00
Chris Robinson
0631b28646
Prepare for supporting controller objects
2013-04-05 10:13:54 -07:00
scrawl
75b462b974
If alpha rejection was forced, we also need to force depth_write and depth_check
2013-04-05 18:24:12 +02:00
Chris Robinson
bf0ae3ae72
Read NiVisData info
2013-04-05 06:29:14 -07:00
Chris Robinson
12fada2862
Don't offset the animation time to 0
2013-04-05 05:34:59 -07:00
Chris Robinson
dc9f5f93e7
Use a helper function to get node properties
2013-04-05 05:14:24 -07:00
Marc Zinnschlag
73da794d77
added basic race table
2013-04-04 14:34:39 +02:00
Chris Robinson
b5719e0ec7
Create particle systems for NiAutoNormalParticles and NiRotatingParticles nodes
...
Very incomplete, but it's something to work with.
2013-04-04 05:10:53 -07:00
Chris Robinson
77ba0fbe73
Prepare for creating particles
...
This adds a vector of ParticleSystems to the EntityList, and modifies
corresponding code to handle it. It also loads the ParticleFX plugin so
particles can be created (although they aren't yet).
2013-04-04 05:10:52 -07:00
Chris Robinson
ac10c5f05c
Even more particle information
2013-04-04 05:10:52 -07:00
Chris Robinson
2f6ae4a915
Read more particle information
2013-04-04 05:10:51 -07:00
Chris Robinson
ee0a20f9ce
Read some missing particle data from NIFs
2013-04-04 05:10:50 -07:00
Chris Robinson
97d617d43f
Use more appropriate VBO settings
...
Unskinned meshes don't need dynamic VBOs; they aren't rewritten since their
transformations are handled by the modelview matrix. They also don't need the
local RAM copy (the "shadow buffer") since it's really only useful for skinning
purposes (though this means the VBO has to be readable for static geometry to
work).
2013-04-04 05:10:49 -07:00
Marc Zinnschlag
18e046e628
cleaned up race record struct
2013-04-04 13:50:36 +02:00
Marc Zinnschlag
8c7d578ddc
moved the CellRef struct to its own header
2013-04-04 12:13:15 +02:00
Marc Zinnschlag
7136ac0079
added missing attribute columns to faction table
2013-04-04 10:58:53 +02:00
scrawl
a9b56eedc3
Support NIF "glow maps", which are basically an emissive channel.
2013-04-03 18:51:40 +02:00
scrawl
5625d73d84
Bump texture support
2013-04-03 17:16:34 +02:00
Chris Robinson
095daca058
Create entities when iterating through the NIF
2013-04-03 03:27:41 -07:00
Chris Robinson
512534be11
Read the correct texture resource for other layers
2013-04-02 22:58:07 -07:00
Chris Robinson
f6f165852d
Better handle material texture layers
2013-04-02 21:09:44 -07:00
Marc Zinnschlag
384c88182d
dealing with unset attribute fields
2013-04-02 14:15:22 +02:00
Marc Zinnschlag
f9f520df34
adjusted faction record to increase consistency with other records
2013-04-02 13:59:45 +02:00
Marc Zinnschlag
c71edb613d
added faction table
2013-04-02 12:00:45 +02:00
Marc Zinnschlag
fd0aa1a4b8
Issue #685 : Treat : as a whitespace
2013-03-31 14:46:46 +02:00
Marc Zinnschlag
607435aaf2
Merge branch 'class'
2013-03-31 10:49:56 +02:00
scrawl
e27e53f607
Fix not playable body parts appearing in the race selection menu.
2013-03-30 20:04:05 +01:00
scrawl
6f1575d42a
CELL record corrections
2013-03-27 17:27:43 +01:00
Marc Zinnschlag
ea3b14f2d2
added skill columns to class
2013-03-26 09:43:13 +01:00
Marc Zinnschlag
c7275965b8
added basic class record table
2013-03-25 13:22:06 +01:00
Marc Zinnschlag
1078386fd7
Merge branch 'skills' into next
2013-03-25 11:07:14 +01:00
Marc Zinnschlag
114f99ddbf
add skill records when creating a new base file
2013-03-24 15:10:03 +01:00
scrawl
8e2f9f5186
Fix CellRef to load current weapon/armor health correctly, also show it in the tooltips
2013-03-22 12:24:09 +01:00
scrawl
918cdcffc2
Split up components/esm/loadlocks
2013-03-22 05:50:54 +01:00
Marc Zinnschlag
7df0f6aaee
prepared skill record for use in editor
2013-03-21 14:30:27 +01:00
Marc Zinnschlag
1d1471b81c
fixed a bug in ESM::Variant::write (was affecting string values)
2013-03-21 12:57:10 +01:00
scrawl
6c1ff8caca
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwworld/weather.cpp
components/fileorderlist/model/datafilesmodel.cpp
2013-03-20 02:29:03 +01:00
Marc Zinnschlag
4711135e7f
workaround for faulty endif in Morrowind scripts
2013-03-18 12:05:54 +01:00
Marc Zinnschlag
6ef754c451
Merge remote-tracking branch 'scrawl/armorrating' into next
2013-03-18 07:53:20 +01:00
Marc Zinnschlag
46bde604f9
Issue #601 : unary minus was interpreted as binary minus when used in an argument list without comma
2013-03-17 17:13:25 +01:00
scrawl
dd57eabc3e
Better use an enum for magic effect IDs
2013-03-16 23:28:26 +01:00
scrawl
e30af28860
Markers should still have collision if they have a NiRootCollisionNode
2013-03-14 19:03:42 +01:00
scrawl
84afd87321
Placeable objects should not collide unless they have a NiRootCollisionNode
2013-03-14 03:04:02 +01:00
Marc Zinnschlag
1a809b1cec
Merge remote-tracking branch 'scrawl/master'
2013-03-13 08:32:44 +01:00
scrawl
599207a92d
Transparency sorting should be enabled only when alpha blending is enabled
2013-03-13 01:00:47 +01:00
Marc Zinnschlag
170451cb79
Merge remote-tracking branch 'graffy76/saveOnClose' into next
2013-03-12 14:47:42 +01:00
Marc Zinnschlag
75bd30844d
added optional format sub-record to tes3 record
2013-03-12 14:33:35 +01:00
graffy76
50abb22162
Fix to allow application closing from multiple views and a single view.
2013-03-12 06:28:13 -05:00
Marc Zinnschlag
16570ce87b
moved header record struct to separate file
2013-03-12 09:16:03 +01:00
Marc Zinnschlag
731ac6a160
removed redundant copy of Header::Data
2013-03-12 08:30:51 +01:00
Marc Zinnschlag
9e68a420ae
restructuring tes3 record structs
2013-03-12 08:15:20 +01:00
pvdk
b2d522aa4d
Added support for non-latin characters in esx metadata
2013-03-12 04:01:05 +01:00
Marc Zinnschlag
b085c4f749
removing more leftovers
2013-03-11 16:53:42 +01:00
Marc Zinnschlag
2e1a1fd11a
removing some remains of the removed GMST fixing feature
2013-03-11 16:30:47 +01:00
Marc Zinnschlag
64d517dd79
removed unused file type information from esm component
2013-03-11 14:42:49 +01:00
Emanuel Guevel
289bbc64f7
Load fallback archives listed in openmw.cfg at startup
2013-03-09 21:14:11 +01:00
Marc Zinnschlag
b255472cc6
fixed a spelling mistake
2013-03-09 15:39:49 +01:00
Marc Zinnschlag
2cc20c67cb
Merge remote-tracking branch 'scrawl/raycasting'
2013-03-09 14:34:29 +01:00
scrawl
14964e9fcd
Only build a box shape for collision nodes; use StringUtils
2013-03-09 10:28:10 +01:00
scrawl
d7c4a622cf
Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack
2013-03-08 23:46:25 +01:00
Emanuel Guevel
3adf3f5121
Revive bsatool
2013-03-07 21:13:10 +01:00
Pieter van der Kloet
9145fb210b
Merge remote-tracking branch 'upstream/master' into opencsui
2013-03-07 03:02:03 +01:00
Pieter van der Kloet
7504ae675b
Implemented a file dialog for the editor using launcher .ui
2013-03-07 03:00:59 +01:00
Marc Zinnschlag
e7e8bd655f
Merge remote-tracking branch 'scrawl/graphics'
2013-03-05 17:44:28 +01:00
greye
9133182f2f
restore loading CELL records in esmtool
2013-03-05 20:25:20 +04:00
scrawl
7f8d659f3c
Fix transparency sorting
2013-03-05 17:09:20 +01:00
Marc Zinnschlag
d839a4c6c2
Merge remote-tracking branch 'scrawl/graphics'
2013-03-05 16:31:22 +01:00
scrawl
c9f7f1b994
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
2013-03-05 14:37:38 +01:00
scrawl
2486ec6cb9
Material fixes (vertex colors, alpha)
2013-03-05 13:51:48 +01:00
Marc Zinnschlag
dc3edc6024
Merge branch 'vartype'
2013-03-05 10:59:08 +01:00
Marc Zinnschlag
1489570b09
change variant in info record to new type
2013-03-05 10:34:03 +01:00
Marc Zinnschlag
1b19ab6028
fixed gmst integers
2013-03-05 08:15:03 +01:00
Marc Zinnschlag
ba4907fbaf
use new Variant type for GMSTs
2013-03-05 08:02:27 +01:00
Marc Zinnschlag
ce49ad54a1
some cleanup and fixing
2013-03-05 08:02:05 +01:00
Pieter van der Kloet
4c9d0563fe
WIP: Implementing the .ui for the DataFilesPage
2013-03-05 03:13:39 +01:00
Chris Robinson
2f14f26b96
Use the full unique mesh name for the material instead of the NIF name
2013-03-04 10:35:13 -08:00
Marc Zinnschlag
a1ac20c6f3
changed global variable records to new variant type
2013-03-04 14:32:59 +01:00
Marc Zinnschlag
65081f5520
added variant class
2013-03-04 14:32:23 +01:00
Chris Robinson
4e1e0eaf62
Merge remote-tracking branch 'zini/master' into material-fix
...
Conflicts:
components/nifogre/ogrenifloader.cpp
2013-03-03 14:24:05 -08:00
Chris Robinson
5e50436a94
Convert some BooleanValues to StringValues
2013-03-03 14:19:02 -08:00
scrawl
05bd94effb
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
2013-03-03 15:14:20 +01:00
scrawl
0f6fd80294
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwrender/npcanimation.cpp
files/mygui/openmw_settings_window.layout
2013-03-03 11:02:38 +01:00
Chris Robinson
21e2c287eb
Fix/workaround specular issues
...
The glossiness should not be multiplied by 255, however the values set in many
of Bloodmoon's meshes would look horrible otherwise. Now we can let the
NiSpecularProperty specify when to enable specular (which is supposed to
default to on, but due to the aforementioned meshes, we default to off).
2013-03-02 19:30:23 -08:00
Chris Robinson
7930aa82b2
Add missing depthFlags to the hash
2013-03-02 19:09:15 -08:00
Chris Robinson
8e35159ad4
Handle NiSpecularProperty
2013-03-02 19:06:28 -08:00
Chris Robinson
8c0326a49c
Handle NiZBufferProperty
2013-03-02 18:30:28 -08:00
Chris Robinson
03785f3ecd
Handle NiVertexColorProperty
2013-03-02 16:28:32 -08:00
Pieter van der Kloet
a3c5c868ec
Merge remote-tracking branch 'upstream/master' into launcherui
2013-03-02 23:01:53 +01:00
Nathan Jeffords
109dff2d29
renamed high level NIF files...
2013-03-02 13:23:09 -08:00
Chris Robinson
fdfcd5bb47
Material properties are accumulative along the node tree
2013-03-02 12:23:29 -08:00
Nathan Jeffords
d3c1f5e7b2
renamed low-level NIF related files and include guards to conform to naming convention
2013-03-02 10:46:12 -08:00
Nathan Jeffords
0ed2015319
refactored NIFFile parse to get better code/data seperation
2013-03-02 10:07:57 -08:00
Nathan Jeffords
6de6d9ff6e
Factored a NIFStream class out of the NIFFile class.
...
Split NIFFile into two parts, NIFFile which is cached and is a container
for a parsed NIF, and NIFStream which is a class specialized for parsing
NIFs. This required a semi-sweeping change to make all record classes
accept a NIFStream instead of a NIFFile as an agurment to their read
functions.
2013-03-02 09:56:41 -08:00
Chris Robinson
e3fd4b8429
Fix restoring the original texture name when the DDS check fails
2013-03-01 17:57:34 -08:00
Chris Robinson
e6b547b9ba
Merge remote-tracking branch 'zini/master' into transparency-fixes
2013-03-01 13:32:30 -08:00
Chris Robinson
166d529c50
Ensure the material is properly built after creating it
2013-03-01 13:26:31 -08:00
Chris Robinson
2c05a7477c
Improve checks for texture resource names that include the "textures\" prefix
2013-02-28 17:16:28 -08:00
Chris Robinson
ae5c0663f5
Merge remote-tracking branch 'zini/master' into nif-fixes
2013-02-28 14:04:41 -08:00
Chris Robinson
eaa6813917
Workaround for meshes without any vertices
2013-02-28 13:54:53 -08:00
Chris Robinson
2786cc67f6
Fix loading empty NiTriShapeData records
2013-02-28 13:38:48 -08:00
Marc Zinnschlag
230136438b
minor cleanup
2013-02-28 22:17:07 +01:00
lazydev
60f2219450
fixed zini's norices
2013-03-01 00:46:05 +04:00
Chris Robinson
1168f15361
Don't disable depth writes when blending is enabled
2013-02-28 12:17:58 -08:00
lazydev
169a1ff1ce
Merge branch 'master' of git://github.com/zinnschlag/openmw
2013-02-28 23:02:19 +04:00
Marc Zinnschlag
1f24763881
Merge remote-tracking branch 'vorenon/licensefix'
2013-02-28 19:48:35 +01:00
vorenon
06e077c07c
Removing all traces of "Open Morrowind".
...
pvdk said it was ok to remove the header entirely
2013-02-28 19:36:10 +01:00
scrawl
6683e43efc
Removed commented code
2013-02-28 12:35:18 +01:00
scrawl
f75681d89b
Ignore ESX header version
2013-02-28 12:12:51 +01:00
Marc Zinnschlag
3bd228f71b
fix for global variables of type short
2013-02-28 11:50:29 +01:00
lazydev
b93eb84401
fix for https://bugs.openmw.org/issues/573
2013-02-28 02:43:03 +04:00
Chris Robinson
a7220518b6
Merge remote-tracking branch 'zini/master' into skeleton-fixes
2013-02-27 13:22:33 -08:00
Chris Robinson
3ed0bf97a8
Share the space with the parent entity only when there's real skinned meshes
...
The existence of a base skeleton doesn't mean it shares the same bone
structure. If there isn't an actual skinned entity besides the base, simply
attach it to the bone like unskinned meshes should be.
2013-02-27 13:16:27 -08:00
Chris Robinson
bfe80bb8dc
Avoid duplicating skeletons due to casing issues
...
Manually created resource names are apparently always case sensitive, causing
some skeletons to get loaded multiple times.
2013-02-27 12:33:36 -08:00
Sergey Shambir
03ca7f6123
NIF: added NiStencilProperty record handling
...
NiStencilProperty appears in Better Clothes plugin. If it not handled,
some parts of NPCs bodies will be not rendered.
2013-02-27 23:45:09 +04:00
scrawl
b82ee4872d
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
...
Conflicts:
components/nifogre/ogre_nif_loader.cpp
2013-02-27 12:25:34 +01:00
Marc Zinnschlag
53953b23f9
Merge remote-tracking branch 'chris/materials'
2013-02-27 10:04:42 +01:00
Marc Zinnschlag
f175f8327f
Merge remote-tracking branch 'lazydev/master'
2013-02-27 10:01:50 +01:00
scrawl
369f881170
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
2013-02-27 09:25:44 +01:00
Chris Robinson
b4b20622c6
Properly handle NiAlphaProperty values
2013-02-26 15:24:20 -08:00
lazydev
f717fe0254
Merge branch 'master' of git://github.com/zinnschlag/openmw
2013-02-27 01:47:30 +04:00
Marc Zinnschlag
70b6b68005
Merge remote-tracking branch 'sergeyshambir/BBfix'
2013-02-26 22:37:45 +01:00
lazydev
759b2e96bf
fix for https://bugs.openmw.org/issues/577
2013-02-27 01:37:40 +04:00
Marc Zinnschlag
a7102c143f
ESX variable type cleanup
2013-02-26 14:37:11 +01:00
Chris Robinson
aefd12dfe0
Don't create meshes for collision shapes
2013-02-25 15:44:59 -08:00
Chris Robinson
9679daa6a4
Merge remote-tracking branch 'zini/master' into misc-cleanup
2013-02-25 13:10:21 -08:00
Chris Robinson
429bc23cf6
Convert the 0-1 glossiness parameter to 0-255 for shininess
2013-02-25 13:08:40 -08:00
Pieter van der Kloet
469d608f51
Merge remote-tracking branch 'upstream/master' into launchernext
2013-02-25 21:26:54 +01:00
Marc Zinnschlag
a535d51cbf
Merge branch 'brokenendfix'
2013-02-25 19:52:22 +01:00
Chris Robinson
5f2c897001
Better handle which collision shapes to load
2013-02-25 10:29:48 -08:00
Chris Robinson
ff1ecb85c6
Don't bother storing the shape name for the submesh name
...
The submesh name Ogre has is completely useless to us
2013-02-25 08:22:57 -08:00
scrawl
cacdb33b42
Merge branch 'master' into graphics
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/sky.cpp
2013-02-25 15:12:03 +01:00
Marc Zinnschlag
151ecaad04
workaround for garbage after an end statement
2013-02-25 10:32:38 +01:00
Chris Robinson
53eb553c57
Be a little more aggressive when looking to skip generating a skeleton
...
This is needed to handle the insane number of nodes and trishapes in
in_prison_ship.nif, as Ogre has a 256-bone limit for skeletons. This is a bit
sketchy, but it works.
2013-02-24 18:12:15 -08:00
Sergey Shambir
b1381ddd69
Nif loader: workaround for missed textures in BB/BH
...
Works for Better Bodies / Better Heads addons.
2013-02-25 04:12:41 +04:00
Pieter van der Kloet
6eaaf20c94
Merge remote-tracking branch 'upstream/master' into launchernext
2013-02-25 00:56:23 +01:00
Chris Robinson
c60e858b02
Create bones for NiTriShape nodes, and attach the entities to them
...
Otherwise some models don't connect properly. NiTriShapes are more guaranteed
to have unique names than their parent nodes.
2013-02-24 12:42:32 -08:00
scrawl
2e6c63d9cd
Disable specular on NIF's
2013-02-24 17:18:22 +01:00
Chris Robinson
db9a3aeddf
Merge remote-tracking branch 'zini/master' into animation2
2013-02-24 03:32:35 -08:00
scrawl
3135482cee
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
2013-02-24 10:06:04 +01:00
Nathan Jeffords
44b1c66c4b
fixed various warnings about converting size_t to int
2013-02-23 10:23:38 -08:00
scrawl
db9e49968e
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
2013-02-23 04:13:51 +01:00
Chris Robinson
3c0b29de45
Merge remote-tracking branch 'zini/master' into animation2
2013-02-22 01:34:22 -08:00
greye
82595e66b2
another missing header for #576
2013-02-21 22:47:18 +04:00
Marc Zinnschlag
9b7957cf20
fixed a missing inlcude
2013-02-21 19:27:07 +01:00
Chris Robinson
6ae00be8a3
Fix nifbullet shape transformation
2013-02-19 22:28:15 -08:00
scrawl
f4749f10da
NIF bullet loader fix for incorrect collision shapes (credit goes to Chris, he asked me to push this)
2013-02-20 05:35:52 +01:00
Pieter van der Kloet
35b68a3c40
Fixed accidental profile deletion and added sorting by date
2013-02-19 15:58:01 +01:00
Pieter van der Kloet
37fe31e858
Merge remote-tracking branch 'upstream/next' into settings_selwidget
2013-02-19 01:12:47 +01:00
scrawl
32b837ebd4
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
2013-02-19 00:15:54 +01:00
Pieter van der Kloet
178cf2154e
Made checking/unchecking work with the new datafiles model
2013-02-18 17:59:08 +01:00
Chris Robinson
e2d7cc49e3
Merge remote-tracking branch 'zini/next' into animation2
2013-02-17 03:42:37 -08:00
Douglas Mencken
df5919f2c5
Use `signed char' explicitly where needed. It is important because:
...
- It is implementation-dependent if plain `char' signed or not.
- C standard defines three *distinct* types: char, signed char,
and unsigned char.
- Assuming that char is always unsigned or signed can lead to
compile-time and run-time errors.
You can also use int8_t, but then it would be less obvious for developers
to never assume that char is always unsigned (or always signed).
Conflicts:
components/esm/loadcell.hpp
2013-02-15 20:28:14 +01:00
Pieter van der Kloet
fd430dc5a9
Merge remote-tracking branch 'mike-sc/sel_widget' into settings_selwidget
...
Conflicts:
apps/launcher/datafilespage.cpp
components/fileorderlist/datafileslist.cpp
2013-02-15 15:38:30 +01:00
Pieter van der Kloet
ee27e3bb58
Merge remote-tracking branch 'upstream/next' into settingsnext
...
Conflicts:
apps/launcher/CMakeLists.txt
apps/launcher/datafilespage.cpp
apps/launcher/datafilespage.hpp
apps/launcher/graphicspage.cpp
components/fileorderlist/utils/filedialog.cpp
components/fileorderlist/utils/filedialog.hpp
2013-02-15 15:21:14 +01:00
Chris Robinson
da5f11700f
Warn about unhandled node types before the controllers
2013-02-13 00:45:00 -08:00
Chris Robinson
5b2ca6fa7d
Don't complain about RootCollisionNode, it's handled in nifbullet
2013-02-13 00:43:29 -08:00
Michal Sciubidlo
f4d60ae7b2
Files sorting (masters then plugins).
...
Remove unneeded includes.
2013-02-10 19:59:25 +01:00
Michal Sciubidlo
0df7c7e5c1
Rename mPlugins* to mFiles*
2013-02-10 14:08:54 +01:00
Michal Sciubidlo
e4ed397b2d
Merge plugins and masters list view in openDialog. Simplify datafilesmodel.
2013-02-10 14:02:06 +01:00
Chris Robinson
f4e587c72c
Always create a skeleton from a NIF when there's more than one NiNode
2013-02-09 17:48:23 -08:00
Chris Robinson
f197c67e95
Fix a circular include
2013-02-09 12:46:20 -08:00
Chris Robinson
34ddf69a31
Merge remote-tracking branch 'zini/next' into animation2
2013-02-09 09:46:57 -08:00
scrawl
d47090b312
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
2013-02-09 16:40:10 +01:00
Marc Zinnschlag
f19fbaa293
Merge remote-tracking branch 'mark76/multiple_esm_esp' into next
2013-02-09 15:30:29 +01:00
Mark Siewert
eefbdde6de
- For pull request: remove all instances of maps used to track refnumbers.
...
- new file: apps/openmw/mwworld/store.cpp, had to move reference merging method out of the header file to prevent three-way recursion/unresolved forward references in custom compare operators.
2013-02-09 13:00:57 +01:00
Marc Zinnschlag
d5dd0640c7
basic gmst support
2013-02-08 09:58:19 +01:00
Chris Robinson
8b1e7b95ba
Attempt to load the skeleton source if it doesn't yet exist
2013-02-05 17:55:12 -08:00
Michal Sciubidlo
347a734364
Move OpenDialog to editor and use it in startup dialogue.
...
Remove debug output from DataFilesList.
2013-02-05 22:06:36 +01:00
Michal Sciubidlo
f7e5ea24f4
Merge branch 'startup' into cs_load.
...
Fix include in textinputdialog.cpp.
2013-02-05 21:23:49 +01:00
Chris Robinson
bd4fdf47a3
Merge remote-tracking branch 'zini/master' into animation2
...
Conflicts:
apps/openmw/mwrender/sky.cpp
2013-02-05 02:27:57 -08:00
Michal Sciubidlo
66ec4ca7d9
Split launcher specific code from DataFilesList back to DataFilesPage.
2013-02-04 22:14:14 +01:00
Chris Robinson
bec538bfa1
Always declare operator<< for using a TextKeyMap with Ogre::Any
2013-02-04 09:19:59 -08:00
scrawl
109d0a942f
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
2013-02-03 19:02:57 +01:00
Mark Siewert
3e43db5f76
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
2013-02-03 16:14:41 +01:00
Chris Robinson
c45b4d6072
Clean up some NIF warning reports
2013-02-02 22:27:08 -08:00
Michal Sciubidlo
155cca0c9a
Upload missing files.
...
Fix folder name.
Keep Qt optional.
Move open dialogue from doc to tools.
Rename 'load' to 'open'.
Deleted wrong comment.
2013-02-02 18:36:01 +01:00
Chris Robinson
e6e7c69013
Fix handling of filtered entities
2013-02-02 05:26:52 -08:00
Marc Zinnschlag
85697e4628
reverted to C++03
2013-02-02 13:24:28 +01:00
scrawl
3ec703e6af
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
2013-02-01 16:25:54 +01:00
Michal Sciubidlo
492482de7f
Add "open" option in opencs.
2013-02-01 00:42:03 +01:00
Chris Robinson
c6a9ea5007
Use the skeleton as defined in the NIF model
...
The avoids having to duplicate models that get attached to different character
skeletons.
2013-01-30 22:37:39 -08:00
Michal Sciubidlo
ac62dd050d
Rename datafilespage to datafileslist
2013-01-30 21:08:27 +01:00
Michal Sciubidlo
f029a9011a
Move datafilespage to shared space.
2013-01-30 20:21:03 +01:00
Chris Robinson
b6354c6282
Don't share skeleton instances between bounded parts on an NPC
...
However, a skeleton instance will still be shared between entities in an entity
list.
2013-01-30 09:29:16 -08:00
Chris Robinson
0853fa335c
Avoid redundant string concatenations
2013-01-29 01:36:17 -08:00
Chris Robinson
487c83e943
Rename nonaccum to animroot
2013-01-28 22:09:41 -08:00
Chris Robinson
e1d3933145
Remove an unused struct
2013-01-28 01:27:12 -08:00
Chris Robinson
b1ffdf855f
Reset the initial state of animated nodes on the skeleton instances
...
This is so the animation specifies node keyframe data based on the node's
parent. This will also be necessary for applying animations from different
skeleton sources, as they can have different binding positions (even native
.skeleton resources will need to specify animation data this way).
2013-01-26 04:48:53 -08:00
Mark Siewert
dca8dc4fdb
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/store.hpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm/esmreader.hpp
- Quick hack: OMW::Engine::prepareEngine only loads translation data for the first master file.
2013-01-25 18:22:01 +01:00
Chris Robinson
d836b3d0ff
Don't try to create animations if there's no text keys and nonaccum node.
...
Such meshes apparently use NiBSAnimationNode, a Bethesda-specific extension
which has animation-related info in its flags (values currently unknown).
2013-01-22 00:24:57 -08:00
Chris Robinson
6905bd18ba
Filter out the group name from the text keys
...
It's already in the animation name, and the text keys are animation-specific
anyway.
2013-01-21 02:59:12 -08:00
Chris Robinson
8e8900e422
Use the first bone with text keys as the nonaccum root.
2013-01-20 22:51:39 -08:00
Chris Robinson
536f8104e6
Do not create an 'all' animation.
2013-01-20 17:24:43 -08:00
Mark Siewert
713d324eeb
- Minor code cleanup
2013-01-20 19:07:33 +01:00
Mark Siewert
a8e02779b2
- Add support for multiple plugins trying to modify the same reference
...
- Fix a small signed/unsigned warning
2013-01-19 23:33:18 +01:00
Chris Robinson
1ce8eaf52c
Merge remote-tracking branch 'zini/master' into animation2
...
Conflicts:
apps/openmw/mwrender/actors.cpp
apps/openmw/mwrender/actors.hpp
2013-01-16 07:36:56 -08:00
Chris Robinson
94e30199d1
Merge remote-tracking branch 'zini/master' into animation2
...
Conflicts:
components/nifogre/ogre_nif_loader.cpp
2013-01-15 14:59:30 -08:00
Chris Robinson
e5f040a06f
Improve filename pattern matching
2013-01-15 14:10:52 -08:00
scrawl
6c6ce4a05c
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
2013-01-14 00:10:57 +01:00
Chris Robinson
b23fcb260c
Use the record index for finding the NiTriShape instead of the name
2013-01-13 08:00:04 -08:00
Chris Robinson
660d73fd88
Store the NIF index in the Record object
2013-01-13 06:56:58 -08:00
scrawl
e4f140841e
Make OpenMW work with Ogre 1.9
2013-01-12 08:23:15 +01:00
scrawl
3f4d8c08e4
Merge branch 'nif_file' into graphics
2013-01-12 06:41:13 +01:00
scrawl
31e6d28b19
Close NIF file resource after loading it into memory
2013-01-12 06:37:43 +01:00
scrawl
52516ca4b4
Merge branch 'master' into graphics
2013-01-12 01:22:01 +01:00
Marc Zinnschlag
db48017c36
Merge remote-tracking branch 'blunted2night/nif_cache_v6'
2013-01-11 11:07:45 +01:00
Michal Sciubidlo
85bdb49d1b
Mix debug and release if necessary under non Windows systems.
2013-01-11 09:10:48 +01:00
Nathan Jeffords
d5ebd6654d
cache loaded NIF files to eliminate reloads
...
Created a NIF file caching mechanism to prevent the system from
reloading a NIF during a startup and cell changes.
2013-01-10 21:47:02 -08:00
Nathan Jeffords
0989b44b41
spread some const around NIF loading
2013-01-10 21:32:47 -08:00
Nathan Jeffords
9d4f8c6722
changed bullet_nif_loader to not modifiy NIF file
...
The code in bullet_nif_loader was modifing the loaded NIF file as part of
processing. Currently this is OK since the NIF file will be thrown away
immediately, but it causes problems when trying to share loaded NIF files.
2013-01-10 21:32:32 -08:00
scrawl
6ef85c46fd
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
2013-01-10 19:35:40 +01:00
Chris Robinson
23ac1c2de5
Merge remote-tracking branch 'zini/master' into animation2
...
Conflicts:
components/nifogre/ogre_nif_loader.cpp
2013-01-09 20:52:12 -08:00
scrawl
455ec0996d
Shaders & textures are now loaded upon loading the NIF, instead of when the object becomes visible in the camera frustum. Should improve responsiveness.
2013-01-09 22:27:58 +01:00
Marc Zinnschlag
4defb1a476
Merge remote-tracking branch 'trombonecot/lowerstring'
...
Conflicts:
apps/openmw/mwgui/loadingscreen.cpp
2013-01-09 22:13:59 +01:00
eduard
2dc0064cc2
more string lowercase
2013-01-09 20:51:52 +01:00
Chris Robinson
a14132b5a0
Merge remote-tracking branch 'zini/master' into animation2
2013-01-09 11:12:26 -08:00
Chris Robinson
c4c8295e0b
Rename NIFLoader to Loader, and update some comments
2013-01-09 09:10:59 -08:00
Nathan Jeffords
44031ec3d7
fleshed out BSAArchive and DirArchive.
...
Implemented both lists & finds, with pattern matching.
Conflicts:
components/bsa/bsa_archive.cpp
2013-01-09 08:53:27 -08:00
Chris Robinson
4b7cc1372f
Some cleanup
2013-01-09 06:32:31 -08:00
Chris Robinson
a9bcbfd8d3
Use Node::_getFullTransform instead of building the matrix manually
2013-01-09 05:11:32 -08:00
Chris Robinson
015bb0bf1f
Use the calculated max time for the "all" animation
2013-01-09 04:30:32 -08:00
Chris Robinson
465fd9c8af
Offset animation times to start at 0
2013-01-09 04:21:56 -08:00
Marc Zinnschlag
d1e51ebf42
silenced some warnings
2013-01-09 12:25:45 +01:00
Chris Robinson
4054934f16
Store text keys for each animation
2013-01-09 02:51:25 -08:00
Chris Robinson
bb98542c5a
Build separate animations for each group
2013-01-09 01:40:38 -08:00
Chris Robinson
e44729cd43
Make the text keys lower-case when extracting them
...
I think it's safe to assume all text keys are treated in a case-insensitive
manner. So far the only known NiTextKeyExtraData records are for animation
keys, which effectively are.
2013-01-09 00:17:42 -08:00
Nathan Jeffords
67491f6c49
reworked DirArchive to improve performance
...
Replaced old file index with a simple map. The map works by storing the
file's relative path with path seperators normalized, and in lower case if
not in strict mode. Incoming searches are normalized in the same way then
the name is searched in the map. The value in the map is the original full
path to the file which is then used to created a ConstrainedDataStream. In
addition to changing the index, the commonly used Archive methods are
implemented so that they don't fall back on the default FileSystemArchive
implementations.
2013-01-08 22:51:05 -08:00
Nathan Jeffords
43cd88a24e
include members of BSAArchives in Ogres resource indices
2013-01-08 22:51:05 -08:00
Chris Robinson
14d814d1d3
Avoid creating bones for NiTriShape nodes
...
The offset specified for them can be just as easilly handled by the tag point
they get connected to, and as such it's just needless extra nodes.
2013-01-07 04:21:25 -08:00
Chris Robinson
921ae76ea9
Merge remote-tracking branch 'zini/master' into animation2
2013-01-06 21:20:49 -08:00
Chris Robinson
7ba09ff025
Catch errors from buildBones
2013-01-06 20:05:50 -08:00
Marc Zinnschlag
e31cd1c805
Merge remote-tracking branch 'corristo/master'
2013-01-06 18:40:30 +01:00
Nikolay Kasyanov
1d3f3bcce3
clang build fix
2013-01-06 19:19:12 +04:00
Marc Zinnschlag
25815ab8f7
Merge remote-tracking branch 'potatoesmaster/to_utf8-rewrite'
2013-01-06 13:31:01 +01:00
Emanuel Guevel
0b7d11d38d
to_utf8 test: fix Utf8Encoder constructor
2013-01-06 11:39:18 +01:00
Chris Robinson
8ebf49a35b
Only lower-case the model name
...
The skeleton name will already be lower-case
2013-01-05 20:54:57 -08:00
Chris Robinson
18389c7b04
Set non-bone nodes as manually controlled
2013-01-05 17:50:22 -08:00
Emanuel Guevel
63f09462fd
to_utf8, Utf8Encoder: pass encoding as constructor parameter
...
Edit other files accordingly.
2013-01-06 01:37:58 +01:00
Chris Robinson
e5ce55b6a4
Remove a hack
2013-01-05 06:20:21 -08:00
Marc Zinnschlag
043e6c09fe
Merge remote-tracking branch 'chris/animation2'
2013-01-05 13:34:46 +01:00
Chris Robinson
58d35dbfcf
Have createEntities' caller retrieve the text keys as needed
2013-01-05 04:01:11 -08:00
Chris Robinson
761914bdaa
Use a separate method to build the animation
2013-01-05 03:31:51 -08:00
Jordan Milne
3ed77ca189
Include C++ header instead
2013-01-05 01:17:07 -04:00
Chris Robinson
8a086e3afb
Cache the mesh names from the mesh/skeleton pairs
2013-01-04 20:58:35 -08:00
Chris Robinson
3131e8dae6
Don't get the text keys if they're not being requested
2013-01-04 20:33:26 -08:00
Chris Robinson
683ced54a0
Store and retrieve the node text keys in the bones' user object bindings
2013-01-04 19:41:37 -08:00
Chris Robinson
a3d33db415
Store a NiNode's NiTextKeyExtraData in a user object binding on Ogre::Bone
2013-01-04 15:55:47 -08:00
Jordan Milne
b52904a6ea
Include headers necessary for compilation under VS2010
2013-01-04 19:52:27 -04:00
Chris Robinson
1d4d67f811
Avoid underflows if the texture name doesn't include a '.'
2013-01-04 15:03:57 -08:00
Chris Robinson
3f19b13695
Merge remote-tracking branch 'zini/master' into animation2
2013-01-04 14:47:01 -08:00
Marc Zinnschlag
215b43cc7b
Merge remote-tracking branch 'blunted2night/texname_fix'
2013-01-04 23:19:51 +01:00
Marc Zinnschlag
b4d63814cc
post merge fix
2013-01-04 23:12:56 +01:00
Nathan Jeffords
fec9a59237
changed EMSLoader to use ConstrainedDataStream
...
Changed the EMSLoader class to use the ConstrainedDataStream so that
future changes may benifit from its increased performance.
2013-01-04 13:41:03 -08:00
Nathan Jeffords
278337116b
increased performance of ConstrainedDataStream
...
Reimplemented ConstrainedDataStream to use low-level IO calls and a
custom buffering scheme to avoid using C++ iostreams.
2013-01-04 13:40:00 -08:00
Nathan Jeffords
5c7f1bd497
moved ConstrainedDataStream into its own file
...
moved the ConstrainedDataStream into its own source file and changed
BSAFile to use it though the exposed factory function. This is in
preperation foreimplementing it based on feedback from profiling that
(at least on windows) the C++ iostreams library is quite slow.
2013-01-04 13:39:10 -08:00
Nathan Jeffords
2181393518
change texture renaming logic to increase performance
...
ResourceGroupManager::resourceExistsInAnyGroup is slow (at least on
windows) if the tested path does not exist, but is fast if it does (due
to finding it in the index). This change tries the '.dds' version of the
name first, and reverts to the original if the '.dds' version was not
found.
2013-01-04 11:36:22 -08:00
Emanuel Guevel
cc792da858
Fix to_utf8 test: add test data directory and remove unused include
2013-01-04 15:24:07 +01:00
Emanuel Guevel
c947d87ab9
Add a test for to_utf8 component
2013-01-04 15:10:30 +01:00
Chris Robinson
61ad8bb3dd
Use a list of mesh names instead of mesh objects
2013-01-04 00:14:41 -08:00
Chris Robinson
019893b5c6
Get rid of some unnecessary case-insensitive compares
2013-01-03 23:44:58 -08:00
Emanuel Guevel
0bdf52a071
components/to_utf8: keep only Utf8Encoder
2013-01-04 01:58:30 +01:00
Emanuel Guevel
02bf02f288
ESMReader, ESMWriter: use Utf8Encoder
2013-01-04 01:52:03 +01:00
Emanuel Guevel
9906c3051d
components/translation: use Utf8Encoder
2013-01-04 01:52:02 +01:00
Emanuel Guevel
740e2b5769
components/to_utf8: add class Utf8Encoder
2013-01-04 01:52:02 +01:00
Mark Siewert
d6377fb2e3
- Support deleting references from a plugin
...
- Add preliminary support for loading some unique fields appearing only in savegames
- Add a few lines required for supporting respawning references. Incomplete.
2013-01-03 18:51:04 +01:00
Marc Zinnschlag
80a0be3264
Merge remote-tracking branch 'blunted2night/msvcbuild'
2013-01-01 21:19:27 +01:00
Nathan Jeffords
08fa9dcd3e
replaced std::string concatenation with std::ostringstream
...
Changed a block of code that was performing a series of string
concatenations to use an ostringstream instead. This allowed the removal
of calls to std::to_string (not C++03 compliant) and fixes an compile
error in MSVC 2010 (ambigous overload when calling std::to_string).
2013-01-01 11:59:05 -08:00
Nathan Jeffords
7228f5d696
added missing reference to <cctype>
...
added missing reference to <cctype> that was causing Visual Studio 2010
to fail to compile stringops.hpp
2013-01-01 10:58:30 -08:00
lazydev
7cd1e87fe8
Merge branch 'master' of git://github.com/zinnschlag/openmw
...
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
2013-01-01 22:18:21 +04:00
lazydev
cd5d95ed22
1. Dialogs in Russian version now works.
...
2. Destination names it travel window are now translated
2012-12-31 04:15:47 +04:00
eduard
69d9d22579
comparestring
2012-12-30 19:56:38 +01:00
eduard
98103e15eb
conflict resolution
2012-12-30 13:46:07 +01:00
eduard
c85400b809
Merge https://github.com/zinnschlag/openmw into comparestring
...
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
apps/openmw/mwworld/worldimp.cpp
components/esm_store/reclists.hpp
components/misc/stringops.hpp
2012-12-30 13:09:37 +01:00
Marc Zinnschlag
334588bf1c
Merge branch 'editor2'
2012-12-28 23:31:43 +01:00
eduard
c75a5ae212
string compare and tolower
2012-12-28 18:05:52 +01:00
eduard
8545667bbd
string compare and tolower
2012-12-28 17:54:56 +01:00
Mark Siewert
2cef65a056
- Remove some files that are no longer in upstream/master
2012-12-27 20:11:58 +01:00
Tom Mason
a14b7e4a0f
small fixes on text defines
2012-12-26 18:07:56 +00:00
Marc Zinnschlag
e9ba7339f3
improved error handling
2012-12-26 17:15:53 +01:00
Marc Zinnschlag
afc2e840ae
renamed namespace TranslationData to Translation
2012-12-26 17:06:33 +01:00
Marc Zinnschlag
206c613b52
moved translation storage from GUI manager to engine
2012-12-26 17:03:37 +01:00
Marc Zinnschlag
2d468fec02
made previous commits naming standard compliant
2012-12-26 16:19:59 +01:00
Marc Zinnschlag
4c28f3211b
Merge remote-tracking branch 'lazydev/master'
2012-12-26 15:50:03 +01:00
Mark Siewert
049b0e66e0
- Restore ability to generate references in the same cell from multiple plugins
...
- Disable some code related to deleting entries in the store so that it builds again
2012-12-25 20:27:30 +01:00
lazydev
1f71395660
renaming of translation component; removing of C++11 features
2012-12-25 23:20:39 +04:00
lazydev
74ae479780
Cell names localization fix
2012-12-23 23:23:24 +04:00
Tom Mason
8ac8fdff47
implemented all text defines except a few for keybindings that don't exist yet
2012-12-21 18:09:31 +00:00
Tom Mason
f2c6907244
Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work
2012-12-20 23:16:34 +00:00
Thoronador
5a7a8629b6
remove unnecessary include directive
2012-12-17 23:20:43 +01:00
Thoronador
32f051d61d
Remove 'GMST fixing' for dirty GMST records
...
The 'fixing' for so-called dirty GMSTs does not work properly in its
current state anyway, so it should be removed. Fixing the 'GMST fixing'
might not be possible, because whether or not a GMST is 'dirty' depends
on the language version of MW. Therefore different 'fixing' algorithms
would be required for the different MW localisations, and I do not see
a good reason why GMST values should be hard-coded in the GMST load
procedure. In my opinion, it only clutters the code.
Last but not least, I believe that it is not the task of the engine to
clean ESM files from dirty entries. That is a job for the modders, who
should only release clean ESM/ESP files in the first place. The engine
should not need to worry about whether a file is 'dirty' or not.
That is why I believe a feature for cleaning ESM/ESP files shall not be
part of the engine.
2012-12-17 23:13:33 +01:00
Marc Zinnschlag
5cd2fe00ab
initialise blank global records
2012-12-03 22:16:02 +01:00
Marc Zinnschlag
8a09e03d5c
global variable editing (no undo support yet)
2012-11-29 14:45:34 +01:00
Marc Zinnschlag
ef9575498f
basic (non-editable) subview for global variables
2012-11-26 12:29:22 +01:00
Mark Siewert
b103426cf0
- Partially reimplement deleting objects defined in a parent esX file.
...
- Try to reimplement multiple esX files dropping references in the same file.
NOTE: None of these features works. Maybe the code itself does not build. Anyway, after 12 hours of hacking, I am just tired and want to get a snapshot of the code out.
2012-11-25 19:07:16 +01:00
Mark Siewert
896ab44d1e
- Add some updated files missing from last commit.
...
- Move plugin dependency test from esmreader.cpp to esmstpre.cpp; fixes crash in omwlauncher.
2012-11-25 17:19:29 +01:00
Mark Siewert
8ea9f00e6f
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
...
Conflicts:
apps/openmw/mwrender/terrain.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/cellstore.hpp
apps/openmw/mwworld/containerstore.cpp
apps/openmw/mwworld/localscripts.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm_store/reclists.hpp
components/esm_store/store.cpp
extern/shiny
- Re-implement some patches that were broken by the removal of reclists.hpp and store.cpp/.hpp.
- NOTE: Not everything works as before, I'll have to test some more stuff before we are back to where we were.
2012-11-25 14:12:44 +01:00
Marc Zinnschlag
d684b3ae11
fixed getString function in NIF loader
2012-11-22 10:35:03 +01:00
Mark Siewert
31fb715bd7
- Add support for moving existing references by plugin files. No cell changing yet.
...
- Change CellRefList::list from list<> to map<int,> so we can identify live references by their Refnumber.
- Introduce ContainerRefList, a clone of the original CellRefList. It is now used for containers, which do not track Refnumbers.
- Many small tweaks so that the new CellRefList does not conflict with existing code.
2012-11-17 21:50:25 +01:00
Mark Siewert
2175f13b67
- Add tracking for dependencies between plugins.
...
- Add reference number mangling required for moving references around.
2012-11-17 00:21:51 +01:00
scrawl
5f7d349126
several missing includes
2012-11-14 05:32:23 +01:00
Mark Siewert
42eefaf36f
- Add support for loading references from multiple esm/esp files. Full reference ID mangling coming soon (currently, moved references are simply cloned).
...
- Reference loader now (partially) supports MVRF tag.
2012-11-10 21:43:41 +01:00
Marc Zinnschlag
75f64aa38b
Merge branch 'master' into dialogue
...
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.hpp
apps/openmw/mwmechanics/npcstats.cpp
apps/openmw/mwmechanics/npcstats.hpp
2012-11-10 15:44:44 +01:00
greye
b1ef0026a9
race selection/inventory preview character model update
2012-11-10 11:41:12 +04:00
Marc Zinnschlag
4994a253da
Merge branch 'bountydisease' into dialogue
2012-11-09 18:17:14 +01:00
greye
c3f0dc0dfb
m prefix for NpcAnimation members
2012-11-08 23:11:43 +04:00
scrawl
00a2de432a
fix BulletShapeLoader namespace
2012-11-08 18:48:07 +01:00
Marc Zinnschlag
662054acf4
Issue #219 : moved checks for various dialogue info fields from DialogueManager to Filter
2012-11-08 14:55:31 +01:00
Mark Siewert
7f77bf76c7
- Add support for multiple esm contexts in cell store. This will allow to generate references from multiple esX files. Currently, only the first context is used.
...
- Add many TODOs to mark points where more work is required to fully implement this feature.
2012-11-06 22:13:19 +01:00
Mark Siewert
64c08eada4
Merge remote-tracking branch 'upstream/next' into multiple_esm_esp
2012-11-06 20:37:29 +01:00
greye
8691eac557
resolve Script::mData.mName -> mId, resolve moving ESMStore
2012-11-05 17:41:36 +04:00
greye
5ac54d1fff
alter ESM::Script for storing id as std::string
2012-11-05 17:18:01 +04:00
greye
d5628c678f
add mId field to every record indexed by id
2012-11-05 17:18:01 +04:00
greye
2057f5619e
move ESMStore to MWWorld
2012-11-05 17:18:01 +04:00
greye
f0a3ee0ef9
gmst id should be lowercase, wipe RecIdListT
2012-11-05 17:14:02 +04:00
scrawl
4ca0eb93ee
fix markers used for raycasting and blocking activation
2012-10-24 17:47:03 +02:00
Marc Zinnschlag
3f6afb13f1
Merge remote-tracking branch 'scrawl/alchemy'
2012-10-19 20:09:45 +02:00
Marc Zinnschlag
18686614db
Merge remote-tracking branch 'scrawl/splashscreen_dirlisting'
...
Conflicts:
apps/openmw/mwgui/loadingscreen.cpp
2012-10-18 15:46:43 +02:00
Marc Zinnschlag
510674aa5e
Merge branch 'master' into alchemy
...
Conflicts:
components/esm/loadmgef.hpp
2012-10-18 14:37:05 +02:00
Marc Zinnschlag
5fbca239dd
Issue #61 : potion creation (1st part; still missing some implementations)
2012-10-18 14:02:06 +02:00
scrawl
1a2034b4dd
training window
2012-10-17 18:03:02 +02:00
scrawl
84a4fd56c3
consider all files in Splash directory
2012-10-17 12:39:45 +02:00
Marc Zinnschlag
e05e683da3
Merge remote-tracking branch 'scrawl/spellcreation'
2012-10-12 17:19:30 +02:00
scrawl
8ccb0907e6
assertion -> exception; added the old effect flags again
2012-10-12 14:26:10 +02:00
Marc Zinnschlag
3fd887c030
silenced some warnings
2012-10-09 17:11:41 +02:00
Marc Zinnschlag
35d099a638
disabling gcc extensions
2012-10-09 17:10:25 +02:00
Mark Siewert
1f961d575e
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
...
Conflicts:
apps/openmw/mwrender/terrain.cpp
components/esm/loadland.hpp
components/esm_store/reclists.hpp
2012-10-07 20:35:54 +02:00
Mark Siewert
28d4d7ea3f
Manually convert last changes in branch to upstream/master. Regular merge attempt resulted in everything being overwritten by fast-forward merging.
...
- Remove check for 255 master/plugin files.
2012-10-07 20:00:55 +02:00
scrawl
21493c2dbd
added magic effect flags from Research wiki page
2012-10-01 23:33:07 +02:00
greye
31f7325e1f
fix land loading
2012-10-01 15:46:32 +04:00
greye
93078bb0dc
move record ids to defs.hpp
2012-10-01 00:55:27 +04:00
greye
3494e17b7c
wipe record superclass
2012-10-01 00:51:54 +04:00
greye
2fa4ac177a
initial resolving
2012-10-01 00:23:49 +04:00
greye
721324c1db
rm record inheritance, rework esmtool accordingly
2012-09-30 23:34:53 +04:00
Chris Robinson
cd8515396a
Use a multimap to store the text keys
2012-09-28 23:20:15 -07:00
Chris Robinson
9b491edbf8
Small cleanup for loading animation keyframes
2012-09-28 18:53:24 -07:00
scrawl
d163f8203c
change books to RecListWithIDT
2012-09-25 21:38:34 +02:00
greye
1339787863
remove underscores from filenames in esm
2012-09-23 23:12:10 +04:00
greye
7368e7b655
rename getASCII() to getLegacyEnc()
2012-09-23 22:20:18 +04:00
greye
c54750977f
remove underscores in guards
2012-09-23 22:11:08 +04:00
scrawl
bf3aad8be0
handle NCC flag
2012-09-23 18:30:13 +02:00
scrawl
872fcf3e3d
sleeping restoration of health, magicka, and fatigue
2012-09-21 17:53:16 +02:00
greye
18cc435aa1
resolving conflicts
2012-09-21 13:13:11 +04:00
greye
09195894cf
restore INGR and MGEF
2012-09-21 12:30:08 +04:00
greye
2d5ddd104b
Land::loadData rework
2012-09-21 12:12:16 +04:00
greye
bd94f257bf
a bit formatting
2012-09-21 09:36:18 +04:00
greye
e69880f77e
almost perfect byte copies, has redundant data
2012-09-20 20:33:30 +04:00
scrawl
8214966d44
Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap
2012-09-20 17:41:14 +02:00
scrawl
e8bba2b833
disabled loading of land normals again, didn't need them after all
2012-09-20 14:06:30 +02:00
scrawl
86cfc91ef3
global map rendering
2012-09-20 13:56:37 +02:00
greye
597b88e95a
update saving AI packages
2012-09-18 19:30:19 +04:00
Marc Zinnschlag
4abb9a00da
Merge remote-tracking branch 'jhooks/physicsaedra3' into next
2012-09-18 11:25:09 +02:00
greye
7606ebafd6
resolving conflicts, minor update
2012-09-17 11:37:50 +04:00
Marc Zinnschlag
835c530e06
Merge branch 'ingredients'
2012-09-13 13:31:46 +02:00
scrawl
b5ddc8d4fb
Fix the marker collision; also, nodes marked with NCO are now correctly ignored for collision.
2012-09-13 13:10:02 +02:00
Marc Zinnschlag
677158c477
added typesafe access functions for GMST values
2012-09-13 10:41:55 +02:00
Marc Zinnschlag
f2ab4c929d
Issue #356 : added hardcoded magic effect flags *grumble*
2012-09-13 09:26:17 +02:00
scrawl
906d290935
Markers are actually hidden now. Inspecting the markers in NifSkope revealed why it didn't work previously: the flag that is being looked for is not present in any of the markers, nor any other flag or extra data to identify them. However, the root node name always starts with "marker", making it possible to do a string search.
2012-09-12 12:41:12 +02:00
Jason Hooks
c5b25ef70b
Very basic actor physics (no set scale/rotate functions)
2012-09-10 20:29:24 -04:00
Alexander "Ace" Olofsson
7934d8abd9
Fixed an issue with some paths not concatenating properly.
2012-09-09 16:28:02 +02:00
Alexander "Ace" Olofsson
bc6d87ba32
Oops, that would've broken getUserPath() on Linux...
2012-09-08 23:04:53 +02:00
Alexander "Ace" Olofsson
cd3e780614
Removing the unnecessary local variables
2012-09-08 20:34:43 +02:00
Alexander "Ace" Olofsson
97f1be2b05
Testing a third way to solve the path issue
2012-09-08 18:47:31 +02:00
Alexander "Ace" Olofsson
6e317f00eb
Fix the problem in a different way
2012-09-08 15:57:12 +02:00
Alexander "Ace" Olofsson
b6fcd337df
Modified the cache path to work on windows
2012-09-08 15:08:24 +02:00
Marc Zinnschlag
e3d893b001
Merge remote-tracking branch 'jhooks/animationsmooth'
2012-09-06 09:09:46 +02:00
Edmondo Tommasina
7b73bfb099
settings.cpp: fix std::runtime_error compile error
...
Fix following error:
[ 11%] Building CXX object
components/CMakeFiles/components.dir/nifoverrides/nifoverrides.cpp.o
/home/edmondo/src/openmw/components/settings/settings.cpp: In static
member function ‘static const std::string
Settings::Manager::getString(const std::string&, const std::string&)’:
/home/edmondo/src/openmw/components/settings/settings.cpp:82:15: error:
‘runtime_error’ is not a member of ‘std’
make[2]: ***
[components/CMakeFiles/components.dir/settings/settings.cpp.o] Error 1
2012-09-05 23:39:58 +02:00
scrawl
c27ff546e4
shader cache
2012-09-02 19:40:26 +02:00
scrawl
950bf66334
throw an exception if default value for a setting is not found
2012-09-02 11:39:54 +02:00
scrawl
4f1bcb749f
turned off redundant edge list building
2012-09-02 10:09:41 +02:00
Jason Hooks
0697c7f7f4
Finally merged in master
2012-09-01 17:28:12 -04:00
greye
a90547bbbe
code formatting
2012-08-29 21:35:06 +04:00
greye
75fa0288a3
fix creatures has spells, creatures ai data
2012-08-29 14:35:43 +04:00
greye
02d7aa4135
npc ai packages
2012-08-29 14:35:43 +04:00
Marc Zinnschlag
34c30b132c
Issue #378 : workaround for bad ingredient records in Morrowind.esm
2012-08-28 10:12:22 +02:00
Michael Mc Donnell
eff2799c1b
Update UTF 8 table generator to print char values
...
This patch is in relation to commit 25fa8165f97 (Use char literals in
UTF 8 conversion to fix 798 warnings), which changed the UTF 8 table
to have char integer values instead of unsigned chars. Those values were
converted using a custom Python script. This patch changes the original
table generator so it can now output the same format.
2012-08-27 10:55:39 -04:00
Michael Mc Donnell
5fa8165f97
Use char literals in UTF 8 conversion to fix 798 warnings
...
The data type is specified as char but the literals are unsigned char. This
results in 798 truncation warnings in vs2010. The literals were converted
with a simple python script to signed char while taking two's complement and
the overflow into account.
Also tested on Ubuntu 12.04 with gcc 4.6.
2012-08-22 16:42:53 -04:00
Jason Hooks
5202b11235
just moving a comment
2012-08-18 15:31:54 -04:00
Jason Hooks
4a219404fc
Super smooth animations; 100 PERCENT COMPLETE
2012-08-18 15:21:43 -04:00
Jason Hooks
f21df64808
changing a few things around
2012-08-18 14:48:18 -04:00
Marc Zinnschlag
98219323b7
Merge remote-tracking branch 'mmd/vsdebugfixes'
2012-08-18 12:56:59 +02:00
Jason Hooks
cc776810e2
smoother animations
2012-08-17 17:10:21 -04:00
Michael Mc Donnell
7952d38e6c
Use debug dlls when debugging in vs2010 (try 2)
...
Using the Debug build in vs2010 is not working because the debug dlls are
not loaded when debugging. The reason they are not loaded is that
CMAKE_BUILD_TYPE is not defined when doing multiple builds. This in turns
causes OGRE_PLUGIN_DEBUG_SUFFIX not to be set. This patch makes sure that
OGRE_PLUGIN_DEBUG_SUFFIX is always set but only used when debugging.
It also defines DEBUG to make it easier turn things on and off when
debugging.
There are still other bugs that have broken Debug mode in vs2010 but those
will be addressed in other patches.
2012-08-17 10:47:20 -04:00
Marc Zinnschlag
1da56e2832
removed some unused variables
2012-08-17 15:37:14 +02:00
Marc Zinnschlag
2a11a28e81
Revert "Use debug dlls when debugging in vs2010"
...
This reverts commit ebe131b326
2012-08-17 10:05:29 +02:00
Jason Hooks
d14cc5a435
update master
2012-08-16 18:20:26 -04:00
Michael Mc Donnell
ebe131b326
Use debug dlls when debugging in vs2010
...
Using the Debug build in vs2010 is not working because the debug dlls are
not loaded when debugging. The reason they are not loaded is that
CMAKE_BUILD_TYPE is not defined when doing multiple builds. This in turns
causes OGRE_PLUGIN_DEBUG_SUFFIX not to be set. This patch makes sure that
OGRE_PLUGIN_DEBUG_SUFFIX is always set but only used when debugging.
There are still other bugs that have broken Debug mode in vs2010 but those
will be addressed in other patches.
2012-08-16 11:18:16 -04:00
Jason Hooks
8762f4a47a
boxrotation nif field; commented functions
2012-08-15 16:47:26 -04:00
Jason Hooks
1f5bc229e0
Separate adjustRigidBody function
2012-08-14 18:04:58 -04:00
Jason Hooks
e7329d5f8b
Creatures now have a properly positioned box shape
2012-08-12 00:36:49 -04:00
Jason Hooks
38c2c5d480
Creatures now use object physics
2012-08-09 18:09:11 -04:00
Jason Hooks
083e3537b4
post merge
2012-08-09 17:21:59 -04:00
Marc Zinnschlag
7cc2de3e21
boost filesystem compatibility fix
2012-08-08 08:52:08 +02:00
Marc Zinnschlag
dbcd4a8b5b
compatibility fix
2012-08-05 00:06:19 +02:00
Edmondo Tommasina
20deb97a09
nif_file.hpp: add stdint.h include to fix build
...
It fixes such compile errors as:
* error: ‘uint8_t’ does not name a type
* error: ‘uint16_t’ does not name a type
* error: ‘uint32_t’ does not name a type
2012-08-04 23:14:53 +02:00
Edmondo Tommasina
c08e098d7f
esm_reader.cpp: fix std::runtime_error compile error
2012-08-04 23:02:34 +02:00
Edmondo Tommasina
32b167ce2b
Revert "nif_file.hpp: include type definitions to fix build"
...
This reverts commit b0b3ebe123
2012-08-04 23:02:27 +02:00
Edmondo Tommasina
a63fd77ccc
Revert "esm_reader.hpp: fix std::runtime_error compile error"
...
This reverts commit 0f3cb5667f
2012-08-04 22:58:26 +02:00
Jason Hooks
cacf0bd10d
Basic collision with npcs
2012-08-04 15:43:33 -04:00
Edmondo Tommasina
b0b3ebe123
nif_file.hpp: include type definitions to fix build
2012-08-03 22:42:59 +02:00
Edmondo Tommasina
0f3cb5667f
esm_reader.hpp: fix std::runtime_error compile error
2012-08-03 22:41:51 +02:00
Michael Mc Donnell
7f802a22b5
Compare with stream position instead of int.
...
Fixes compilation of Debug build on Windows.
2012-08-01 17:52:20 -04:00
Marc Zinnschlag
f8e54b401b
fixed linkage problem
2012-08-01 09:09:00 +02:00
Nikolay Kasyanov
32d2326b4d
Update components/files/ogreplugin.hpp
...
removed #error directive
2012-07-31 18:15:09 +04:00
Nikolay Kasyanov
03cccee0e4
bug #348 : workaround for boost older than 1.44
2012-07-31 10:51:34 +04:00
Nikolay Kasyanov
defab0e4b5
Merge remote-tracking branch 'upstream/master' into osx_fix
...
Conflicts:
CMakeLists.txt
2012-07-31 01:06:18 +04:00
Nikolay Kasyanov
b05dfeae70
bug #348 : cleanup
...
moved files to appropriate component, moved function to namespace,
added docs
2012-07-31 01:01:00 +04:00
Nikolay Kasyanov
a84d8e83cd
add const specifier to first argument, also made it reference
2012-07-28 02:39:49 +04:00
Nikolay Kasyanov
b0b2064232
always add debug suffix in plugin loader
...
also removed cout spam
2012-07-28 02:31:30 +04:00
Nikolay Kasyanov
fbe9a94568
bug #348 : fixed OS X deployment
...
just enable CMake option "OPENMW_OSX_DEPLOYMENT" and it will search
plugins inside application bundle instead of Ogre prefix
2012-07-28 01:55:37 +04:00
scrawl
281e15f58e
consider all material properties for nif material sharing, instead of just the texture
2012-07-26 23:40:55 +02:00
Chris Robinson
4f46c8a8db
Use a functor for the mismatch compare function
2012-07-24 14:59:25 -07:00
Chris Robinson
36be1536d9
Return text keys from NIFs when creating entities
2012-07-23 17:20:47 -07:00
scrawl
1fef086088
Revert "Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup"
...
This reverts commit 546b640022fcaa8aae06
2012-07-23 15:36:12 +02:00
scrawl
f8d6a36196
Merge branch 'master' into nif-cleanup
...
Conflicts:
apps/openmw/mwrender/sky.cpp
apps/openmw/mwrender/sky.hpp
components/nifogre/ogre_nif_loader.cpp
components/nifogre/ogre_nif_loader.hpp
2012-07-23 15:35:31 +02:00
Marc Zinnschlag
2c5d3d8df9
Merge remote branch 'scrawl/shadersystem' into shadersystem
...
Attention: We have submodules again. Don't forget to update!
Conflicts:
components/files/configurationmanager.cpp
2012-07-23 14:12:21 +02:00
scrawl
1dbfd60305
Merge branch 'nif-cleanup' of https://github.com/ChrisKCat/openmw into nif-cleanup
2012-07-23 13:48:12 +02:00
Lukasz Gromanowski
1dde806add
Fixes #313 : openmw without a ~/.config/openmw folder segfault.
...
Added creation of $HOME/.config/openmw directory.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-07-22 14:52:55 +03:00
Chris Robinson
4035d7370e
Fix name/filter comparison
2012-07-21 22:04:05 -07:00
Chris Robinson
d8cb685543
Interpolate keyframes when creating them
...
Probably not fully correct, but better than nothing.
2012-07-21 18:03:01 -07:00
Chris Robinson
c5b9098517
Remove an unused field from EntityList
2012-07-21 17:09:16 -07:00
scrawl
546b640022
Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup
2012-07-21 23:50:56 +02:00
Chris Robinson
4bc93ecd1a
Use the skeleton name for the main animation
2012-07-20 11:09:05 -07:00
scrawl
014396e80c
remove the plugins.cfg files, do not enforce CG plugin
2012-07-20 16:44:03 +02:00
Chris Robinson
4210880c06
Load the animation tracks into Ogre
2012-07-19 21:46:16 -07:00
Chris Robinson
0986cd5962
Get the animation controller target names
2012-07-19 20:48:12 -07:00
Chris Robinson
c2acf47d88
Store the list of keyframe controllers when building the bones
2012-07-19 20:30:10 -07:00
Chris Robinson
f6c837468f
Load the proper NIF skeleton
2012-07-19 11:44:08 -07:00
Chris Robinson
e760219953
Use a unique loader for each skeleton resource
2012-07-19 11:36:36 -07:00
Chris Robinson
c9b1f72d81
Use a case-insensitive compare for the part filter
2012-07-18 22:31:07 -07:00
Chris Robinson
bd74ab027a
Mirror left-sided parts
2012-07-18 21:21:49 -07:00
Chris Robinson
4af1bce659
Restore and fix some missing parts
2012-07-18 20:14:23 -07:00
Chris Robinson
d9b64b77ec
Attach skinned parts to the scene node instead of the named bone
2012-07-18 18:38:55 -07:00
Chris Robinson
5154188110
Allow specifying an alternate skeleton for mesh skinning
2012-07-18 18:29:25 -07:00
Chris Robinson
626dcd54dc
Store the skeleton name with the mesh resource loader instead of a flag
2012-07-18 17:26:51 -07:00
Chris Robinson
04b244cf9e
Use the mesh's skeleton to transform shapes into "bind pose" instead of the NIF nodes
2012-07-18 17:18:21 -07:00
Chris Robinson
2890904fb5
Use lowercase names for the mesh and skeleton resources
...
To reduce the risk of duplicates due to different capitalizations.
2012-07-18 15:27:33 -07:00
Chris Robinson
e8ff304562
Fix the initial normal vector for vertex fixups
2012-07-18 12:53:45 -07:00
Chris Robinson
3b29d280b9
Filter out skinned shapes that don't match the bone name
2012-07-18 12:47:16 -07:00
Chris Robinson
db948969c9
Attach NPC parts to the proper bone
2012-07-18 11:14:13 -07:00
Chris Robinson
a32740cf5e
Remove an unused parameter
2012-07-17 22:41:26 -07:00
Chris Robinson
b04c3cbcac
Store the entities' root node in the EntityList
2012-07-17 21:42:47 -07:00
Chris Robinson
92546ca18d
Move the last bits of code to createEntities
2012-07-17 20:23:09 -07:00
Chris Robinson
1c544682d5
Stub handling for NiTextKeyExtraData to suppress some spam
2012-07-17 16:45:01 -07:00
Chris Robinson
496343b714
Use the proper member for the NIF type string
2012-07-17 16:36:43 -07:00
Chris Robinson
3efd2030e2
Create entities when loading NIFs for creatures
2012-07-17 14:11:07 -07:00
Chris Robinson
3dedac5cb1
Create mesh entities for objects when loading the NIF
2012-07-17 13:40:03 -07:00
Chris Robinson
6047dc6a0c
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
apps/openmw/mwrender/animation.cpp
apps/openmw/mwrender/animation.hpp
apps/openmw/mwrender/creatureanimation.cpp
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/npcanimation.hpp
components/nifogre/ogre_nif_loader.hpp
2012-07-17 10:57:15 -07:00
scrawl
4434fb640e
Merge branch 'master' into shadersystem
2012-07-17 19:12:02 +02:00
Chris Robinson
93f0043afc
Set the mesh's attach point as the NiTriShape's node
2012-07-17 10:04:21 -07:00
Marc Zinnschlag
2c70a93553
Merge branch 'master' into potions
...
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
2012-07-17 10:32:18 +02:00
Marc Zinnschlag
4bfed952bc
Merge remote branch 'guidoj/master'
2012-07-17 10:17:06 +02:00
guidoj
a021165d9f
Changed standard C lib includes to C++ format
2012-07-17 09:44:24 +02:00
guidoj
0549e949ba
Mostly removal of unnecessary #include's and a little clean up
2012-07-17 09:27:12 +02:00
Chris Robinson
65c20f128f
Build bones for non-NiNode nodes (NiTriShapes, etc)
2012-07-16 21:18:33 -07:00
Chris Robinson
ada88596dc
Fix an abort at shutdown
...
Ogre uses a special method to delete the stream object, so it needs to be
allocated properly.
2012-07-16 15:30:09 -07:00
Chris Robinson
fefbf86531
Use Ogre's matrix ops to transform normals
2012-07-16 14:30:23 -07:00
Chris Robinson
bf26f029f9
Fix some skinning-related transformations
2012-07-16 13:47:19 -07:00
Chris Robinson
df76c324a4
Handle the MRK text string marker
2012-07-16 13:34:56 -07:00
Chris Robinson
63e40d6e92
Fix world transform calculation
2012-07-16 13:16:11 -07:00
Chris Robinson
12f1785882
Use default bone names for duplicate names
2012-07-16 11:43:16 -07:00
Chris Robinson
75ce10c580
Don't load data for hidden meshes
2012-07-16 11:31:45 -07:00
Chris Robinson
ad75b47472
Build and set up a skeleton for meshes
2012-07-15 19:07:31 -07:00
Chris Robinson
b1f7fd9f7b
Pre-transform the mesh vertices when there's no skinning or skeleton
2012-07-15 17:00:27 -07:00
Chris Robinson
61f32eca77
Add methods to get a node's local and full transform as a 4x4 matrix
2012-07-15 15:23:49 -07:00
Chris Robinson
441a5c2da2
Load NiTriShapes into Ogre meshes
2012-07-15 14:12:12 -07:00
Chris Robinson
3029c221ef
Create materials when creating meshes
2012-07-15 12:59:39 -07:00
scrawl
509e9d7034
Merge branch 'master' into shadersystem
2012-07-15 21:58:45 +02:00
scrawl
fb1f8082d2
fix link error with recent glibc versions
2012-07-15 21:27:57 +02:00
Chris Robinson
b4c8375f3c
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
components/bsa/bsa_archive.cpp
2012-07-15 12:04:43 -07:00
Chris Robinson
9028cfe83c
Look for the NiTriShape when the mesh resource wants to load
...
It's still not loaded yet.
2012-07-15 12:02:47 -07:00
Chris Robinson
69ed73399a
Avoid exposing the NIF mesh resource loading class
2012-07-15 11:40:48 -07:00
Chris Robinson
300730a834
Create the skeleton resource from NIFs
...
Note they are not loaded yet.
2012-07-15 11:13:48 -07:00
Marc Zinnschlag
871b1d1c9b
silenced a warning
2012-07-15 19:20:59 +02:00
Chris Robinson
bc0a6bffcf
Remove outdated comment
2012-07-15 09:03:35 -07:00
Chris Robinson
bd68f7bd33
Remove final direct uses of Mangle::Stream
2012-07-15 08:51:51 -07:00
Chris Robinson
7734771245
Use Ogre to load ESM data instead of Mangle
2012-07-15 08:31:03 -07:00
Chris Robinson
a8ebb39883
Avoid Mangle for BSA accesses
...
The way it was set up was not very efficient, and we're using Ogre for resource
management anyway, so it's best to just use that.
2012-07-15 07:50:24 -07:00
Chris Robinson
6a447c88fb
Create meshes from the NiTriShapes in the NIF.
...
This doesn't actually load them yet. It's also very slow for certain NIFs.
2012-07-15 06:45:21 -07:00
Chris Robinson
9caa264074
Merge remote branch 'zini/master' into nif-cleanup
2012-07-14 17:27:36 -07:00
scrawl
5e8bf28212
Merge branch 'master' into shadersystem
2012-07-14 18:46:11 +02:00
scrawl
5345d4eeef
fix a warning
2012-07-14 18:45:03 +02:00
Chris Robinson
5a381006e5
Fix parsing of some key lists
...
It seems some still want you to read the interpolation type even when there's
no keys.
2012-07-14 09:20:09 -07:00
scrawl
d41050fb79
merge
2012-07-14 11:21:40 +02:00
scrawl
7d5b94709d
Merge branch 'master' into shadersystem
...
Conflicts:
components/nifogre/ogre_nif_loader.cpp
2012-07-14 11:16:35 +02:00
Chris Robinson
939d0d2fc5
Return a list of meshes and the skeleton from NIFLoader::load
2012-07-13 20:01:15 -07:00
Chris Robinson
fdfe40a55a
Use a different loader object for each NIF mesh
2012-07-13 13:41:08 -07:00
Chris Robinson
9436ca4b0c
Use vectors for ShapeData properties
2012-07-13 09:32:58 -07:00
Marc Zinnschlag
182017b8e9
Issue #314 : Moved ingredients and potions to a different type of record list
2012-07-13 13:08:48 +02:00
Chris Robinson
ecdd4ee23f
Load NiMorphData and NiKeyframeData using proper key lists
2012-07-12 20:56:47 -07:00
Chris Robinson
386ac56bda
Remove the NIF loader and code to manually transform the vertices
...
This currently breaks just about everything. They should come back as it's all
reimplemented, though.
2012-07-12 20:12:18 -07:00
Chris Robinson
9995dff943
Use a key list for NiColorData
2012-07-12 14:33:50 -07:00
Chris Robinson
3f11b6b1ae
Cleanup a couple unneeded misc component references
2012-07-12 12:01:11 -07:00
Chris Robinson
86b37c6c11
Move the velocity out of the transformation object
2012-07-12 11:21:52 -07:00
Chris Robinson
b292665de9
Use key lists to store some NIF data types
2012-07-12 08:00:26 -07:00
Chris Robinson
b7b9f11333
Add generic classes to help deal with NIF keys
2012-07-12 06:47:38 -07:00
Chris Robinson
645b507ba0
Return a reference to the RecordPtr from operator[] for consistency
...
RecordListT is supposed to be a list of RecordPtrT objects.
2012-07-12 05:37:56 -07:00
Chris Robinson
7e8c146de6
Constify some RecordListT methods
2012-07-11 06:39:03 -07:00
Chris Robinson
8e324c90dc
Constify some RecordPtrT methods
2012-07-11 06:37:17 -07:00
Chris Robinson
395a7600fd
Initialize identify transform when declaring the identity object
2012-07-10 23:13:03 -07:00
Chris Robinson
348b5fa207
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
components/nifbullet/bullet_nif_loader.cpp
2012-07-10 06:16:16 -07:00
Chris Robinson
dddf1b4ee5
Rename getMatrix->getMatrix3 and getVector->getVector3
2012-07-10 04:45:14 -07:00
Marc Zinnschlag
f11bf49a90
cmake fix; silenced some warnings
2012-07-10 13:23:41 +02:00
Chris Robinson
d30f64650a
Make the read_* methods private and remove the generic load() methods
2012-07-10 04:21:47 -07:00
Chris Robinson
930459365b
Rename getShort->getUShort and getByte->getChar
2012-07-10 03:52:01 -07:00
Chris Robinson
95b804a104
Remove NIFFile::getArrayLen
2012-07-10 03:02:37 -07:00
Chris Robinson
ca37706b34
Use Ogre types for Matrix and Vector objects
2012-07-10 02:38:35 -07:00
Chris Robinson
10072f74b4
Remove NIFFile::getType
2012-07-10 00:27:13 -07:00
Chris Robinson
98ae7168b1
Fix double-incrementing a pointer
2012-07-10 00:24:18 -07:00
Chris Robinson
b3aa453f9a
Use Ogre data streams for loading NIFs
2012-07-09 22:02:12 -07:00
Chris Robinson
0143cacd2b
Avoid returning pointers from NIFFile
2012-07-09 21:35:36 -07:00
Chris Robinson
d3a31a24ce
Use proper strings and vectors instead of slice arrays for NIF files
...
Slice arrays use pre-allocated pointers whose memory is managed externally. This is
unnecessary and ultimately detrimental since it prevents any kind of data fixup
(e.g. little endian to big endian, p[adding handling), and it also makes it difficult
to use Ogre data streams.
2012-07-09 21:08:23 -07:00
scrawl
b803d0e949
converted shadow caster shader
2012-07-09 19:46:36 +02:00
scrawl
81d30ff63a
temp commit
2012-07-09 19:20:41 +02:00
gugus
03f7740474
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling
...
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwworld/worldimp.hpp
2012-07-09 10:39:57 +02:00
Jason Hooks
b5edad790d
merge
2012-07-07 15:27:04 -04:00
scrawl
e517e75d09
update
2012-07-07 01:25:14 +02:00
scrawl
a095572205
fixed some textures, started with sky
2012-07-06 10:31:48 +02:00
scrawl
33c48b9481
update
2012-07-06 04:28:08 +02:00
scrawl
8e683c2e05
vertex colors
2012-07-05 01:38:33 +02:00
scrawl
9bd888d9a1
transparency
2012-07-05 00:39:25 +02:00
scrawl
19ecc7f890
fix performance
2012-07-04 17:28:22 +02:00
Chris Robinson
d8d00123ea
Watch for empty children node refs when setting parents
2012-07-03 18:37:04 -07:00
Chris Robinson
832247bff2
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
components/nif/data.hpp
2012-07-03 15:29:18 -07:00
scrawl
4ea6530772
hello world.
2012-07-04 00:26:57 +02:00
Marc Zinnschlag
c85aaafac2
more include cleanup (most removing Ogre.h)
2012-07-03 15:32:38 +02:00
Chris Robinson
291599c609
Store the parents of NIF's nodes
2012-07-02 22:49:44 -07:00
Chris Robinson
046e9686f9
Cleanup RecordPtrT
...
This moves the index resolution into a separate post method instead of always
checking when access. As a result, it reduces the size of it down to the size
of a pointer, as opposed to 2 pointers + 1 int. The appropriate methods are
added to the various node types to make sure they're resolved.
2012-07-02 21:41:21 -07:00
Marc Zinnschlag
76174098c7
Issue #107 : CellStore moved from ESMS to MWWorld
2012-06-29 16:48:50 +02:00
scrawl
797c2c538d
fix some settings bugs
2012-06-23 12:25:28 +02:00
Jason Hooks
fbde798968
merge
2012-06-21 19:02:20 -04:00
Marc Zinnschlag
50d81e99fb
possible fix for script execution bug
2012-06-19 14:55:22 +02:00
Marc Zinnschlag
fe85de5ea7
Issue #181 : assignment to member variables
2012-06-16 14:29:55 +02:00
Marc Zinnschlag
10b27e582b
Issue #181 : various fixed to member variable access
2012-06-16 13:51:13 +02:00
Marc Zinnschlag
8b19de17b6
Iisue #181 : enable member variable access from expressions in console
2012-06-16 13:21:01 +02:00
Marc Zinnschlag
6c5b21fa42
Issue #181 : Member variable access in expressions; error reporting fix for the previous commit
2012-06-16 13:06:23 +02:00
Marc Zinnschlag
d1441d79e7
Issue #181 : added code generation for member variable access
2012-06-16 10:49:34 +02:00
Marc Zinnschlag
050559d2e2
Issue #181 : added member variable access token
2012-06-16 10:31:49 +02:00
Jason Hooks
c4c8288af8
Seven digit scales
2012-06-13 19:34:13 -04:00
Jason Hooks
5028f9926d
Bullet scale solution
2012-06-12 18:09:58 -04:00
Jason Hooks
20288de685
Post merge
2012-06-11 15:39:57 -04:00
Alexander "Ace" Olofsson
76c4aa41bb
More land and cell work
2012-06-11 20:02:03 +02:00
Alexander "Ace" Olofsson
f675d8d039
Merge branch 'master'
2012-06-11 19:09:10 +02:00
Jason Hooks
595b0729da
Few things changed
2012-06-10 21:08:58 -04:00
Mark Siewert
bef4bef5d2
- Add support for loading multiple esm/esp files. Selection in omwlauncher is recognized and applied.
...
- Quick hack for multiple terrain palettes. Prevents crashes and/or wrong textures in masters/plugins beyond the first.
- Support deleting parent entries from the list.
2012-06-10 11:14:46 +02:00
Jason Hooks
fb0a52809d
Changing transformation processing
2012-06-09 15:19:15 -04:00
Marc Zinnschlag
ce43ff8d05
Issue #181 : added member variable access opcodes
2012-06-07 13:56:49 +02:00
Marc Zinnschlag
eb0be10e80
Merge branch 'script' into xdoty
2012-06-07 13:00:01 +02:00
Marc Zinnschlag
6ec2a2091c
Issue #305 : Allow the use of = as a synonym for ==
2012-06-07 12:16:03 +02:00
Marc Zinnschlag
72fca40090
Issue #181 : member variable access in interpreter context
2012-06-07 11:59:45 +02:00
Jason Hooks
4ff36a9018
Bullet loader trafos changed to match NIFLoader
2012-06-06 16:29:44 -04:00
scrawl
c85c794c86
fixed some cppcheck issues
2012-06-06 20:29:30 +02:00
scrawl
10cfe0f5bc
Issue #295 : Class creation dialogs tooltips; plus tons of other improvements
2012-05-27 06:39:10 +02:00
scrawl
689cf7ce05
ConfirmationDialog
2012-05-23 05:28:25 +02:00
scrawl
343bbaf0fd
integrated video settings in the settings file, the launcher is now useless
2012-05-22 03:36:03 +02:00
Marc Zinnschlag
7938566004
Merge remote branch 'scrawl/graphics'
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-05-21 11:24:36 +02:00
scrawl
8f2c8bbea4
Merge branch 'master' into graphics
2012-05-21 09:50:46 +02:00
scrawl
8ce4727424
skill tooltips
2012-05-21 01:58:11 +02:00
scrawl
a284bfb4d0
Merge branch 'master' into inventoryGUI
2012-05-19 15:07:37 +02:00
gugus
6f87493df6
fix collision bug i think. It disable collision for quiet a lot of objects (maybe a little to much)
2012-05-17 15:46:38 +02:00
scrawl
630241c8e2
load the AIDT (AI data) for creatures in the ESM loader, which also contains the Services enum.
2012-05-17 13:12:38 +02:00
scrawl
471f6467ec
Merge branch 'master' into graphics
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2012-05-13 16:18:22 +02:00
scrawl
ddb0a91994
addition to last commit
2012-05-13 12:19:49 +02:00
Lukasz Gromanowski
d9e39bd90e
Changed order of plugins.cfg file paths.
...
Changed order of plugins.cfg file paths - before when plugins.cfg file
was found in global path then it was used as default one. Now the behavoiur
is opposite if plugins.cfg file exists in local path then it is used as
default one.
2012-05-11 21:32:38 +02:00
Alexander "Ace" Olofsson
b1af18e98d
Merged next
2012-04-29 09:28:07 +02:00
Alexander "Ace" Olofsson
0c9dfcc017
Some changes
2012-04-29 09:26:03 +02:00
scrawl
4ce83badc9
flickering lights
2012-04-28 20:42:53 +02:00
scrawl
8231cab599
correct case for dialogue topics
2012-04-17 23:47:50 +02:00
Marc Zinnschlag
afa859a6a6
Merge remote branch 'jhooks/clothingarmor'
...
Conflicts:
apps/openmw/mwrender/npcanimation.cpp
2012-04-15 22:06:05 +02:00
Alexander "Ace" Olofsson
a74aeace73
Can now save strings with proper encoding, byte-perfect clones up until land records
2012-04-14 00:14:04 +02:00
scrawl
95f87a8abf
more or less complete list for morrowind.bsa (thanks to artorius)
2012-04-12 16:33:36 +02:00
Alexander "Ace" Olofsson
f16a9ce5ed
Working on making output identical to input.
2012-04-12 14:00:58 +02:00
Jason Hooks
7fce57f335
Getting started with a new branch
2012-04-11 20:16:22 -04:00
scrawl
a727bcd4a4
override nif transparency settings (part 1)
2012-04-11 20:13:15 +02:00
scrawl
2a4fcf42a3
basic shadows
2012-04-11 18:53:13 +02:00
Jason Hooks
74deb5588d
Post merge
2012-04-08 20:41:49 -04:00
Alexander "Ace" Olofsson
290d09de64
Switching creature and npc to using the same id storage as the rest of the records
2012-04-08 18:32:40 +02:00
Alexander "Ace" Olofsson
f0c32ba7d3
Fixed saving cell ref data with wrong name
2012-04-08 18:01:54 +02:00
Alexander "Ace" Olofsson
fc8c75ab89
Esmtool can now clone an esm file in such a way that it can read it back again afterwards.
2012-04-08 17:04:52 +02:00
Alexander "Ace" Olofsson
0fd48c4229
Extended the esmtool a bit and prepared all records for saving.
2012-04-08 11:51:52 +02:00
scrawl
cdea19206c
Revert "more accurate fog, TODO: apply this to the terrain"
...
This reverts commit 96c37d3e7c
2012-04-07 22:47:39 +02:00
scrawl
96911ada95
restored render queue of transparent objects, they are now part of the mrt textures
...
this fixes some issues with transparent objects not visible in the refraction
2012-04-07 22:37:15 +02:00
scrawl
044d649edd
Merge branch 'master' into water
2012-04-07 17:16:35 +02:00
scrawl
96c37d3e7c
more accurate fog, TODO: apply this to the terrain
2012-04-07 16:55:32 +02:00
Lukasz Gromanowski
e21e8c221d
Added explicit cast to char in ToUTF8::windows_XXXX tables.
...
Added explicit cast to char, without that gcc 4.7 (with default settings)
is showing a lot of:
narrowing conversion of ‘...’ from ‘int’ to ‘char’ inside { } is ill-formed in C++11 [-Wnarrowing]
warnings.
2012-04-07 13:08:25 +02:00
Alexander "Ace" Olofsson
47013799ea
Fleshing out the esm writer a bit
2012-04-06 22:25:33 +02:00
Alexander "Ace" Olofsson
b81ac363fc
Write names with a small sanity check
2012-04-06 21:28:58 +02:00
Alexander "Ace" Olofsson
7c1e417f9a
Niceify-ing it (Yes, that's a word)
2012-04-06 21:14:52 +02:00
Alexander "Ace" Olofsson
ba602929ef
Adding basic save functions to all record types.
2012-04-06 21:04:30 +02:00
scrawl
622fb568cf
removed MRT setting and figure it out automatically
2012-04-05 19:27:54 +02:00
scrawl
88c50c5171
Merge branch 'master' into water
2012-04-05 15:38:46 +02:00
Marc Zinnschlag
01500e979a
another fix for optional arguments
2012-04-05 15:00:49 +02:00
Marc Zinnschlag
6fd3d5c776
Merge remote branch 'lgro/master'
2012-04-04 23:19:30 +02:00
Lukasz Gromanowski
ea8e5cb6f8
Issue #225 : Land struct is not copyable.
...
Disabled copy constructor and assignment operator in Land structure.
2012-04-04 21:39:21 +02:00
Lukasz Gromanowski
cd2789b15a
Revert "Issue #225 : Correction to commit ae98904."
...
This reverts commit 0e5c90d3e7
2012-04-04 21:05:19 +02:00
scrawl
006970fd79
add MRT code to shaders
2012-04-04 19:53:41 +02:00
Jason Hooks
57299571d5
Preparing for clothes/armor
2012-04-02 22:08:46 -04:00
Lukasz Gromanowski
0e5c90d3e7
Issue #225 : Correction to commit ae98904.
...
Changed pointer to LandData struct to simple member variable.
2012-04-02 23:50:53 +02:00
scrawl
2b4b941192
Merge branch 'master' into gamesettings
2012-04-02 15:21:10 +02:00
scrawl
5accca385c
fix crash on exit when no user settings exist
2012-04-02 13:47:25 +02:00
Marc Zinnschlag
6022d3ab13
Merge remote branch 'corristo/pgrd-rendering'
...
reduced cout spam.
Conflicts:
apps/openmw/mwrender/debugging.cpp
apps/openmw/mwrender/renderingmanager.cpp
components/bsa/bsa_archive.cpp
libs/openengine/bullet/physic.hpp
2012-04-02 12:04:47 +02:00
Lukasz Gromanowski
ae989040e5
Issue #225 : Fix for memleak when loading terrain.
2012-04-01 21:29:49 +02:00
scrawl
c2a82c3d89
Merge branch 'master' into gamesettings
2012-04-01 20:06:18 +02:00
scrawl
7b3adb27a3
backend changes, terrain num lights setting
2012-04-01 18:48:37 +02:00
Alexander "Ace" Olofsson
54ce95cfaf
Make sure it doesn't find the wrong file
2012-04-01 17:25:03 +02:00
scrawl
6091a0504d
first settings test (config file has to be created manually)
2012-04-01 16:59:35 +02:00
scrawl
308df7caa8
add method for keeping track of settings that changed
2012-04-01 16:26:42 +02:00
scrawl
55c984c179
Merge branch 'master' into gamesettings
2012-03-31 21:37:15 +02:00
Marc Zinnschlag
08f8701b33
workaround for tga problem
2012-03-31 17:52:58 +02:00
scrawl
82429d6931
finished interface
2012-03-31 13:35:40 +02:00
Nikolay Kasyanov
523648dbb1
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/debugging.cpp
2012-03-31 14:56:18 +04:00
Nikolay Kasyanov
057c2f2e2a
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-03-31 13:42:13 +04:00
Marc Zinnschlag
509650d5f3
Merge remote branch 'ace/fs-fix'
2012-03-31 11:37:18 +02:00
Alexander "Ace" Olofsson
3b0dc408ae
Debug-b-gone
2012-03-31 11:29:24 +02:00
Alexander "Ace" Olofsson
06a34b9e0d
Strange problems call for strange solutions.
2012-03-31 10:35:08 +02:00
Alexander "Ace" Olofsson
8e07b7e050
Better (less) debug output
2012-03-31 00:55:47 +02:00
Alexander "Ace" Olofsson
8d9100c77b
Debug output
2012-03-30 23:29:58 +02:00
Alexander "Ace" Olofsson
fc4e4dc336
Case sensitiviy?
2012-03-30 19:05:58 +02:00
scrawl
ff85006e71
added untested interface
2012-03-30 18:38:33 +02:00
Alexander "Ace" Olofsson
8ac9dd8e70
Always use the same type of slashes
2012-03-30 16:59:19 +02:00
Marc Zinnschlag
2d2af4b28a
Merge remote branch 'scrawl/terrain18' into terrain
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
components/esm_store/cell_store.hpp
2012-03-30 15:38:14 +02:00
Alexander "Ace" Olofsson
d2f8539a42
Forgot to remove some old code that didn't do anything
2012-03-30 14:50:39 +02:00
Alexander "Ace" Olofsson
4a9a416d46
Can find files even if no .bsa file exists now
2012-03-30 14:45:32 +02:00
scrawl
d5c49fa036
getWaterLevel use CellStore ; attempted fix for morrowind without tribunal
2012-03-30 10:12:28 +02:00
Nikolay Kasyanov
b21a6291f7
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwscript/miscextensions.cpp
apps/openmw/mwworld/world.hpp
2012-03-30 02:50:30 +04:00
Alexander "Ace" Olofsson
60b95e7992
Sorting the file lists properly
2012-03-29 22:38:14 +02:00
Alexander "Ace" Olofsson
6acd900577
Better name
2012-03-29 21:36:00 +02:00
Alexander "Ace" Olofsson
c3944d3e1a
Use a normal binary search
2012-03-29 21:27:37 +02:00
Alexander "Ace" Olofsson
ce38876a74
Oops, that could've crashed horribly
2012-03-29 17:31:55 +02:00
scrawl
5a19d4ec45
implement water script functions and save water height in CellStore
2012-03-29 15:50:15 +02:00
Nikolay Kasyanov
c3357c4396
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwscript/docs/vmformat.txt
2012-03-29 13:27:13 +04:00
Alexander "Ace" Olofsson
71cb85dbc4
Performance enhancment and minor copy-paste fix.
2012-03-29 04:54:33 +02:00
scrawl
42c5d515e6
fixed interior water level
2012-03-29 04:50:40 +02:00
Alexander "Ace" Olofsson
0d163d76ab
Replaced some messy code with some differently messy code, this one at least seems to work
2012-03-29 03:59:24 +02:00
scrawl
8bbb02a1bd
ogre 1.8 fixes
2012-03-28 21:30:59 +02:00
scrawl
6bea08157e
Merge branch 'master' into terrain18
2012-03-28 21:30:15 +02:00
Jacob Essex
ec21ff21cc
Removed memory leak, allocated more on the stack
2012-03-27 13:58:12 +01:00
Jacob Essex
b76b62e5e4
Fixed a crash when there were cells with no data, refactored to remove non mutable data from CellStore
2012-03-27 09:20:22 +01:00
Lukasz Gromanowski
f8afc22f04
Issue #225 : Corrected wrong delete operator introduced by one of previous commit.
2012-03-26 23:16:59 +02:00
Lukasz Gromanowski
2b9845a5b6
Issue #225 : Free memory allocated for sending into HardwareVertexBuffer.
...
Free memory allocated for sending into HardwareVertexBuffer in NIFLoader class.
2012-03-26 19:09:55 +02:00
Lukasz Gromanowski
d3b88b9e34
Issue #225 : Added cleanup of allocated memory in BulletNifLoader and BulletShapeLoader.
2012-03-26 19:09:55 +02:00
Marc Zinnschlag
4a2ade2372
Merge remote branch 'kromgart/master' into next
2012-03-24 16:57:06 +01:00
scrawl
99b2b6b648
ogre 1.8 fixes
2012-03-24 14:46:48 +01:00
scrawl
f2a7acb102
Merge branch 'next' into terrain
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.cpp
2012-03-24 13:19:17 +01:00
Roman Melnik
e6c55c144c
Fix tabulation/formatting
2012-03-23 22:15:45 +02:00
Roman Melnik
6d33ad248d
Fix memory leak in getIdentity method
...
Replace static pointer and new() operator with normal static variable
2012-03-23 22:08:02 +02:00
scrawl
b8f962a68d
Merge branch 'next' into shaders
2012-03-23 10:26:20 +01:00
scrawl
9076401892
Merge branch 'next' into terrain
...
Conflicts:
CMakeLists.txt
apps/openmw/CMakeLists.txt
2012-03-22 22:31:49 +01:00
Roman Melnik
ebc49de851
Fix Bug #1 : "Meshes rendered with wrong orientation"
...
Discard the tranformation of the root NiNode when loading nif files
(set the 'identity' transformation instead).
After applying the fix test the following types of interiors:
- Dwemer ruins (the bug was common here before the fix)
- Ancestral tombs (the bug was common here before the fix)
- Daedric shrines
- Caves/grottos
- Dunmer strongholds
- Telvanni, imperial, redoran houses/towers/castles
Also checked exteriors (although it is hard to do without terrain
rendering)
2012-03-22 00:39:19 +02:00
Marc Zinnschlag
d9677cb33e
fixed problem with parsing optional string arguments
2012-03-18 14:27:49 +01:00
Marc Zinnschlag
187b8e58d6
fixed handling of optional instruction/function arguments; removed choice workaround
2012-03-17 19:32:44 +01:00
scrawl
3e4cf64a77
Merge branch 'master' into shaders
2012-03-16 20:46:18 +01:00
Michael Papageorgiou
b2c6d52db1
Another file search fix
2012-03-16 09:00:18 +02:00
Alexander "Ace" Olofsson
e8eea03b4c
Fixed a few more non-virtual destructor warnings
2012-03-15 17:40:42 +01:00
Nikolay Kasyanov
65fc141b62
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-03-15 20:38:21 +04:00
Marc Zinnschlag
1c0bf162f2
boost compatibility fix
2012-03-15 16:56:36 +01:00
Marc Zinnschlag
a7211d2a90
Merge remote branch 'werdanith/searchfix'
2012-03-15 16:54:29 +01:00
Michael Papageorgiou
588ac44bc7
Improved matching for the FileListLocator
2012-03-15 17:32:10 +02:00
Marc Zinnschlag
5b378e820d
warning level adjustments and some related fixes
2012-03-15 16:01:41 +01:00
Marc Zinnschlag
3c3fb8d706
Merge remote branch 'werdanith/activationsounds2' into equipment
2012-03-15 14:06:48 +01:00
Michael Papageorgiou
f7c7ed0ac7
Fix regression with locating sound files
2012-03-15 13:56:46 +02:00
Marc Zinnschlag
ff866269ec
Merge remote branch 'corristo/pgrd'
...
Removed a warning
Conflicts:
CMakeLists.txt
2012-03-14 16:45:53 +01:00
Nikolay Kasyanov
a7f89b864e
Merge branch 'pgrd' into pgrd-rendering
2012-03-14 12:59:58 +04:00
Nikolay Kasyanov
988c1111e9
Feature #161 (Fix) Load REC_PGRD records
...
fixed edge decoding, thanks Project Aedra!
2012-03-14 12:54:52 +04:00
scrawl
118250171d
Merge branch 'master' of https://github.com/zinnschlag/openmw into shaders
...
Conflicts:
apps/openmw/mwrender/objects.cpp
2012-03-13 17:31:10 +01:00
scrawl
4813a1ce9d
Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next
...
Conflicts:
CMakeLists.txt
2012-03-13 16:00:59 +01:00
Nikolay Kasyanov
f292a5a7ca
Feature #37 (In Progress) Render Path Grid
...
now using mwRoot instead of ogre's root, so no more messing with coordinates.
2012-03-12 02:37:07 +04:00
Nikolay Kasyanov
4659076129
Feature #37 (In Progress) Render Path Grid
...
workaround for strange ESMStore bug
2012-03-10 20:45:55 +04:00
Nikolay Kasyanov
11f957a64d
Feature #37 (In Progress) Render Path Grid
...
cubes for path grid points
strange crash when trying to get path grids from Debugging
2012-03-10 20:03:00 +04:00
Nikolay Kasyanov
de5b692f9f
Feature #161 (Resolved) Load REC_PGRD records
2012-03-10 18:12:45 +04:00
Nikolay Kasyanov
fda5b59eb6
Feature #161 (In Progress) Load REC_PGRD records
...
now using vector instead of C arrays
fixed path grid edge loading
added path grid to cell store
implemented dedicated storage class for path grids
2012-03-09 23:35:20 +04:00
Marc Zinnschlag
69127fa8f1
boost compatibility fix; added a missing include
2012-03-09 17:33:10 +01:00
Marc Zinnschlag
c259b25fcf
Merge remote branch 'werdanith/soundmanagerrefactor'
2012-03-09 17:27:11 +01:00
Michael Papageorgiou
ad6175c78a
SoundManager: Set up the priority for file look up right and take care of a corner case
2012-03-08 23:06:52 +02:00
Nikolay Kasyanov
08db70e137
disabled debug output
2012-03-08 01:00:13 +04:00
Michael Papageorgiou
054a176c86
Added new FileLibrary class to handle music, this fixes a number of issues.
2012-03-07 17:46:51 +02:00
scrawl
8be661c802
Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next
...
Conflicts:
CMakeLists.txt
2012-03-07 13:29:59 +01:00
Marc Zinnschlag
3d1cbcd4e7
Merge remote branch 'jhooks/animperform'
2012-03-07 09:20:29 +01:00
Michael Papageorgiou
54353794e5
SoundManager: Completely rewrote the file management
2012-03-07 02:20:15 +02:00
Nikolay Kasyanov
540e4f77a7
Feature #161 (In Progress) Load REC_PGRD records
...
improved debug output
2012-03-06 15:52:23 +04:00
Jason Hooks
9848b67174
Fixing errors
2012-03-05 17:46:29 -05:00
scrawl
f7b706d24e
use the vertex colours that morrowind supplies for a lot of meshes
2012-03-05 18:50:56 +01:00
scrawl
ff8f95fcca
fix batch lighting, removed the "bumping number of lights" hack
2012-03-04 23:18:40 +01:00
scrawl
332671b43d
lighting fix
2012-03-04 22:26:40 +01:00
scrawl
b2109a1302
make the vertex colours only affect diffuse, this caused some areas to
...
be darker than they should be
2012-03-04 22:01:02 +01:00
Nikolay Kasyanov
e58e00ef2a
Feature #161 (In Progress) Load REC_PGRD records
...
Point coords definitely not floats
2012-03-05 00:04:36 +04:00
scrawl
8910b0d471
use shaders for all NIF materials. this has numerous advantages:
...
- vertex colours are now working as they should (and they have a huge impact on the look)
- the lighting is per pixel and looks a lot better
- by using shaders, we can use more lights at a time (fixed function has max of 8)
2012-03-04 20:59:23 +01:00
Nikolay Kasyanov
40e07bbd2a
Feature #161 (In Progress) Load REC_PGRD records
...
Struct sizes seems correct, but floats is broken
2012-03-03 18:27:38 +04:00
scrawl
04c141ddd5
Merge branch 'terrain' of https://github.com/Yacoby/openmw into terrain_next
...
Conflicts:
apps/openmw/mwrender/terrain.cpp
2012-03-02 13:49:57 +01:00
Marc Zinnschlag
be70d197e5
Merge branch 'next'
...
Conflicts:
.gitignore
cmake/FindOGRE.cmake
2012-03-02 12:11:44 +01:00
Michael Papageorgiou
a1cbc7fb42
Altered getFver to fix a warning
2012-03-01 14:00:45 +02:00
Alexander "Ace" Olofsson
b6915a6090
Forgot that IsWow64Process would return false on a native 64-bit application
2012-03-01 01:03:31 +01:00
Jacob Essex
6924348696
Fixed some texture splatting issues with loading empty terrain cells
2012-02-29 23:33:54 +00:00
Jacob Essex
1d0ae9c8d1
Start of a basic implementation of fake vertex colours
2012-02-29 23:05:22 +00:00
scrawl
f2c3616638
Merge branch 'next' into terrain_next
...
Conflicts:
CMakeLists.txt
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
cmake/FindOGRE.cmake
2012-02-28 21:49:45 +01:00
Lukasz Gromanowski
9a4cd6c2b1
Fixes #200 - Paths with quotes for data-local option.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-02-27 23:56:58 +01:00
Jason Hooks
8d7a5f469b
a few changes
2012-02-26 21:27:54 -05:00
Nikolay Kasyanov
1addef2cc3
added missing include for macospath.cpp
2012-02-25 17:47:57 +04:00
Marc Zinnschlag
728e9cce5a
Merge remote branch 'lgro/config_fixes'
2012-02-24 09:03:48 +01:00
Lukasz Gromanowski
d97854be00
Bug fixes for configuration handling.
...
Corrected retrieving installation path from wine registry on MacOS.
Updated doxygen comments.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-02-23 23:21:17 +01:00
Lukasz Gromanowski
3da6af6e38
Bug fixes for configuration handling.
...
Added erasing double quotes from paths, corrected retriveing
installation path from wine registry. Updated doxygen comments.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-02-23 23:01:42 +01:00
Alexander "Ace" Olofsson
f6a80bfc95
Small define/include fixes for compiling on windows
2012-02-23 20:06:06 +01:00
Marc Zinnschlag
5f72199419
Merge remote branch 'lgro/config_fixes'
2012-02-23 09:28:11 +01:00
Lukasz Gromanowski
e0206edc44
Fixed stupid bug in getGlobalDataPath.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-02-22 20:00:17 +01:00
Pieter van der Kloet
280babc719
Fixed stylesheet and configuration problems with the launcher and code cleanup
2012-02-22 08:34:47 +01:00
Marc Zinnschlag
b2b09320fc
Merge branch 'config'
2012-02-21 13:55:58 +01:00
Marc Zinnschlag
547d6a0639
Merge remote branch 'lgro/config' into config
2012-02-21 11:50:23 +01:00
Marc Zinnschlag
971ae94fbf
Revert "workaround for the configuration problems"
...
This reverts commit 850501e922
2012-02-21 11:50:04 +01:00
Marc Zinnschlag
e02cba58b1
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwclass/light.cpp
2012-02-20 14:34:27 +01:00
Lukasz Gromanowski
0c0b594090
Issue #168 - Configuration cleanup
...
Removed unnecessary path methods - according to forum disscusion:
http://openmw.org/forum/viewtopic.php?f=6&t=448
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-02-20 00:02:00 +01:00
Jason Hooks
38a0d1d1c5
Merging in master
2012-02-19 15:39:12 -05:00
Jason Hooks
e58f2f5363
Eliminating unnecessary data from skeletons and shape saving
2012-02-19 02:01:15 -05:00
Jason Hooks
2217847c57
Fixing a crash
2012-02-18 15:29:40 -05:00
Marc Zinnschlag
850501e922
workaround for the configuration problems
2012-02-16 13:14:16 +01:00
Marc Zinnschlag
ddb8b1e1bc
Merge remote branch 'lgro/config' into config
2012-02-16 09:12:15 +01:00
Lukasz Gromanowski
80008ed09f
Issue #168 - Configuration cleanup
...
Fixed bug with configuration tokens parsing - when something
appear after token it should be appended to replaced path.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-02-15 22:34:51 +01:00
Marc Zinnschlag
27caee664e
Merge remote branch 'lgro/config' into config
...
Conflicts:
components/files/path.hpp
2012-02-13 16:36:57 +01:00
Marc Zinnschlag
1a6a49b9b8
Merge remote branch 'lgro/fix_warnings'
2012-02-13 11:06:41 +01:00
Lukasz Gromanowski
8829d46bda
Clean up compilation warnings.
...
Clan up compilation warnings like "variable ... set but not used" introduced
in some older and recent commits.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-02-12 15:45:08 +01:00
Lukasz Gromanowski
bcc4d7a7c9
Issue #133 Handle resources across multiple data directories
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-02-12 14:21:07 +01:00
Marc Zinnschlag
273eac12a1
Merge remote branch 'jhooks/animation2' into animation2
...
Conflicts:
apps/openmw/mwrender/npcanimation.cpp
components/nifogre/ogre_nif_loader.cpp
2012-02-12 13:41:06 +01:00
Nikolay Kasyanov
cb95c82af2
Merge remote-tracking branch 'upstream/master'
2012-01-29 23:39:36 +04:00
Lukasz Gromanowski
b004e2479c
Issue #133 Handle resources across multiple data directories - WIP
...
Work In Progress - added support for multiple paths in SoundManager.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-01-29 20:27:03 +01:00
Jason Hooks
1da519a914
Some cleanup
2012-01-29 00:42:55 -05:00
Lukasz Gromanowski
86f88bedae
Issue #168 - Configuration cleanup
...
Removed 'data' part from token names, added token cleaning when
invalid or unknown token is passed as commandline parameter.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-01-28 11:59:08 +01:00
Marc Zinnschlag
0d7f39fcb5
Merge branch 'refdata' into next
2012-01-28 11:46:34 +01:00
Lukasz Gromanowski
c5dee2c4fb
Issue #168 - Configuration cleanup
...
Corrected tokens processing. If directory exist then tokens
shall be replaced by correct path, otherwise they are silently
removed from path container.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-01-28 09:49:09 +01:00
Pieter van der Kloet
ea241d85ef
Fixed some issues with the CMake files
2012-01-28 01:36:17 +01:00
Marc Zinnschlag
c081160591
replaced container store in ref data with new custom data implementation
2012-01-27 14:55:58 +01:00
Lukasz Gromanowski
f4b6caac59
Revert "Issue #178 - workaround for compilation problems with ogre 1.8.0."
...
This reverts commit 37e272b3b5
2012-01-26 00:14:03 +01:00
Lukasz Gromanowski
1d96b99532
Issue #168 - Configuration cleanup
...
Added tokens processing, modified getInstallPath for linux
so we could use ~/.wine/dosdevices symlinks.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-01-25 23:55:43 +01:00
Jason Hooks
6de0847b86
Slightly better performance on animation
2012-01-25 01:21:30 -05:00
Nikolay Kasyanov
ec6243dd77
fixed compilation problem with llvm clang: constant type explicitly set to float
2012-01-24 16:01:29 +04:00
Jacob Essex
cd0df082df
Textures are now blended between cells and the texture blending functions are now more abstract
2012-01-23 17:19:54 +00:00
Lukasz Gromanowski
841bdded76
Merge branch 'mwregistry' of https://github.com/swick/openmw into swick-mwregistry
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-01-22 15:52:47 +01:00
Jacob Essex
637302fc87
Added blended textures to the terrain
2012-01-21 17:59:12 +00:00
Jacob Essex
18108c02a7
Merge of corristo's terrain rendering and fixes so that the terrain is correctly positioned and rendered
2012-01-21 16:59:08 +00:00
Lukasz Gromanowski
406897aa64
Issue #168 - Configuration cleanup - WIP
...
Sources update.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-01-21 17:58:49 +01:00
Lukasz Gromanowski
7c24ae9ac7
Issue #168 - Configuration cleanup - WIP
...
This is "work in progress" commit, it shall not be merged alone,
without succeeding commits (it's not fully functional).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-01-21 01:31:20 +01:00
Jason Hooks
bcf3e45ff6
Proper buffer designation
2012-01-18 22:00:03 -05:00
Dmitry Marakasov
463acb2f75
Use linuxpath for FreeBSD as well
2012-01-18 15:16:45 +04:00
Sebastian Wick
62eaaab69d
move include from .hpp to .cpp; line.empty() instead of line.size() > 0; change type of startPos and pos and move to other scope
2012-01-17 23:19:17 +01:00
Sebastian Wick
16c214a17a
find InstalledPath in wine registry; mInstalledPath in Files::Path
2012-01-17 19:18:17 +01:00
Marc Zinnschlag
0c2de2c00c
Merge branch 'animation2'
2012-01-17 15:37:51 +01:00
Marc Zinnschlag
9b910dda94
clean up
2012-01-17 15:10:53 +01:00
Alexander "Ace" Olofsson
b4174b6419
Vector instead of new/delete
2012-01-17 09:02:45 +01:00
Alexander "Ace" Olofsson
8663177ad1
Oops, forgot the delete...
2012-01-16 23:21:13 +01:00
Alexander "Ace" Olofsson
96ed96d4dd
Quick test at getting Morrowinds install path from the registry on windows
2012-01-16 23:09:25 +01:00
Lukasz Gromanowski
37e272b3b5
Issue #178 - workaround for compilation problems with ogre 1.8.0.
2012-01-13 20:41:38 +01:00
Jason Hooks
d1793bc4bd
Animation files in the correct directory
2012-01-12 20:09:55 -05:00
Jason Hooks
0712bba49b
Changing a few things around with handleshapes
2012-01-12 16:03:07 -05:00
Jason Hooks
eab69f18ac
File output switch
2012-01-10 00:34:29 -05:00
Jason Hooks
295eb27c2d
Better Text Indices; Better file output
2012-01-06 18:23:41 -05:00
Jason Hooks
859ac1153e
Basic Text Indices Working
2012-01-06 02:27:10 -05:00
Jason Hooks
0715f9b6ab
Preparing to use text indices
2012-01-06 00:55:02 -05:00
Jason Hooks
595d0b1192
Cleanup; warnings
2012-01-05 21:45:17 -05:00
Jason Hooks
45c57721ff
Turning off hardware skinning2
2012-01-04 20:30:06 -05:00
Jason Hooks
762727308e
Hardware skinning working (YESgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --all)
2012-01-02 23:06:10 -05:00
gugus
5cfac197d4
Merge branch 'journalfix' of https://github.com/zinnschlag/openmw.git into journal
2011-12-29 17:59:21 +01:00
Jason Hooks
baa3f51886
Trying to fix errors
2011-12-28 14:48:28 -05:00
Jason Hooks
cef2f5e927
Trying to get code to conform with older c++
2011-12-27 19:19:45 -05:00
Jason Hooks
d855bb4fc6
physics reenabled
2011-12-27 17:52:17 -05:00
Marc Zinnschlag
022f0fd5bd
link order fix for components
2011-12-26 22:28:53 +01:00
Jason Hooks
6d10c76b06
Unique Identifiers for Creatures and NPC Free Parts
2011-12-17 01:29:08 -05:00
Jason Hooks
d51dfebde1
NPCs fully rendered
2011-12-15 00:33:10 -05:00
Jason Hooks
47112ad7f9
Changing a lot of things
2011-12-13 23:49:03 -05:00
Jason Hooks
0902a3db89
Filled out NpcAnimation and CreatureAnimation classes
2011-12-11 22:40:00 -05:00
gugus
28bd9ce362
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into journal
2011-12-11 11:21:57 +01:00
Jason Hooks
39338f4be1
NPC bounded parts
2011-12-09 15:20:35 -05:00
Jason Hooks
5c48d8fc1e
more stuff
2011-12-09 03:02:09 -05:00
Jason Hooks
835c3f2603
Working towards npc rendering
2011-11-27 02:27:06 -05:00
Jason Hooks
7bd911b401
Problems with handles
2011-11-24 23:13:34 -05:00
Jason Hooks
e8ec9093f8
More NIFLoader code
2011-11-23 18:18:51 -05:00
Jason Hooks
828a3904a5
BSAArchive done and some change to NIFLoader
2011-11-23 02:17:21 -05:00
Jason Hooks
7319f7a8c6
Many bugs fixed related to changing cells
2011-11-19 01:01:19 -05:00
Jason Hooks
c25b49d2b6
refdata change
2011-11-08 22:59:39 -05:00
Jacob Essex
9aac625000
Changes to move the mutable ESM::Position data to RefData
2011-11-08 00:08:00 +00:00
Marc Zinnschlag
cb1373a4c7
rewrote cmake scripts for components
2011-11-06 09:30:15 +01:00
Marc Zinnschlag
325250f347
Merge remote branch 'gus/journal' into physicsfix
...
Conflicts:
components/files/windowspath.cpp
2011-10-29 14:01:19 +02:00
gugus
241cf2555d
Fixe collision shape bug.
2011-10-29 13:35:43 +02:00
Jason Hooks
c52ae6825f
Applying Gus's Windows fix2
2011-10-18 21:04:31 -04:00
Jason Hooks
0992f1e903
Applying Gus's Windows fix
2011-10-18 21:02:42 -04:00
gugus
bf42d20f98
Fixed some compilation errors on windows.
...
Note that it works on my computer, but it *might* not work on older versions
of windows.
2011-10-02 13:05:08 +02:00
Marc Zinnschlag
b448fc7d4c
Issue #31 : Do not try to load dynamical generated cells from ESM/P files
2011-09-27 10:22:55 +02:00
Marc Zinnschlag
8da15440e0
Issue #31 : added function for creating cell records
2011-09-26 11:11:30 +02:00
Marc Zinnschlag
cd7aaab48e
Merge branch 'cells' into next
...
Conflicts:
apps/openmw/engine.cpp
2011-09-24 12:10:53 +02:00
Marc Zinnschlag
02ce672fdc
preload cell's reference list when accessing a reference outside of the actice cells (memory usage and speed optimisation)
2011-09-24 11:45:59 +02:00
Marc Zinnschlag
7799f7abc8
Merge remote branch 'gus/bullet_bug' into next
2011-09-22 19:08:33 +02:00
Marc Zinnschlag
f0dd38b431
Issue #28 : replaced the nested map structure in the CellList
2011-09-22 12:21:24 +02:00
Marc Zinnschlag
e4a2f5547b
Issue #28 : added load-state for cells
2011-09-22 11:48:04 +02:00
Marc Zinnschlag
ce7202a147
Issue #28 : shifting around functionality among CellStore, Cells and CellList
2011-09-10 11:23:30 +02:00
Lukasz Gromanowski
34428f5a7c
Issue #168 : Configuration cleanup, part 2
...
Tabs vs spaces cleanup. Removed unnecessary empty function.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-09-06 17:59:40 +02:00
Marc Zinnschlag
b63a2602c3
fixed a missing include
2011-09-06 10:02:39 +02:00
Lukasz Gromanowski
d43455fd57
Issue #168 : Configuration cleanup, part 2
...
Corrected --data and --data-local parameters handling.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-09-02 22:45:21 +02:00
Lukasz Gromanowski
54cb6deab9
Issue #168 : Configuration cleanup, part 2
2011-09-02 20:01:24 +02:00
Lukasz Gromanowski
48c24d4904
Issue #128 : Configuration cleanup - added missing cstring header.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-08-20 10:11:34 +02:00
Lukasz Gromanowski
ea7eb7a62d
fixes #128 Configuration cleanup.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-08-19 21:06:09 +02:00
gugus
1bf7c4e53d
Improve bullet performances
2011-08-03 11:41:16 +02:00
Marc Zinnschlag
b157273cd9
Merge branch 'next'
...
Conflicts:
apps/openmw/main.cpp
2011-07-31 19:28:12 +02:00
Lukasz Gromanowski
ac9b1715d5
Added new command line option: "encoding"
...
Added new command line option: "encoding" which allow to
change font encoding used in game messages.
Currently there are three evailable encodings:
win1250 - Central and Eastern European (languages
that use Latin script, such as Polish,
Czech, Slovak, Hungarian, Slovene, Bosnian,
Croatian, Serbian (Latin script),
Romanian and Albanian)
win1251 - languages that use the Cyrillic alphabet
such as Russian, Bulgarian, Serbian Cyrillic
and others
win1252 - Western European (Latin) - default
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-07-17 22:16:50 +02:00
Marc Zinnschlag
2b5dc0042b
fix for issue 138 (record loading failed for some NPCs)
2011-07-04 23:36:22 +02:00
Marc Zinnschlag
ba55b51627
removed a leftover debug message
2011-06-26 21:29:22 +02:00
Nikolay Kasyanov
e48d265b5d
Mac fix: added local config dir support, app root dir is dir where bundle located
2011-06-26 20:15:42 +04:00
Marc Zinnschlag
8446619ac4
Merge branch 'components_namespaces' into next
...
Conflicts:
apps/openmw/mwrender/interior.cpp
components/bsa/bsa_archive.cpp
2011-06-19 20:22:29 +02:00
Lukasz Gromanowski
57972eb042
Mantis: #18 - Move components from global namespace into their own namespace.
...
Added namespace around generated win_1252 table.
Added generation of header guard and ToUTF8 namespace in gen_iconv.
Small corrections in Makefile.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-06-19 19:33:30 +02:00
Lukasz Gromanowski
e9ff9a446b
Mantis: #18 - Move components from global namespace into their own namespace.
...
Moving classes from components/nifogre into NifOgre namespace.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-06-19 19:14:14 +02:00
Lukasz Gromanowski
2ddd5dba11
Mantis: #18 - Move components from global namespace into their own namespace.
...
Moving classes from components/nifbullet into NifBullet namespace.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-06-19 18:45:23 +02:00
Lukasz Gromanowski
514b55766f
Mantis: #18 - Move components from global namespace into their own namespace.
...
Updated components/misc tests.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-06-19 18:25:09 +02:00
Lukasz Gromanowski
90985e849e
Mantis: #18 - Move components from global namespace into their own namespace.
...
Moving classes from components/misc into Misc namespace.
Note: Misc namespace introduced conflict with ESM::Misc and MWClass::Misc
classes, so both of them are renamed to ESM::Miscellaneous
and MWClass::Miscellaneous.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-06-19 18:14:03 +02:00
Lukasz Gromanowski
8a84201ba2
Mantis: #18 - Move components from global namespace into their own namespace.
...
Moving classes from components/bsa into Bsa namespace.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-06-19 16:46:34 +02:00
Marc Zinnschlag
bc92b7b1fa
Merge branch 'directories' into next
...
Conflicts:
components/files/multidircollection.hpp
components/nifogre/ogre_nif_loader.hpp
2011-06-15 22:40:24 +02:00
Marc Zinnschlag
0f2df4e2b8
more cleanup
2011-06-15 22:33:31 +02:00
Jason Hooks
2132488408
merge
2011-06-15 13:24:37 -04:00
Jason Hooks
56affd018a
Some cleanup
2011-06-15 13:09:47 -04:00
Marc Zinnschlag
a6e83f5b9b
case-handling fix for references in cells
2011-06-13 13:47:59 +02:00
Jason Hooks
9eefee7168
Say strict
2011-06-11 20:01:21 -04:00
Jason Hooks
93f41e25a4
fs-strict
2011-06-08 17:29:28 -04:00
Jason Hooks
65cc0e8317
trying strict
2011-06-08 17:15:13 -04:00
Jason Hooks
3a9007849d
Windows fix
2011-06-08 00:35:30 -04:00
Jason Hooks
a719a6b468
Getting rid of animation code in nif loader
2011-06-07 18:57:24 -04:00
Marc Zinnschlag
d59856af5c
minor performance improvement
2011-06-08 00:52:25 +02:00
Marc Zinnschlag
4f304cfff2
Merge remote branch 'jhooks/directories' into directories
2011-06-08 00:29:12 +02:00
Jason Hooks
4d31ca2c86
Leading slashes now work, efficiency changes
2011-06-07 17:17:25 -04:00
Marc Zinnschlag
5fb3dc854b
Merge branch 'optimisation'
2011-06-07 10:21:29 +02:00
Marc Zinnschlag
ac4af583b7
Merge remote branch 'jhooks/directories' into directories
2011-06-07 09:22:58 +02:00
Jason Hooks
45453fd7a9
Case insensitive external loader working
2011-06-06 20:11:23 -04:00
Jason Hooks
f2a0fa8af2
Adding files to directory map
2011-06-05 23:46:18 -04:00
Marc Zinnschlag
a95a0f821b
Merge remote branch 'jhooks/directories' into directories
...
Conflicts:
components/files/multidircollection.hpp
2011-06-04 10:27:16 +02:00
Jason Hooks
2aaa0f4578
Backslash working in linux
2011-06-04 01:29:57 -04:00
Jason
b92955763a
Introducing Dir Archive
2011-06-03 20:28:47 -04:00
athile
231be8f381
Add BULLET_ROOT for the prebuilt binaries. Fix a minor VS2010 compile issue (missing header file).
2011-05-31 21:55:08 -06:00
Jason Hooks
51b74c2f05
starting
2011-05-23 19:01:36 -04:00
Jason Hooks
b945ce61a5
Merge remote branch 'upstream/master'
2011-05-23 15:01:47 -04:00
gugus
0d9dde0fcf
experimental: each material with the same texture is loaded only once. Problem: it doesn't take into account other material properties (which seems to be always the same anyway)
2011-05-23 14:59:36 +02:00
gugus
b05f780675
fix a compiler error under window
2011-05-23 14:56:19 +02:00
Marc Zinnschlag
80691250ec
don't create a new virtual machine for each script and frame
2011-05-18 16:01:19 +02:00
Marc Zinnschlag
a133920eb0
boost filesystem fix
2011-05-10 09:32:47 +02:00
Marc Zinnschlag
d9f1b64213
some file collection bug fixing
2011-05-05 21:39:52 +02:00
Marc Zinnschlag
6e880cffb2
changed engine class to support multiple data directories for esm files
2011-05-05 19:32:42 +02:00
Marc Zinnschlag
d260e5c1bd
added file collection class
2011-05-05 19:00:00 +02:00
Marc Zinnschlag
5b6ec405e3
Merge branch 'script'
2011-04-28 10:30:32 +02:00
Marc Zinnschlag
7f0a75c803
Merge branch 'config'
2011-04-28 10:26:51 +02:00
Marc Zinnschlag
3cb994764c
Merge remote branch 'corristo/header-refactoring'
2011-04-28 10:22:33 +02:00
Marc Zinnschlag
bdfd28f44d
adjusted components/files namespace; some related cleanup
2011-04-28 09:56:50 +02:00
Marc Zinnschlag
7131c08ca4
moved path.hpp/path.cpp to a new component
2011-04-28 09:39:40 +02:00
Marc Zinnschlag
861dc6a16e
redirecting output of expression evalutation to new report channel
2011-04-26 22:07:27 +02:00
Marc Zinnschlag
125319c441
splitting off console output from messageBox channel
2011-04-26 21:48:13 +02:00
Jason Hooks
2ac1cc8aee
Trying to animate creatures
2011-04-13 20:16:46 -04:00
Jason Hooks
d035441876
Reintroducing animation
2011-04-11 20:56:06 -04:00
Nikolay Kasyanov
79911b16d0
Fixed enum formatting in components/esm headers
2011-04-08 22:26:27 +04:00
Marc Zinnschlag
7c506301b7
Merge remote branch 'corristo/header-refactoring' into header-refactoring
...
Conflicts:
CMakeLists.txt
2011-04-08 19:24:21 +02:00
Nikolay Kasyanov
1e5768170f
Refactored remaining headers in components/esm except defs.hpp.
...
Removed obsolete *.cpp files.
2011-04-08 17:58:21 +04:00
Nikolay Kasyanov
a2c42ab5a2
components/esm header refactoring in progress. Refactored:
...
esm_reader.hpp
loadacti.hpp
loadalch.hpp
loadappa.hpp
loadarmo.hpp
loadbody.hpp
loadbook.hpp
loadbsgn.hpp
loadcell.hpp
loadclas.hpp
loadclot.hpp
loadland.hpp
Updated code style in defs.hpp
2011-04-06 20:11:08 +04:00
Jan-Peter Nilsson
a94de76801
Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline)
2011-04-03 13:20:42 +02:00
Pieter van der Kloet
833a61dd82
Fixed Boost errors with 1.46 caused by the deprecated name file_string()
2011-03-28 17:36:05 +02:00
Marc Zinnschlag
c571148bef
Merge branch 'collision'
2011-03-23 22:57:56 +01:00
gugus
3ad2b9986e
fix actors not beeing deleted. Need the latest OEngine.
2011-03-23 19:16:51 +01:00
Marc Zinnschlag
d7226fc9c2
Merge branch 'tab_completion'
2011-03-23 17:08:52 +01:00
gugus
b2194398a4
fixed a bug in loading. Every collision mesh is correctly loaded now.
2011-03-23 13:42:28 +01:00
gugus
9d4cda6510
OEngine doesn't rely on OpenMW anymore
2011-03-18 13:22:09 +01:00
gugus
0fb2107265
Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions
...
Conflicts:
apps/openmw/mwclass/npc.cpp
2011-03-15 13:36:25 +01:00
Jan-Peter Nilsson
229a91a625
Remove unused code/dependencies
2011-03-12 13:20:28 +01:00
Nikolay Kasyanov
3552ad045d
Removed obsolete macBundlePath function from fileops.cpp. Using Ogre::macBundlePath
2011-03-09 21:54:01 +03:00
Marc Zinnschlag
ecfe57caf2
platform check fix
2011-03-09 18:50:24 +01:00
Nikolay Kasyanov
3d75eea377
Merge remote-tracking branch 'upstream/master'
2011-03-08 19:03:20 +03:00
Jan-Peter Nilsson
4dd76ff36e
Remove no longer needed local .gitignore
2011-03-07 19:13:24 +01:00
Jan-Peter Nilsson
f65f210149
An unsigned integer can not be smaller than 0 so there's no point in checking
2011-03-07 19:13:24 +01:00
Jan-Peter Nilsson
d68141d203
Remove unused variables
2011-03-07 19:13:24 +01:00
Jan-Peter Nilsson
9ee83caaa2
Avoid crash when no bones are available
2011-03-07 19:13:24 +01:00
Jan-Peter Nilsson
696861349e
Rename skel to mSkel
2011-03-07 19:13:24 +01:00
Nikolay Kasyanov
4028600768
Builds on OS X now
2011-03-07 05:09:29 +03:00
Jan-Peter Nilsson
26b780d1ac
Remove unused variables and fix signed/unsigned comparison to make the compiler happy
2011-02-27 00:48:49 +01:00
Marc Zinnschlag
1e9dc4b435
de-Windownizing and some build-fixes
2011-02-26 16:37:47 +01:00
gugus
86ded891d9
modified the nif loader for shapes used for raycasting only.
2011-02-22 20:53:58 +01:00
gugus
d3c1640723
add physic support
2011-02-22 14:11:53 +01:00
gugus
1dc452ec91
Merge branch 'movement' of git://github.com/zinnschlag/openmw.git into collisions
2011-02-11 13:33:45 +01:00
Marc Zinnschlag
6a14ea8ec3
handle physics during player changing cells
2011-01-29 16:57:33 +01:00
gugus
a8ade56c80
Add a bullet Shape Loader
2011-01-13 17:51:50 +01:00
Marc Zinnschlag
d865c3cfc6
backend for tab completion: identifiers
2011-01-12 18:48:37 +01:00
Marc Zinnschlag
6848115c18
backend for tab completion: keywords
2011-01-12 18:24:00 +01:00
athile
27f69d0f5b
Fix some double-to-float Visual Studio warnings in npc.cpp. Add 'm' prefix to member variables in esm_reader.hpp.
2011-01-10 16:13:32 -07:00
Yuri Krupenin
b791a8f6be
Merge remote branch 'zini/master'
2011-01-08 16:24:26 +03:00
Pieter van der Kloet
dd4d022301
Converted all tabs to four spaces
2011-01-05 22:18:21 +01:00
Yuri Krupenin
6b6ee5440e
Minimal set of fixes to build with MinGW.
2011-01-03 17:00:53 +03:00
Jason Hooks
11406ae6f3
cleanupandupdate
2011-01-01 11:45:11 -05:00
Marc Zinnschlag
5336b90149
music player and NPC rendering branch
2010-12-30 14:50:35 +01:00
Jason Hooks
60601682cd
Beast races fixed
2010-12-21 21:45:54 -05:00
Jason Hooks
1896a6a2e8
Preliminary npcs4
2010-12-13 16:01:52 -05:00
Jason Hooks
467988455c
Preliminary npcs3
2010-12-12 22:05:47 -05:00
Jason Hooks
13d8ea09b0
Cell case insensitivity, exterior and interior cells
2010-10-27 23:22:01 -04:00
Jason Hooks
ffaaad188a
using theirs
2010-10-27 12:32:50 -04:00
Marc Zinnschlag
38ab9f7a3d
Merge branch 'newchar'
...
Conflicts:
components/esm_store/store.hpp
2010-10-22 10:27:32 +02:00
Marc Zinnschlag
cc86fe54d5
Merge remote branch 'amos/gui-windows' into newchar
2010-10-22 10:12:39 +02:00
Nicolay Korslund
30f2d4fdd4
Added LAND and LTEX to esm_store
2010-10-03 12:41:35 +02:00
Marc Zinnschlag
770276281b
changed numeric char type defs from char to signed char
2010-09-30 13:56:22 +02:00
Nicolay Korslund
d36fa3deda
Merge branch 'master' of http://github.com/zinnschlag/openmw
2010-09-27 18:00:25 +02:00
Nicolay Korslund
255b0d03a9
Started early work on terrain code (no rendering yet.)
2010-09-27 17:59:47 +02:00
Marc Zinnschlag
c16f79afc6
fixed a bug in esm loader, that made all doors and chests locked by default
2010-09-27 17:11:16 +02:00
Marc Zinnschlag
e39caef261
second set of additional doxygen comments
2010-09-25 20:15:05 +02:00
Jan Borsodi
ee101440a2
Continued work on Class Create dialog. Added sub-dialogs for picking specialization, attribute and skill. Also added some definitions in ESM for attributes and specializations.
2010-09-24 15:28:14 +02:00
Jan Borsodi
cd3e976b7c
Added birthsign dialog and spell effect widget.
2010-09-21 12:34:47 +02:00
Jan Borsodi
eec34e9f0e
Added dialog for picking class from a list.
2010-09-19 04:29:22 +02:00
Jan Borsodi
54996684aa
Merge branch 'master' into gui-windows
2010-09-19 02:04:36 +02:00
Jan Borsodi
573917f3e1
Removed the need to configure the misc skills, they are now automatically set to any skills not part of the major/minor group.
2010-09-18 19:26:45 +02:00
Nicolay Korslund
3e170002e2
Merge remote branch 'zinnschlag/cell'
2010-09-16 10:25:11 +02:00
Nicolay Korslund
71e5a15298
Minor improvement to to_utf8
2010-09-16 10:24:45 +02:00
Jan Borsodi
30e0d713ed
Changed list of skill names to contain the ID of the names instead, the actual names are then fetched from GMST.
2010-09-15 13:44:24 +02:00
Jan Borsodi
edb2df7d27
Merge remote branch 'zini/newchar' into gui-windows
2010-09-14 23:27:43 +02:00
Jan Borsodi
415426c30b
Convert tabs to spaces.
2010-09-14 23:26:32 +02:00
Jan Borsodi
1c79a62957
Added a static list of skill names to ESM::Skill.
2010-09-14 23:26:29 +02:00
Marc Zinnschlag
9a2f128f58
improved record searching
2010-09-12 09:44:12 +02:00
Marc Zinnschlag
0414d7f862
load skill and magic effect records
2010-09-12 09:34:45 +02:00
Nicolay Korslund
6a12ce313e
Fixed uninit var in loadland.hpp
2010-09-11 15:52:20 +02:00
Marc Zinnschlag
814d721e33
build external cell names from name of region instead of from internal region id
2010-09-11 15:12:42 +02:00
Marc Zinnschlag
5f84b680af
implemented exterior coc
2010-09-11 11:55:28 +02:00
Nicolay Korslund
0eae9d1504
Removed -Werror again
2010-09-10 19:34:38 +02:00
Nicolay Korslund
91e8590288
Merge branch 'master' of http://github.com/zinnschlag/openmw
2010-09-10 12:07:15 +02:00
Nicolay Korslund
f55362cbdc
Some Windows-help to cmake/FindAudiere.cmake + non-important changes.
2010-09-10 10:45:16 +02:00
Marc Zinnschlag
058f2d0cce
fixed a problem with previous merge
2010-09-08 15:42:49 +02:00
Marc Zinnschlag
1dc805d0d4
Merge branch 'master' into exterior
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2010-09-08 15:38:19 +02:00
Nicolay Korslund
5552c44753
Cleaned up strnlen in esm_reader. Added -Werror switch to g++.
2010-09-07 10:40:00 +02:00
Nicolay Korslund
e30306f7c3
Removed redundant custom exception class
2010-09-02 22:30:39 +02:00
Nicolay Korslund
c5d3a40fde
Fixed ESM bug (quest records).
2010-09-02 14:57:26 +02:00
Nicolay Korslund
d32563063b
Alternative fix to mesh crash bug
2010-09-02 14:12:48 +02:00
Marc Zinnschlag
044bf0ab48
fixed parsing explicit references in the body of control structures
2010-08-30 14:44:23 +02:00
Marc Zinnschlag
15878b12fd
Merge branch 'master' into exterior
2010-08-22 21:12:16 +02:00
Marc Zinnschlag
c18e83d7c0
extended scripting extensions to code segment 3 (instructions and functions with optional arguments)
2010-08-22 14:00:30 +02:00
Marc Zinnschlag
b3cc3073a3
changed encoding of segment 3 opcodes (increasing the number of opcodes, while reducing the width of the argument)
2010-08-22 13:15:56 +02:00
Marc Zinnschlag
08d2b80434
message box fix
2010-08-22 12:56:35 +02:00
Marc Zinnschlag
f4e79a48f0
implemented optional arguments
2010-08-22 12:47:56 +02:00
Marc Zinnschlag
276a9db6f7
added missing button implementation for MessageBox
2010-08-22 11:14:14 +02:00
Marc Zinnschlag
72cc0a3983
fixed typo in documentation
2010-08-22 09:17:05 +02:00
Marc Zinnschlag
9a7c72cdbe
Merge commit 'ape/master'
2010-08-21 20:23:40 +02:00
Armin Preiml
27166b4ee4
added bone assignment, skeleton is disabled for meshes
...
Skeleton isn't assigned to the meshes for now, because it crashes on some.
2010-08-21 19:40:08 +02:00
Nicolay Korslund
2ad9850070
Added .wav -> .mp3 sound file lookup
2010-08-20 14:20:05 +02:00
Marc Zinnschlag
6583b66e82
added load function for exteriors to cell sstore
2010-08-20 13:06:01 +02:00
Nicolay Korslund
3127602c57
Added file_finder component. Used by sound system.
2010-08-20 12:56:46 +02:00
Marc Zinnschlag
d52e2f68cd
added searchExt function to cell RecList
2010-08-20 12:52:51 +02:00
Nicolay Korslund
38ad2d98f9
Fixed windows issues + one minor optimization on to_utf8
2010-08-18 19:50:59 +02:00
Nicolay Korslund
358e1ca5a5
Added custom UTF8 converter. Removed iconv dependency.
2010-08-18 18:45:44 +02:00
Marc Zinnschlag
2cfe5f0697
Merge branch 'master' into dialogue
...
Conflicts:
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
apps/openmw/mwworld/class.cpp
apps/openmw/mwworld/class.hpp
2010-08-18 09:25:07 +02:00
Armin Preiml
47a28fe02b
If nif has a skeleton vertices are placed on the right position.
2010-08-17 19:02:22 +02:00
Armin Preiml
6a936100a7
Merge remote branch 'upstream/master'
2010-08-16 20:11:38 +02:00
Armin Preiml
d8f8bd12d3
Disabled loading skins.nif. NifLoader builds now a skeleton (if available)
2010-08-16 19:31:59 +02:00
Nicolay Korslund
5d4dba981f
Fixed mistake in NPC record struct
2010-08-13 15:51:42 +02:00
Marc Zinnschlag
0d4f2ab3ef
disabled escape sequences in script strings (doesn't work with Windows paths)
2010-08-12 19:41:40 +02:00
Armin Preiml
181b538e4a
restructured ogre nif code (struct -> class with singleton), formated code
2010-08-08 17:20:55 +02:00
Marc Zinnschlag
8086933282
Merge branch 'master' into dialogue
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
2010-08-08 14:14:43 +02:00
Marc Zinnschlag
8d85211fa1
modified Npc and Creature class to let them store a copy of their own ID
2010-08-08 14:09:09 +02:00
Armin Preiml
305563e595
disabled char encoding method for windows, although you'll need to add the iconv libs
2010-08-08 10:07:02 +02:00
Marc Zinnschlag
7611572065
cleanup
2010-08-06 15:25:54 +02:00
Marc Zinnschlag
6b1b3b20fd
store info records in dialogue records
2010-08-06 15:23:13 +02:00
Marc Zinnschlag
d47de55ce9
read info records
2010-08-06 15:19:39 +02:00
Marc Zinnschlag
69ea00455f
Merge branch 'poly'
...
Conflicts:
apps/openmw/mwworld/world.cpp
2010-08-03 21:43:05 +02:00
Marc Zinnschlag
f50ced4616
added missing record classes
2010-08-03 15:24:44 +02:00
Armin Preiml
986325b3b2
Changed decoding code page from ISO-8859-1 to WINDOWS-1252
2010-08-02 13:22:50 +02:00
Marc Zinnschlag
00c0a50f7f
Merge commit 'ape/master'
2010-07-31 19:37:49 +02:00
Armin Preiml
f3ee9ced5c
Added cmake file for the iconv library and extended relevant
...
cmake files to use it.
Added convertToUTF8 to esm_reader. getString(int size) uses this
method now.
2010-07-31 19:02:29 +02:00
Marc Zinnschlag
80000866fe
split reclists find function into find and search functions (search can be used to check if an object does not exist, while find would see this as an error situation and would throw an exception)
2010-07-26 11:40:03 +02:00
Marc Zinnschlag
61d09c4768
read attribute names from GMST instead of using hard-coded names (doesn't fully work yet, because of encoding issues)
2010-07-26 11:15:38 +02:00
Nicolay Korslund
532ccbd1f8
Killed clientconsole, mwcompiler, mwinterpreter and command server
2010-07-22 14:15:02 +02:00
Nicolay Korslund
ff64c1fbf0
Merge branch 'master' of http://github.com/zinnschlag/openmw
2010-07-21 16:20:38 +02:00
Nicolay Korslund
f87810ce7a
Moved esmtool to apps/
2010-07-21 13:52:28 +02:00
Marc Zinnschlag
cf7150e585
implemented naked expressions in lineparser (used in console; result is send through messagebox interface)
2010-07-21 13:34:52 +02:00
Marc Zinnschlag
01edd8deb5
compiler exception class fixes
2010-07-21 10:57:21 +02:00
Nicolay Korslund
c61212202b
Moved mwgui/ back to apps/openmw/. Fixed mouse position bug.
2010-07-20 20:23:37 +02:00
Nicolay Korslund
c84672a560
Added MyGUI to OpenMW, fully working (with events and script hooks)
2010-07-17 19:38:32 +02:00
Nicolay Korslund
4d74f85ae0
Moved mwgui manager to components, ready for testing
2010-07-16 22:27:50 +02:00
Nicolay Korslund
13d3f9c87e
Integrated OpenEngine, replaces entire components/engine/ directory.
2010-07-16 14:56:14 +02:00
Marc Zinnschlag
c9a6335918
replaced flat Type_Data stack with a union
2010-07-14 15:28:55 +02:00
Marc Zinnschlag
0f742ce7f9
even better error checking for extensions with explicit references
2010-07-10 12:31:00 +02:00
Marc Zinnschlag
211b723137
better error checking for extensions with explicit references
2010-07-10 12:16:45 +02:00
Marc Zinnschlag
d8c99c6ce3
Merge commit 'upstream/master'
2010-07-09 22:01:35 +02:00
Marc Zinnschlag
71c710f9f6
enhanced compiler extenion system to support new instructions and functions with explicit references
2010-07-09 22:01:24 +02:00
Marc Zinnschlag
69e607e140
implemented getdistance with explicit references
2010-07-09 20:55:39 +02:00
Marc Zinnschlag
c37b007be0
added verification for explicit references (check if the given ID exists)
2010-07-09 20:35:34 +02:00
Marc Zinnschlag
d4ac3b506e
implemented enable, disable and getdisabled with explicit references
2010-07-09 19:32:17 +02:00
Marc Zinnschlag
ce74ee8618
removed an outdated log message
2010-07-09 18:27:31 +02:00
Marc Zinnschlag
5a1dd4fedd
fixed fileparser bug (empty line before the initial begin statement were not handled correctly
2010-07-09 18:21:16 +02:00
Marc Zinnschlag
592fa84e2d
added Enable, Disable, GetDisabled
2010-07-09 16:07:03 +02:00
Nicolay Korslund
9c839e220e
Moved GUI stuff into components
2010-07-08 22:34:35 +02:00
Nicolay Korslund
3896fd218a
Added stand-alone GUI test, compiles and runs
2010-07-08 11:53:59 +02:00
Marc Zinnschlag
6b3ff8a516
constness fixes
2010-07-07 20:14:50 +02:00
Nicolay Korslund
505a972faa
changed assert to a softer warning message in cell_store.hpp
2010-07-07 17:39:23 +02:00
Nicolay Korslund
b97def39b3
Minor fixes to Mac stuff
2010-07-07 10:07:15 +02:00
Nicolay Korslund
2ec96ed7de
Merge branch 'master' of http://github.com/ardekantur/openmw
2010-07-07 09:53:13 +02:00
Nicolay Korslund
359f2903d7
Merged athile and zinnschlag
2010-07-07 09:46:11 +02:00
athile
a638c330ec
Add one more command server fix so it still works correctly on Windows and reeanble the command server by default.
2010-07-06 10:28:48 -07:00
athile
57de436db4
Command server Linux fix for open client connections.
2010-07-06 10:21:18 -07:00
athile
22c1314738
Potential fix for inability to cancel Boost.Asio blocking accept on Linux
2010-07-06 10:03:49 -07:00
Marc Zinnschlag
9d73718ec1
added GetSecondsPassed
2010-07-06 12:06:50 +02:00
Marc Zinnschlag
eff931b464
fixed broken getdistance function
2010-07-05 14:59:22 +02:00
Marc Zinnschlag
85cd744f44
fixed a stringparser bug
2010-07-05 13:33:17 +02:00
Marc Zinnschlag
b28a6fd7b8
modified parser to skip over button arguments in an messagebox instruction
2010-07-05 13:21:08 +02:00
Marc Zinnschlag
34b824cb70
implemented GetDistance function
2010-07-05 12:30:45 +02:00
Marc Zinnschlag
cc0c21cf35
added function to retrieve a live cell ref via name
2010-07-05 12:09:04 +02:00
Marc Zinnschlag
5786addab5
allowed the use of keywords as script names (*sigh*)
2010-07-05 10:58:10 +02:00
athile
5fe4313b95
Various Windows fixes to CMake, compile errors, and a few warnings. Also made the command server optional and disabled by default since it is not currently working correctly on Linux.
2010-07-04 20:17:10 -07:00
Ardekantur
ee6c933156
Merge branch 'master' of git://github.com/korslund/openmw
...
Conflicts:
CMakeLists.txt
apps/openmw/main.cpp
game/engine.cpp
2010-07-04 17:16:57 -04:00
Marc Zinnschlag
a61b2c39f0
added scriptrunning/startscript/stopscript; sorted out more case problems
2010-07-04 16:00:32 +02:00
