mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 04:19:55 +00:00
Code Issues Releases Wiki Activity
17011 commits 38 branches 54 tags 122 MiB
Commit graph

3043 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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.

Conflicts:
	components/config/gamesettings.cpp
 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.

Moving to branch
 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.

Conflicts:

	libs/openengine/bullet/physic.cpp
 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