Commit Graph

24961 Commits (34af58f53fcea6e5dc402c0c9da4286a81ed333b)
 

Author SHA1 Message Date
Andrei Kortunov 7b727e4d70 Revert "Remove physics dependency on basenode"
This reverts commit 165c731492.
4 years ago
Andrei Kortunov 165af1c365 Revert "Some actors are supposed to spawn on a static object that belong to an adjacent cell."
This reverts commit f031a191b8.
4 years ago
Andrei Kortunov 8019fd594d Revert "Add changelog"
This reverts commit f219c5992b.
4 years ago
Andrei Kortunov f8e8496d36 Revert "Revert a wrong change introduced in MR 546"
This reverts commit 23137d0c54.
4 years ago
Bret Curtis 9f168eab88
Merge pull request #3044 from akortunov/master
Avoid null dereference for objects without cells
4 years ago
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
4 years ago
uramer ee2f0e7eb3 Fix inconsistent argument name 4 years ago
uramer eca0d8b7ea Fix typo in DropMode enum 4 years ago
uramer edc6d5c3e7 Fix a typo in separate drop binds 4 years ago
uramer 36cd818155 Fix separate drop, refactor for code reuse 4 years ago
Andrei Kortunov 3b9f8b5fa2 Avoid null dereference for objects without cells 4 years ago
Andrei Kortunov d984d13b1c Merge branch 'animate_animated_objects' into 'master'
Unbreak animated objects (regression from !546)

See merge request OpenMW/openmw!570
4 years ago
Andrei Kortunov 5382d38b9b Merge branch 'hit_target_object' into 'master'
Unbreak targetted spell on objects (#5811)

See merge request OpenMW/openmw!569
4 years ago
Andrei Kortunov 74fba6df36 Merge branch 'revert-f917037e' into 'master'
Revert "Merge branch 'movement_fix2' into 'master'"

See merge request OpenMW/openmw!572
4 years ago
elsid a3ab8dfbb4 Revert "Merge branch 'movement_fix2' into 'master'"
This reverts merge request !496
4 years ago
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.
4 years ago
Nelsson Huotari 83ee1cc582 fix xbase to baseanim 4 years ago
Nelsson Huotari 3194520dcd Move base_anim settings to settings-default.cfg 4 years ago
Bret Curtis b164f1aa17
Merge pull request #3023 from akortunov/grass_intsancing
Grass instancing
4 years ago
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
4 years ago
Frederic Chardon 7cd7fa2f08 Collect all available stats if OPENMW_OSG_STATS_FILE is set and point to
a valid file.
4 years ago
fredzio 64475ebedb Remove a brainfart from precise projectile handling: all non-actor
non-projectile objects were treated as ground.
4 years ago
Gleb Mazovetskiy c8db4b9b34 .gitlab-ci.yml: Increase Android timeout (1h -> 1h30m) 4 years ago
Gleb Mazovetskiy 93bc5848af .gitlab-ci.yml: Bump Android cache key to v3 4 years ago
Gleb Mazovetskiy 2798db5418 CI/before_script.linux.sh: <tab> -> 4 spaces and remove unused ENV 4 years ago
Gleb Mazovetskiy 3308c717f8 extern/CMakeLists.txt: Switch to openmw's OSG 4 years ago
Gleb Mazovetskiy 4098b455f5 extern/CMakeLists.txt: Bump OSG
All the necessary fixes have been upstreamed
4 years ago
Gleb Mazovetskiy 3d334dae75 Fix MYGUI/OSG_STATIC and BUILD_SHARED_LIBS 4 years ago
Gleb Mazovetskiy 99061345cc WholeArchive.cmake: Fix mismatched args warning 4 years ago
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.
4 years ago
Gleb Mazovetskiy 377bd27aa7 set(BUILD_SHARED_LIBS ${OSG/MYGUI_STATIC}) 4 years ago
Gleb Mazovetskiy eba151884e Fix Android build
https://github.com/openscenegraph/OpenSceneGraph/pull/1037
4 years ago
Gleb Mazovetskiy f0febe095c extern/CMakeLists.txt: Set OSG/MYGUI_STATIC on PARENT_SCOPE 4 years ago
Gleb Mazovetskiy 402e43678c extern/CMakeLists.txt: Bump OSG 4 years ago
Gleb Mazovetskiy 26814b2386 CMakeLists.txt: Restore policies as we unbumped cmake version 4 years ago
Gleb Mazovetskiy 4dc0fd299f cmake/WholeArchive.cmake: fix typo 4 years ago
Gleb Mazovetskiy 98564b0aae cmake: move cmake_minimum_required bump to extern/CMakeLists.txt 4 years ago
Gleb Mazovetskiy 90766dcc82 cmake: get_whole_archive_options macro -> function 4 years ago
Gleb Mazovetskiy a06f598442 cmake: Move USED_OSG_(COMPONENTS|PLUGINS) before add_subdirectory(extern) 4 years ago
Gleb Mazovetskiy 8737453498 cmake: Compiler-specific whole-archive macro 4 years ago
Gleb Mazovetskiy 93fe84aea8 cmake: Move USED_OSG_(COMPONENTS|PLUGINS) from extern to top-level 4 years ago
Gleb Mazovetskiy 99ba45a308 Optional static builds of OSG, MyGUI, Bullet 4 years ago
Andrei Kortunov 5225ec9e50 Add changelog entry 4 years ago
Andrei Kortunov e3490c8606 Remove dead code 4 years ago
Andrei Kortunov 24e1dfcddc Use default argument 4 years ago
Andrei Kortunov f40e227686 Remove redundant formatting changes 4 years ago
Andrei Kortunov b975f16e6b Remove redundant check - groundcover is not present in the CellStore 4 years ago
Andrei Kortunov d12a0fdcb3 Mark only instances from groundcover files as groundcover objects 4 years ago
Andrei Kortunov 8874e88ff1 Drop fading setting 4 years ago
Andrei Kortunov 1a6c06f7b5 Do not allow to set distance to non-positive values 4 years ago