1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-20 18:53:54 +00:00
Commit graph

22196 commits

Author SHA1 Message Date
Capostrophic
453068cc7d Disallow actors to start combat with themselves (bug #3550)
Allow creatures to play initial attack dialogue
Don't add combat package to dead actors
2019-06-27 19:50:54 +03:00
Alexei Dobrohotov
1de0d1712a
Merge pull request #2422 from Capostrophic/shadow
Make sure "Tri Shadow"-named shapes aren't visible (bug #5063)
2019-06-27 03:23:07 +03:00
Alexei Dobrohotov
3cbe4ab85d
Fix idlestorm blend mask (bugs #4240, #5071) 2019-06-22 23:05:20 +03:00
Capostrophic
e06178bf0f Make sure shadow shapes aren't visible (bug #5063) 2019-06-22 18:13:41 +03:00
Alexei Dobrohotov
42f094fa7a
Merge pull request #2432 from Assumeru/master
Fix #4665
2019-06-22 12:44:19 +03:00
unknown
d9439389e6 fix #4665 2019-06-21 21:37:38 +02:00
Andrei Kortunov
b9a1e4d796
Merge pull request #2425 from Capostrophic/esm
Signedness fixes
2019-06-21 10:01:10 +04:00
Andrei Kortunov
9e3d1a0e4e
Merge pull request #2431 from Capostrophic/shield
Make unarmed creature attacks affect shield condition again (bug #5069)
2019-06-21 08:41:09 +04:00
Capostrophic
df89c6b6ce Make unarmed creature attacks affect shield condition again (bug #5069) 2019-06-20 20:45:52 +03: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
Alexei Dobrohotov
256050376c
Merge pull request #2424 from Assumeru/master
Fix builds against MyGUI master
2019-06-16 17:28:14 +03:00
Evil Eye
698c90b3ee fix builds against MyGUI master 2019-06-16 14:41:34 +02:00
Alexei Dobrohotov
8d1cad8462 Merge branch 'master' into 'master'
Fixes issue with magic visual effects (bug #5060)

See merge request OpenMW/openmw!125
2019-06-13 21:42:25 +00:00
Alexander Perepechko
19b0b056e5 Remove spell FX and VFX after playing the death animation (bug #5060) 2019-06-13 21:42:25 +00: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
Andrei Kortunov
dcf03f6785
Merge pull request #2416 from Capostrophic/cast
Make Player->Cast select the spell instead (bug #5056)
2019-06-10 09:39:23 +04:00
Andrei Kortunov
a62b6910ba
Merge pull request #2411 from Capostrophic/fader
Make sure fade operations properly end (bug #4639)
2019-06-10 08:58:26 +04:00
Andrei Kortunov
217e32a6e1
Merge pull request #2420 from akortunov/master
Add a changelog entry about cell transitions
2019-06-10 08:38:05 +04:00
Andrei Kortunov
347b1e58a1 Add a changelog entry about cell transitions 2019-06-10 08:35:41 +04:00
Alexei Dobrohotov
bc79213a66
Merge pull request #2418 from Capostrophic/focus
Partially revert "Get rid of redundant setKeyFocusWidget() method"
2019-06-09 18:28:32 +03:00
Capostrophic
6622e36226 Only merge pure osg::Groups in the optimizer 2019-06-09 11:47:43 +03:00
Andrei Kortunov
747b5fbc98
Merge pull request #2417 from Capostrophic/switchnode
Use NiSwitchNode initial index field
2019-06-09 07:41:18 +04:00
Capostrophic
56539fee4f Partially revert "Get rid of redundant setKeyFocusWidget() method" 2019-06-09 02:12:44 +03:00
Capostrophic
7c8360d0f3 Use NiSwitchNode initial index field 2019-06-09 01:58:02 +03:00
Capostrophic
295ee11063 Make Player->Cast select the spell instead (bug #5056) 2019-06-08 17:08:39 +03:00
Alexei Dobrohotov
ef2a7160fa
Fix automovement toggling on "joystick used" flag 2019-06-08 15:06:04 +03:00
Capostrophic
596dbbe70b Make sure fade operations properly end (bug #4639) 2019-06-06 12:25:01 +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
Alexei Dobrohotov
bc0e214cd9
Merge pull request #2325 from akortunov/optimize_terrain
Optimize the Distant Terrain memory consumption
2019-06-06 09:49:33 +03:00
Alexei Dobrohotov
61db93e7da
Merge pull request #2407 from akortunov/scrollbars
Add separate textures for scrollbars
2019-06-06 09:09:55 +03:00
Andrei Kortunov
cb4436cd6e
Merge pull request #2412 from Capostrophic/zaxis
Use 2D distance for fight rating of vertically moving actors (bug #4961)
2019-06-06 08:15:58 +04:00
Capostrophic
25e52f7dfe Use 2D distance for fight rating of vertically moving actors (bug #4961) 2019-06-05 21:41:02 +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
Andrei Kortunov
a02f730a77
Merge pull request #2406 from Capostrophic/invalid
Erase effects with invalid indices from spells (bug #5050)
2019-06-03 09:21:11 +04:00
Andrei Kortunov
08716ed330
Merge pull request #2409 from Capostrophic/input
Correct always run behavior when both a gamepad and a keyboard are used
2019-06-03 08:18:46 +04:00
Andrei Kortunov
995516110e
Merge pull request #2410 from Capostrophic/repairedonme
"Handle" RepairedOnMe scripting function (feature #4255)
2019-06-03 07:14:39 +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
Capostrophic
70635ed1e2 Correct always run behavior when both a gamepad and a keyboard are used 2019-06-02 22:57:31 +03:00
Capostrophic
d98a90194b Erase effects with invalid indices from spells (bug #5050) 2019-06-02 14:56:39 +03:00
Andrei Kortunov
2436652181
Merge pull request #2405 from Capostrophic/idlestorm
Improve face shielding behavior in general case (bug #4240)
2019-06-02 08:41:32 +04:00
Andrei Kortunov
34fe896f4e
Merge pull request #2400 from Capostrophic/colorcode
Escape number signs in cell/region names (bug #5047)
2019-06-02 08:06:40 +04:00
Alexei Dobrohotov
14787b5864
Merge pull request #2408 from akortunov/docs
Update fonts documentation
2019-06-01 23:02:18 +03:00