mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 13:23:53 +00:00
Code Issues Releases Wiki Activity
24681 commits 108 branches 66 tags 133 MiB
Commit graph

24681 commits

This branch
This branch
All branches
Author SHA1 Message Date
Frederic Chardon
bb5213670c Use bigger hammer to set Actor's position after teleporting. Otherwise traceDown() would use old collision object transform and gives incorrect results, making the Actor "fall" in the new position. 2020-11-16 11:35:50 +01:00
psi29a
0a566dbce7 Merge branch 'simplifystanding' into 'master' 
Get rid of the StandingActorsMap.

See merge request OpenMW/openmw!409
 2020-11-15 09:16:44 +00:00
fredzio
d64ed6cf53 Get rid of the StandingActorsMap. Just embed the necessary info into 
Actor class.
 2020-11-15 01:58:21 +01:00
psi29a
5362146d24 Merge branch 'interleaved_movements' into 'master' 
Unbreak lifts & conveyors in Sotha Sil Expanded

See merge request OpenMW/openmw!410
 2020-11-15 00:20:24 +00:00
fredzio
e5fa457fe7 Properly account for interleaved move of actors. 
Before this change, if an actor position was changed while the physics
simulation was running, the simulation result would be discarded. It is
fine in case of one off event such as teleport, but in the case of
scripts making use of this functionality to make lifts or conveyor (such
as Sotha Sil Expanded mod) it broke actor movement.

To alleviate this issue, at the end of the simulation, the position of the Actor
in the world is compared to the position it had at the beginning of the
simulation. A difference indicate a force move occured. In this case,
the Actor mPosition and mPreviousPosition are translated by the difference of position.

Since the Actor position will be really set while the next simulation runs, we
save it in the mNextPosition field.
 2020-11-14 20:39:16 +01:00
psi29a
6064d3e741 Merge branch 'boundingvolume' into 'master' 
Read NIF bounding volume data correctly

See merge request OpenMW/openmw!407
 2020-11-14 13:19:29 +00:00
Alexei Dobrohotov
df9667e923 Read NIF bounding volume data correctly 2020-11-14 14:16:29 +03:00
psi29a
37e81f0df8 Merge branch 'redirection-fix' into 'master' 
Only reroute stdout etc. to new console if not already redirected

Closes #5650

See merge request OpenMW/openmw!408
 2020-11-14 09:30:57 +00:00
AnyOldName3
89d73c5fc7 Only reroute stdout etc. to new console if not already redirected 
This should fix the issue where Windows Release builds (compiled as
/SUBSYSTEM:WINDOWS instead of /SUBSYSTEM:CONSOLE) can't have their
output redirected.

Basically, a console application creates a console if not given one, so
you get a console window behind OpenMW while it's running. It was
decided that this was ugly, so we set Release builds to be windows
applications, which don't get an automatic console and don't
automatically connect to a console if given one anyway.

Of course, we still wanted to actually be able to print to a console if
given one, so we manually attach to the parent process' console if it
exists, then reopen the standard streams connected to CON, the Windows
pseudo-file representing the current console.

This is a little like connecting a second wire into a dumb terminal in
that you're pumping characters into the display rather than onto a
pipeline, so output can't be redirected.

It turns out, though, that if a /SUBSYSTEM:WINDOWS application has its
standard streams redirected by the calling process, it still gets its
handles as normal, so everything starts off connected just how we want
it and we were clobbering this good setup with the straight-to-console
fix.

All we need to do to fix that is check if we've got valid standard
handles and that they go somewhere useful, and if so, avoid reopening
them once the console is attached. Simples.
 2020-11-14 02:04:46 +00:00
psi29a
18a95377eb Merge branch 'stringpalette' into 'master' 
Fix NiStringPalette loading

See merge request OpenMW/openmw!406
 2020-11-13 23:04:16 +00:00
Alexei Dobrohotov
117697ea22 Fix NiStringPalette loading 2020-11-14 01:12:32 +03:00
Bret Curtis
a038c448f2
Merge pull request #3030 from OpenMW/make_travis_great_again 
Update .travis.yml
 2020-11-13 22:01:06 +01:00
psi29a
e73a0f8a2a Merge branch 'minorfixes' into 'master' 
Minor fixes

See merge request OpenMW/openmw!405
 2020-11-13 20:56:55 +00:00
Alexei Dobrohotov
8a6d3d1b4f Minor fixes 
Fix extra semicolon
Disable collision avoidance if AI is disabled
 2020-11-13 22:53:12 +03:00
AnyOldName3
981fffe590 Merge branch 'itsakindoftemplatemagic' into 'master' 
Fix MSVC2017 builds

See merge request OpenMW/openmw!404
 2020-11-13 17:22:22 +00:00
AnyOldName3
1e0df23d14 Merge branch 'shadows-bin' into 'master' 
Use a custom renderbin to avoid pointless OpenGL state switches

See merge request OpenMW/openmw!402
 2020-11-13 16:29:41 +00:00
Bret Curtis
68836aa0fd
Update .travis.yml 2020-11-13 16:44:06 +01:00
Bret Curtis
8b0475037d
Update .travis.yml 2020-11-13 16:42:10 +01:00
Evil Eye
94c89e6d5e check ValueTs 2020-11-13 16:41:45 +01:00
Bret Curtis
e15716eb0c
Update .travis.yml 2020-11-13 16:38:53 +01:00
Bret Curtis
df2ae6e866
Update .travis.yml 2020-11-13 16:29:11 +01:00
Bret Curtis
dee91d12c2
Update .travis.yml 2020-11-13 16:26:08 +01:00
AnyOldName3
fcfd340c69 Actually copy alpha blended drawables to the new stategraph 2020-11-12 23:23:40 +00:00
psi29a
399270694f Merge branch 'no-colour-fbo-for-shadows' into 'master' 
Don't bind unnecessary colour buffer when drawing shadow maps

See merge request OpenMW/openmw!403
 2020-11-12 22:44:09 +00:00
Evil Eye
d8897c4509 remove inline and use enable_if_t 2020-11-12 20:46:45 +01:00
Evil Eye
d8d4351962 fix MSVC2017 builds 2020-11-12 19:45:32 +01:00
AnyOldName3
55f65752fd Don't bind unnecessary colour buffer when drawing shadow maps 2020-11-12 17:55:10 +00:00
AnyOldName3
cdbf19a508 Tidy up run-on lines 2020-11-12 17:04:23 +00:00
AnyOldName3
296dce470a Spelling fix 2020-11-12 16:58:29 +00:00
AnyOldName3
72f7e6a702 Handle all shadow alpha uniforms in shadowsbin 2020-11-12 00:26:30 +00:00
AnyOldName3
5d046bc95d Mark override 2020-11-11 14:58:06 +00:00
psi29a
9902945c49 Merge branch 'interpolator' into 'master' 
Read a few more NIF types

See merge request OpenMW/openmw!401
 2020-11-11 09:44:28 +00:00
Alexei Dobrohotov
a46699fb1e Handle NiGeomMorpherController interpolator list 2020-11-10 23:23:11 +03:00
Alexei Dobrohotov
f3f5dcb016 Read a few more NIF types 
NiFloatInterpolator, NiPoint3Interpolator, NiTransformInterpolator, NiBoolInterpolator
Update a few existing controller records
Update NiSkinInstance
 2020-11-10 22:37:39 +03:00
psi29a
ed8342ebc9 Merge branch 'niffile' into 'master' 
Remove NIFFile settings manager dependency

See merge request OpenMW/openmw!398
 2020-11-10 09:03:10 +00:00
corristo
73e3ee0f85 Merge branch 'update-macos-deps' into 'master' 
[macOS, CI] Update dependencies, don't use lz4 from Homebrew

See merge request OpenMW/openmw!399
 2020-11-10 08:21:47 +00:00
corristo
b8ed3b0059 [macOS, CI] Update dependencies, don't use lz4 from Homebrew 
Also, enable double precision support for Bullet.
 2020-11-10 08:21:46 +00:00
psi29a
10fc3331d5 Merge branch 'settings' into 'master' 
Remove shader visitor settings manager dependency

See merge request OpenMW/openmw!397
 2020-11-09 12:07:59 +00:00
Alexei Dobrohotov
c857588ee9 Remove NIFFile settings manager dependency 2020-11-09 14:24:48 +03:00
Alexei Dobrohotov
b523574090 Remove shader visitor settings manager dependency 2020-11-09 13:59:59 +03:00
psi29a
35115f2f24 Merge branch 'theyretakingthenifstoisengard' into 'master' 
Read a few more NIF types

See merge request OpenMW/openmw!396
 2020-11-09 06:34:07 +00:00
Alexei Dobrohotov
1d07361f08 Read a few more NIF types 
BSXFlags, NiTransformData, BSBound, BSFadeNode, bhkBlendController
 2020-11-09 00:19:35 +03:00
psi29a
6844800124 Merge branch 'nifisjustice' into 'master' 
NIF updates

See merge request OpenMW/openmw!394
 2020-11-08 17:37:54 +00:00
Alexei Dobrohotov
96769ab4a5 Try to reword unsupported NIF loading docs 2020-11-08 20:07:34 +03:00
Alexei Dobrohotov
a38c629425 Read NiSkinPartition 2020-11-08 13:23:18 +03:00
Alexei Dobrohotov
afea11b70a Read NiStringPalette and NiBoolData 2020-11-08 13:23:18 +03:00
Alexei Dobrohotov
c79f509652 Misc NIF loader improvements 
Bullet NIF loader cleanup
Collect all extra records of a node
Remove code duplication in geometry type detection in OSG-side NIF loader
 2020-11-08 13:23:18 +03:00
Alexei Dobrohotov
7e63afdecf Allow loading arbitrary NIF files 2020-11-08 13:23:18 +03:00
Alexei Dobrohotov
f6b43b9321 Merge branch 'Changelog_Devs' into 'master' 
Adds #4083 to the changelog

See merge request OpenMW/openmw!392
 2020-11-07 15:15:17 +00:00
psi29a
1b944aeb29 Merge branch 'grammar' into 'master' 
Improve grammar in [Physics] category of the default settings

See merge request OpenMW/openmw!393
 2020-11-07 08:08:25 +00:00