Commit Graph

24721 Commits (cc25612b8d1ebf22c069afb9302108a55bec7a1d)
 

Author SHA1 Message Date
David Cernat cc25612b8d Add OpenMW commits up to 18 Sep 2019
# Conflicts:
#	apps/openmw/mwclass/container.cpp
#	apps/openmw/mwclass/door.cpp
#	apps/openmw/mwmechanics/security.cpp
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/miscextensions.cpp
5 years ago
Alexei Dobrohotov 13a0b3bf5a
Merge pull request #2515 from Assumeru/organic-locks
Fix #5155
5 years ago
Alexei Dobrohotov fb87778493
Merge branch 'master' into organic-locks 5 years ago
Alexei Dobrohotov 6f2aaf156e
Merge pull request #2527 from akortunov/resurrect
Continue scripts execution after player's death
5 years ago
Andrei Kortunov 94a281370f Continue scripts execution after player's death (bug #5166) 5 years ago
Evil Eye 32de86d114 merge master 5 years ago
Evil Eye 7c8b82f45c move locking behaviour to cellref 5 years ago
Alexei Dobrohotov d3284c0331
Merge pull request #2525 from akortunov/factionowner
Improve faction items handling
5 years ago
Andrei Kortunov 85bb4a76f6 Improve faction items handling (bug #5164) 5 years ago
Andrei Kortunov 4a6d2cbaff Do not allow player to take items from evidence chests (bug #3609) 5 years ago
Andrei Kortunov 271d8e6d74
Merge pull request #2521 from Capostrophic/material
Support target color in NiMaterialColorController (bug #5159)
5 years ago
Capostrophic 83f61d1636 Support target color in NiMaterialColorController (bug #5159) 5 years ago
Andrei Kortunov dd6c21ad81
Merge pull request #2511 from Capostrophic/water
Water shader cleanup
5 years ago
Andrei Kortunov b205aae4e1
Merge pull request #2518 from Capostrophic/activation
Allow objects to use their ID instead of the name for tooltip/activation checks (bug #5158)
5 years ago
Andrei Kortunov 649a14dfae
Merge branch 'master' into activation 5 years ago
Andrei Kortunov a7cfe5853c
Merge pull request #2522 from Capostrophic/extradata
Refactor NIF extra data and particle modifier handling
5 years ago
Andrei Kortunov a54ba4c9a2
Merge pull request #2524 from Capostrophic/knockdown
Use Open action as fallback for companion activation (bug #5161)
5 years ago
Capostrophic 480000da07 Use Open action as fallback for companion activation (bug #5161) 5 years ago
David Cernat 56f084c9c0 [Client] Fix packet spam for repetitive setting of the same global value 5 years ago
David Cernat ceb16bb6f8 [Client] Reimplement temporary fix from c65d6c1328
The real reason for the crash remains to be fixed.
5 years ago
David Cernat afa704ce95 [Server] Add OnScriptGlobalShort event 5 years ago
David Cernat e424bd9bc3 [General] Implement ClientScriptSettings packet, part 2
The packet can now set which client globals get packets sent about them when their values change on clients.
5 years ago
Capostrophic 790531671a Fix tests 5 years ago
Capostrophic 8baddefdbd Refactor extra data and particle modifier handling
Objects no longer inherit from extra data class
"Controlled" harmful abstraction no longer exists
Introduced NiParticleModifier/NiParticleCollider abstractions
Extra data size reading moved into the base read() method
5 years ago
Evil Eye 85d52ec183 oops 5 years ago
Alexei Dobrohotov 6128279dbf
Merge pull request #2517 from unelsson/terraintextureselection
[Final tests] Editor: Terrain texture selection
5 years ago
Andrei Kortunov 6c006c9c87
Merge pull request #2516 from Capostrophic/launcher
Launcher: Avoid Qt "opening user openmw.cfg twice" warning
5 years ago
Capostrophic 718dbd3f9a Use object ID as the substitution for their name (bug #5158) 5 years ago
Capostrophic 6b74630f6e Preparation work
Phase out canBeActivated() to unify activation checks
Use getName() for the name caption in tooltips
Always use tooltips for non-activator objects
Invert hasTooltip default value
5 years ago
Capostrophic 9788a776b9 Avoid Qt "opening user openmw.cfg twice" warning 5 years ago
Evil Eye a86a8ecc0e Allow locking/picking just about everything 5 years ago
Nelsson Huotari 4ccb951126 move check to outermost scope 5 years ago
Nelsson Huotari 0880923189 Consistency for variable and header argument names. 5 years ago
Nelsson Huotari 6dc3d8b44b More readable code 5 years ago
Nelsson Huotari 780055899d Don't add empty primitive sets to geometry. 5 years ago
Nelsson Huotari 3becacf6d1 Remove globals, const int& -> int, values to const ref. 5 years ago
Nelsson Huotari 1dcee833a1 Less verbose syntax 5 years ago
Nelsson Huotari 5a143fe99d Remove extra include 5 years ago
Nelsson Huotari 39ab449431 Only allow selection of cells in view 5 years ago
Nelsson Huotari dc8de6c6e6 Make less copies 5 years ago
Nelsson Huotari 001ca68cc7 Remove empty lines 5 years ago
Nelsson Huotari 46ee639892 pass by const ref and other fixes 5 years ago
Nelsson Huotari 20ab7df19f Fixes, cleanup. 5 years ago
Nelsson Huotari 1a08944a8b Remove unused code, clarifications, optimizations 5 years ago
Nelsson Huotari d6722c7492 Terrain texture selection, support for vertex selection 5 years ago
Evil Eye 56b6a7ada4 Fix #5155 5 years ago
David Cernat 3acfbad55d [General] Implement ClientScriptSettings packet, part 1
For starters, the new packet can set which client scripts have all of their variables synchronized between players. The previous hardcoded list of IDs for synchronized scripts has been removed.
5 years ago
David Cernat 25e27ccb95 [General] Use placeholder packet ID for unused CellCreate packet 5 years ago
Alexei Dobrohotov 2e05e0e829
Merge pull request #2514 from akortunov/guifixes
Generate sCrimeMessageReport only once per frame
5 years ago
Andrei Kortunov d58f93f388 Use sayDone() only for scripting backward compatibility 5 years ago