1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-01 09:45:33 +00:00
Commit graph

25365 commits

Author SHA1 Message Date
David Cernat
abd18745df [General] Include ScriptLocalFloat as part of ClientScriptLocal 2020-02-10 07:58:35 +02:00
Roman Siromakha
158f610b61
Merge pull request #2694 from Capostrophic/show
Make Show fallback to global variables when sensible (bug #5278)
2020-02-09 20:56:42 +01:00
Capostrophic
9b4be677f6 Make Show output format closer to vanilla 2020-02-09 20:10:24 +03:00
Capostrophic
aadf13b123 Make Show fallback to global variables when sensible (bug #5278) 2020-02-09 15:08:44 +03:00
Capostrophic
122dffe4c1 Make uncapped Damage Fatigue optional (bug #5264)
Cap Absorb Fatigue
2020-02-09 14:41:38 +03:00
David Cernat
b97fa7553c [Client] Remove variable redeclarations 2020-02-08 15:08:07 +02:00
AnyOldName3
3ce3f364ea Merge branch 'AnyOldName3-master-patch-00511' into 'master'
Add default font releaseGLObjects workaround for OSG <3.65

Closes #4704

See merge request OpenMW/openmw!160
2020-02-05 22:46:16 +00:00
David Cernat
4841c1ad4c [General] Rename ScriptLocalShort into ClientScriptLocal 2020-02-05 17:41:48 +02:00
Andrei Kortunov
b8548b8f56
Merge pull request #2691 from elsid/navigator_status
Use status codes to handle navigator errors instead of exceptions
2020-02-05 13:24:29 +04:00
Andrei Kortunov
7371650f8e
Merge pull request #2688 from Capostrophic/shield
Make sure not to pick the ground shield model incorrectly for NPCs
2020-02-05 12:11:24 +04:00
Bret Curtis
f71dac2876
Merge pull request #2690 from Capostrophic/interiorlighting
Avoid working with AMBI subrecord in tools unnecessarily (bug #5269)
2020-02-05 08:59:36 +01:00
Bret Curtis
7d77d44b34
Merge branch 'master' into interiorlighting 2020-02-05 08:59:28 +01:00
David Cernat
dae76b91ee [CI] Assign execution permission to Linux .sh file again 2020-02-05 02:51:25 +02:00
David Cernat
f0f76516d8 Add OpenMW commits up to 4 Feb 2020
# Conflicts:
#	.travis.yml
#	CI/before_script.linux.sh
2020-02-05 02:03:31 +02:00
elsid
349040ffb2
Use status codes to handle navigator errors instead of exceptions
For find path use case.
2020-02-04 22:33:56 +01:00
Roman Siromakha
d5cee5aea9
Merge pull request #2687 from akortunov/wander
Re-work wandering outside of initial cell
2020-02-04 20:55:02 +01:00
Capostrophic
216a5d27c6 Avoid working with AMBI subrecord in tools unnecessarily (bug #5269) 2020-02-04 20:57:04 +03:00
Bret Curtis
d07cec9a38
Merge pull request #2689 from Capostrophic/nifver4000
Some more minor NIF support fixes
2020-02-04 15:27:30 +01:00
Capostrophic
0479311c25 Correct declarations of utility methods 2020-02-02 19:01:47 +03:00
Capostrophic
e363d5df21 Some more minor NIF support fixes 2020-02-02 17:28:46 +03:00
Capostrophic
4a78674583 Make sure not to pick the ground shield model incorrectly 2020-02-02 15:39:29 +03:00
Andrei Kortunov
1db51a9e08 Re-work wandering outside of initial cell (bug #5261, bug #5262) 2020-02-02 11:02:19 +04:00
Alexei Dobrohotov
9b21249a9e
Merge pull request #2685 from OpenMW/revert-2683-gravity
Revert "Don't apply 1.6 magic value to NiGravity decay factor (#5266)"
2020-01-31 15:12:21 +03:00
Alexei Dobrohotov
234fdfefb7
Revert "Don't apply 1.6 magic value to NiGravity decay factor (#5266)" 2020-01-31 15:11:29 +03:00
Andrei Kortunov
10129252c8
Merge pull request #2683 from Capostrophic/gravity
Don't apply 1.6 magic value to NiGravity decay factor (#5266)
2020-01-31 09:58:32 +04:00
AnyOldName3
73722eedf3 Add default font releaseGLObjects workaround for OSG <3.65
This resolves https://gitlab.com/OpenMW/openmw/issues/4704

I've not compiled this or anything and I'm going off my memory from
around ten or eleven months ago, so if this fails CI or causes more
problems, that's why. The most likely issue is that we'll need to make
the context current before releasing the program.
2020-01-30 23:12:54 +00:00
Capostrophic
dcafe719a5 Don't apply 1.6 magic value to NiGravity decay factor (#5266) 2020-01-31 01:15:58 +03:00
Alexei Dobrohotov
2652b10b9c
Merge pull request #2681 from akortunov/hello
Do not interrupt greeting update when Hello = 0 or actor starts to swim
2020-01-30 00:48:13 +03:00
Andrei Kortunov
edd81e297f
Merge pull request #2680 from elsid/fix_aiwander_disabled_navigator
Fallback to straight path when navmesh and pathgrind are not available
2020-01-29 22:07:56 +04:00
Andrei Kortunov
1522883fdd Do not interrupt greeting update when Hello = 0 or actor starts to swim (bug #5248) 2020-01-29 16:31:09 +04:00
elsid
f7caeefddb
Fallback to straight path when navmesh and pathgrind are not available 2020-01-29 11:14:07 +01:00
Andrei Kortunov
92ea66bb21
Merge pull request #2679 from elsid/fix_aiwander_start
Fix start position for AiWander random point selection (bug #5262)
2020-01-29 09:38:07 +04:00
elsid
8e0b638145
Fix start position for AiWander random point selection 2020-01-28 20:29:52 +01:00
Bret Curtis
7dfbeff049
Merge pull request #2677 from unelsson/fixcsrotation
Editor: Convert radians to degrees when rotating objects
2020-01-28 11:55:56 +01:00
Bret Curtis
44a85795cf
Merge pull request #2669 from Capostrophic/wnam
Generate WNAM subrecord upon saving terrain instead of upon editing it
2020-01-28 11:43:47 +01:00
Bret Curtis
631f1733bf
Merge pull request #2675 from elsid/ccache
ccache fixes
2020-01-28 11:43:03 +01:00
Nelsson Huotari
032513ae18 Convert radians to degrees 2020-01-28 11:33:44 +02:00
elsid
c690f2d43d
Disable coverage for travis CI 2020-01-26 22:09:48 +01:00
elsid
0147b0e398
Print ccache stats 2020-01-26 22:09:45 +01:00
elsid
3cdff837c8
Use default ccache settings 2020-01-26 20:43:51 +01:00
David Cernat
271dc3df87 [General] Rename unused ObjectCollision into ObjectSound 2020-01-26 13:30:28 +02:00
David Cernat
fcebd9f4ae [General] Rename unused ActorInteraction into ActorSpellsActive 2020-01-26 12:47:49 +02:00
Andrei Kortunov
e1e49832c7
Merge pull request #2670 from elsid/fix_aiwander_stuck
Fix AiWander stuck (bug #5237)
2020-01-26 13:10:30 +04:00
David Cernat
a1142a8fb5 [General] Renamed unused PlayerActiveSkills into PlayerSpellsActive 2020-01-26 10:58:22 +02:00
David Cernat
038c5b8231 [Client] Rename ObjectList's addObject() into addBaseObject() 2020-01-23 16:40:04 +02:00
David Cernat
296c04af71 [Client] Combine ObjectList's getBaseObject() and getObjectFromPtr() 2020-01-23 16:18:49 +02:00
David Cernat
975797c09b [General] Implement ObjectRestock packet
Restocking object containers via trading now requires the server to send back an ObjectRestock packet before it can happen.

The unused packet ID ID_SCRIPT_GLOBAL_FLOAT has been replaced with ID_OBJECT_RESTOCK.
2020-01-23 12:50:34 +02:00
David Cernat
59a38164ea [Client] Add generic objects to ObjectList using addObjectGeneric() 2020-01-23 09:03:40 +02:00
David Cernat
989188c171 [Client] Remove ObjectList's confusing addObjectDelete() function 2020-01-22 14:35:51 +02:00
elsid
1e106013a0
Use navmesh to find wander destination outside pathgrid for ground based actors
Use dtNavMeshQuery::findRandomPointAroundCircle from recastnavigation
2020-01-21 00:01:06 +01:00