1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 22:19:54 +00:00
Commit graph

2275 commits

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