mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-21 23:53:56 +00:00
Code Issues Releases Wiki Activity
24993 commits 38 branches 54 tags 122 MiB
Commit graph

24993 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Gleb Mazovetskiy
377bd27aa7 set(BUILD_SHARED_LIBS ${OSG/MYGUI_STATIC}) 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
eba151884e Fix Android build 
https://github.com/openscenegraph/OpenSceneGraph/pull/1037
 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
f0febe095c extern/CMakeLists.txt: Set OSG/MYGUI_STATIC on PARENT_SCOPE 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
402e43678c extern/CMakeLists.txt: Bump OSG 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
26814b2386 CMakeLists.txt: Restore policies as we unbumped cmake version 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
4dc0fd299f cmake/WholeArchive.cmake: fix typo 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
98564b0aae cmake: move cmake_minimum_required bump to extern/CMakeLists.txt 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
90766dcc82 cmake: get_whole_archive_options macro -> function 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
a06f598442 cmake: Move USED_OSG_(COMPONENTS|PLUGINS) before add_subdirectory(extern) 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
8737453498 cmake: Compiler-specific whole-archive macro 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
93fe84aea8 cmake: Move USED_OSG_(COMPONENTS|PLUGINS) from extern to top-level 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
99ba45a308 Optional static builds of OSG, MyGUI, Bullet 2021-01-26 19:00:55 +00:00
Andrei Kortunov
5225ec9e50 Add changelog entry 2021-01-26 22:32:06 +04:00
Andrei Kortunov
e3490c8606 Remove dead code 2021-01-26 22:29:41 +04:00
Andrei Kortunov
24e1dfcddc Use default argument 2021-01-26 22:29:41 +04:00
Andrei Kortunov
f40e227686 Remove redundant formatting changes 2021-01-26 22:29:41 +04:00
Andrei Kortunov
b975f16e6b Remove redundant check - groundcover is not present in the CellStore 2021-01-26 22:29:41 +04:00
Andrei Kortunov
d12a0fdcb3 Mark only instances from groundcover files as groundcover objects 2021-01-26 22:29:41 +04:00
Andrei Kortunov
8874e88ff1 Drop fading setting 2021-01-26 22:29:41 +04:00
Andrei Kortunov
1a6c06f7b5 Do not allow to set distance to non-positive values 2021-01-26 22:29:41 +04:00
Andrei Kortunov
859cd0fd0c Do not use display lists for instanced meshes 2021-01-26 22:29:41 +04:00
Andrei Kortunov
a09f03c850 Drop groundcover materials - they are not used 2021-01-26 22:29:41 +04:00
Andrei Kortunov
36fc573375 Take in account Z direction for stomping 2021-01-26 22:29:41 +04:00
Andrei Kortunov
5124e81348 Use linear interpolation instead of abrupt transitions for groundcover lighting 2021-01-26 22:29:41 +04:00
Andrei Kortunov
14cf0ce1dc Implement instanced groundcover 2021-01-26 22:29:41 +04:00
madsbuvi
663e0a1055 Fix a race condition in loading screen. 2021-01-26 19:28:09 +01:00
psi29a
f917037ead Merge branch 'movement_fix2' into 'master' 
Fix bug: NPCs don't move if the target is exactly above or exactly below.

See merge request OpenMW/openmw!496
 2021-01-26 08:30:15 +00:00
Petr Mikheev
bc2cec86e9 Fix bug: NPCs doesn't move if the target is exactly above or exactly below. 2021-01-26 00:05:28 +01:00
psi29a
cadd1e7529 Merge branch 'daedric_fog' into 'master' 
Don't nuke fog when bounds have changed

Closes #5469

See merge request OpenMW/openmw!522
 2021-01-25 12:58:44 +00:00
psi29a
a8c5607aa6 Merge branch 'disableinfotablesorting' into 'master' 
[OpenMW-CS] Info table dragging to move record order, disable sorting

See merge request OpenMW/openmw!538
 2021-01-25 12:51:13 +00:00
psi29a
64b4472efa Merge branch 'stand' into 'master' 
Don't adjust actor position until all objects are loader (#5379)

See merge request OpenMW/openmw!546
 2021-01-25 12:12:43 +00:00
psi29a
c6f14cde20 Merge branch 'Show-level-multipliers-in-levelup-tooltip' into 'master' 
Show level multipliers in levelup tooltip

Closes #5783

See merge request OpenMW/openmw!518
 2021-01-25 10:01:39 +00:00
Cédric Mocquillon
3bb551a6f1 Show level multipliers in levelup tooltip 2021-01-25 10:01:39 +00:00
Evil Eye
59af819f97 Merge branch 'fix-mem-leak-2' into 'master' 
Fix memory leak in MWInput

See merge request OpenMW/openmw!566
 2021-01-24 16:05:30 +00:00
Gleb Mazovetskiy
fe815d3d8d Fix memory leak in MWInput 
mListener wasn't being cleaned up
 2021-01-24 15:22:36 +00:00
Frederic Chardon
2353a4d8ec Merge branch 'projectile_crash' into 'master' 
Prevent nullptr access

See merge request OpenMW/openmw!565
 2021-01-24 15:09:55 +00:00
Evil Eye
a2171875a0 Prevent nullptr access 2021-01-24 15:15:51 +01:00
fredzio
f219c5992b Add changelog 2021-01-24 14:11:12 +01:00