Nelsson Huotari
5c32460153
Add underscore-separated node-names to reserved-list
2021-02-03 14:25:50 +02:00
Nelsson Huotari
384112746c
Add option for custom collision node with non-nif files
2021-02-03 14:25:09 +02:00
Nelsson Huotari
bae27e8199
dynamic_cast to static_cast
2021-02-02 21:52:15 +02:00
Nelsson Huotari
b28d8251aa
Clone animation tracks
2021-02-02 21:52:08 +02:00
Nelsson Huotari
6c0c28c2eb
Get collision box extents and center from btBvhTriangleMeshShape
2021-02-02 21:51:46 +02:00
Nelsson Huotari
382324173b
\ to /
2021-02-02 21:42:25 +02:00
Nelsson Huotari
1221889cf7
Limit conversion of underscores to nodes origating from osgAnimation library
2021-02-02 21:41:17 +02:00
Nelsson Huotari
2c67f34c6d
Update base_anim file settings
2021-02-02 21:18:14 +02:00
Nelsson Huotari
5b88d16a50
Clean-up
2021-02-02 21:09:50 +02:00
Nelsson Huotari
2162b97fef
Handle case in osgAnimation bone names
2021-02-02 17:34:02 +02:00
Nelsson Huotari
7d3f2bc113
Convert underscores in bone names to whitespaces
2021-02-02 17:33:40 +02:00
Jordan Francis Moran-Meyers
0d1c073cfa
Fix the regression involving Cure
2021-02-01 18:34:10 +00:00
madsbuvi
7edaa50195
another approach
2021-01-31 18:02:05 +01:00
Petr Mikheev
94e8855c8c
Merge branch 'fix_5821' into 'master'
...
Fix #5821 : NPCs from mods getting removed if mod order was changed
Closes #5821
See merge request OpenMW/openmw!577
2021-01-31 09:34:26 +00:00
Nelsson Huotari
f87c45c92a
Get collision box extents and center from btBvhTriangleMeshShape
2021-01-30 16:03:02 +02:00
Petr Mikheev
e83a9cdc89
Merge branch 'pathfinding_fix' into 'master'
...
Pathfinding fixes
See merge request OpenMW/openmw!576
2021-01-29 23:07:53 +00:00
Petr Mikheev
157b14cdaa
Fix #5821 : NPCs from mods getting removed if mod order was changed
2021-01-29 22:53:02 +01:00
Petr Mikheev
9590377f22
Don't ignore Z in path finding if actor can move by Z.
2021-01-29 22:30:20 +01:00
Petr Mikheev
642ca02e35
Shorten almost straight paths only if smooth movement is enabled; reduce angle limit for the shortening.
2021-01-29 22:30:01 +01:00
Andrei Kortunov
b286397dd4
Merge pull request #3045 from akortunov/revert
...
Revert fix for 5379
2021-01-29 17:17:28 +04:00
Andrei Kortunov
7b727e4d70
Revert "Remove physics dependency on basenode"
...
This reverts commit 165c731492
2021-01-29 16:51:13 +04:00
Andrei Kortunov
165af1c365
Revert "Some actors are supposed to spawn on a static object that belong to an adjacent cell."
...
This reverts commit f031a191b8
2021-01-29 16:51:05 +04:00
Andrei Kortunov
8019fd594d
Revert "Add changelog"
...
This reverts commit f219c5992b
2021-01-29 16:50:56 +04:00
Andrei Kortunov
f8e8496d36
Revert "Revert a wrong change introduced in MR 546"
...
This reverts commit 23137d0c54
2021-01-29 16:50:39 +04:00
Bret Curtis
9f168eab88
Merge pull request #3044 from akortunov/master
...
Avoid null dereference for objects without cells
2021-01-29 13:15:04 +01:00
psi29a
faa800464f
Merge branch 'cs_fix_separate_drop' into 'master'
...
OpenMW-CS: Fix separate drop, refactor for code reuse
See merge request OpenMW/openmw!574
2021-01-29 11:39:40 +00:00
uramer
ee2f0e7eb3
Fix inconsistent argument name
2021-01-28 23:47:38 +01:00
uramer
eca0d8b7ea
Fix typo in DropMode enum
2021-01-28 22:40:44 +01:00
uramer
edc6d5c3e7
Fix a typo in separate drop binds
2021-01-28 22:22:48 +01:00
uramer
36cd818155
Fix separate drop, refactor for code reuse
2021-01-28 22:10:33 +01:00
Andrei Kortunov
3b9f8b5fa2
Avoid null dereference for objects without cells
2021-01-28 18:37:47 +04:00
Andrei Kortunov
d984d13b1c
Merge branch 'animate_animated_objects' into 'master'
...
Unbreak animated objects (regression from !546 )
See merge request OpenMW/openmw!570
2021-01-28 14:12:24 +00:00
Andrei Kortunov
5382d38b9b
Merge branch 'hit_target_object' into 'master'
...
Unbreak targetted spell on objects (#5811 )
See merge request OpenMW/openmw!569
2021-01-28 14:09:45 +00:00
Andrei Kortunov
74fba6df36
Merge branch 'revert-f917037e' into 'master'
...
Revert "Merge branch 'movement_fix2' into 'master'"
See merge request OpenMW/openmw!572
2021-01-28 12:58:21 +00:00
elsid
a3ab8dfbb4
Revert "Merge branch 'movement_fix2' into 'master'"
...
This reverts merge request !496
2021-01-28 12:48:19 +00:00
fredzio
23137d0c54
Revert a wrong change introduced in MR 546
...
A prerequisite to create physics objects for statics was to remove the
dependency on base node (since it doesn't yet exists) for object
position. It is still necessary for animation though.
Restore the basenode (and the associated FIXME) so that animated objects works properly.
2021-01-27 16:24:11 +01:00
Nelsson Huotari
83ee1cc582
fix xbase to baseanim
2021-01-27 13:41:05 +02:00
Nelsson Huotari
3194520dcd
Move base_anim settings to settings-default.cfg
2021-01-27 13:41:02 +02:00
Bret Curtis
b164f1aa17
Merge pull request #3023 from akortunov/grass_intsancing
...
Grass instancing
2021-01-27 12:21:24 +01:00
psi29a
699bd257ef
Merge branch 'camera_stats' into 'master'
...
Collect all available stats if OPENMW_OSG_STATS_FILE is set and point to a valid file.
See merge request OpenMW/openmw!526
2021-01-27 08:04:33 +00:00
Frederic Chardon
7cd7fa2f08
Collect all available stats if OPENMW_OSG_STATS_FILE is set and point to
...
a valid file.
2021-01-27 08:04:33 +00:00
fredzio
64475ebedb
Remove a brainfart from precise projectile handling: all non-actor
...
non-projectile objects were treated as ground.
2021-01-27 07:15:09 +01:00
Gleb Mazovetskiy
c8db4b9b34
.gitlab-ci.yml: Increase Android timeout (1h -> 1h30m)
2021-01-26 19:01:52 +00:00
Gleb Mazovetskiy
93bc5848af
.gitlab-ci.yml: Bump Android cache key to v3
2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
2798db5418
CI/before_script.linux.sh: <tab> -> 4 spaces and remove unused ENV
2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
3308c717f8
extern/CMakeLists.txt: Switch to openmw's OSG
2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
4098b455f5
extern/CMakeLists.txt: Bump OSG
...
All the necessary fixes have been upstreamed
2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
3d334dae75
Fix MYGUI/OSG_STATIC and BUILD_SHARED_LIBS
2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
99061345cc
WholeArchive.cmake: Fix mismatched args warning
2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
daf080ff19
cmake: Move MYGUI/OSG_STATIC default to top-level
...
Makes it clear that the USE_SYSTEM variables affect the defaults of
STATIC variables.
2021-01-26 19:00:55 +00:00
