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

4218 commits

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