David Cernat
98a7769b91
Merge branch 'master' into 0.6.0
2017-08-31 15:44:27 +03:00
David Cernat
4468e6ec4a
Merge pull request #280 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .gitignore
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
2017-08-31 15:14:13 +03:00
Koncord
54f5104345
[General] Escape format for strings
2017-08-31 20:09:05 +08:00
David Cernat
499c7db121
[Server] Initialize interiors correctly if exterior 0, 0 has been loaded
2017-08-31 14:48:23 +03:00
David Cernat
cca4991e74
[Utils] Use consistent names for utility functions added by tes3mp
2017-08-31 10:12:22 +03:00
David Cernat
cf4021a7b5
[Client] Only add valid quests to journal
2017-08-31 09:08:29 +03:00
David Cernat
134dd06d48
[Client] Only add valid inventory & equipment items to LocalPlayer
...
Also add related debug information.
2017-08-31 08:35:46 +03:00
David Cernat
c3d1eada89
[Client] Only add spells to players that are ensured to exist
2017-08-31 06:42:11 +03:00
David Cernat
f6d36d5d80
[Client] Ensure that objects searched for have a valid reference number
2017-08-31 03:40:36 +03:00
scrawl
8c6a8ca48d
Respect the framelimit in all cases ( Fixes #3531 )
...
Affects loading screen, videos & modal dialogs. Also skips rendering if window is minimized.
2017-08-30 21:26:30 +00:00
scrawl
dc53573de4
Merge pull request #1405 from akortunov/stancechangefixes
...
Do not allow player to change weapon/spell during attack or spellcast
2017-08-29 23:11:23 +00:00
scrawl
a1e3fb7604
Revert "Check for a Geometry node when attaching bodyparts"
...
This reverts commit 3fc8634206
2017-08-29 22:40:19 +00:00
David Walley
47d6c5091f
OpenMW CS Manual - typo fixes etc ( #1422 )
...
* Update files-and-directories.rst
* OpenMW CS Manual - minor typo fixes
2017-08-29 22:39:24 +00:00
scrawl
43fda6cf07
Merge pull request #1423 from akortunov/spellpriority
...
Combat AI: use effective cast cost when rate enchanted weapon
2017-08-29 22:38:36 +00:00
scrawl
8a1e014bb8
Merge pull request #1424 from akortunov/guifixes
...
Display negative values on fatigue progress bars
2017-08-29 22:38:21 +00:00
David Cernat
833d2a5dbe
Merge pull request #277 from TES3MP/0.6.0
...
Add hotfix commits for 0.6.0 up to 29 Aug 2017, part 1
2017-08-29 19:32:21 +03:00
David Cernat
92553b8e29
[Server] Log startup errors by not deleting logger too early
2017-08-29 19:30:37 +03:00
Andrei Kortunov
73d5efabee
Display negative values on fatigue progress bar
2017-08-29 18:53:21 +04:00
scrawl
3fc8634206
Check for a Geometry node when attaching bodyparts ( Fixes #3957 )
2017-08-29 12:55:42 +00:00
Andrei Kortunov
8003dbee12
Combat AI: use effective cast cost when rate enchanted weapon
2017-08-29 16:40:55 +04:00
Andrei Kortunov
fb45995a41
Do not allow player to change weapon/spell during attack or spellcasting (bug #2445 )
2017-08-29 15:53:23 +04:00
scrawl
bc82c6a35d
Use white color if told to use nonexisting vertexcolors ( Fixes #3833 )
2017-08-27 21:22:44 +00:00
scrawl
5d2fe5e887
Implement lightmode/vertmode of NiVertexColorProperty
2017-08-27 21:22:17 +00:00
scrawl
4fba157d3b
Implement releaseGLObjects for cached resources
2017-08-26 19:29:12 +00:00
Harry
86ae2ae395
Improved shuffle ( #1412 )
2017-08-25 20:08:49 +00:00
AnyOldName3
1578fcbec7
Escape content file names before sending them to the GUI
2017-08-25 10:05:56 +00:00
scrawl
20310cf5c6
Merge pull request #1421 from hristoast/normals-doc-update
...
Use "Remove Branch" instead of "Remove" in normals tutorial
2017-08-25 09:45:27 +00:00
Marc Zinnschlag
91f674bb6f
Merge remote-tracking branch 'aesylwinn/master'
2017-08-25 10:24:17 +02:00
Hristos N. Triantafillou
663f3088d1
Use "Remove Branch" instead of "Remove" in normals tutorial
...
* Pherim over at nexusmods advised me that using "Remove" leaves stranded references at the end of the file, and that the proper way to fully remove the unwanted `NiTextureEffect` block is to use "Remove Branch". This commit clarifies that in the normal map conversion tutorial.
2017-08-24 19:50:53 -05:00
Kyle Cooley
a8576d78ad
Change default topic info values
2017-08-24 13:51:53 -04:00
Kyle Cooley
42b948dffe
Fix pathgrid segfault
2017-08-23 11:35:26 -04:00
Marc Zinnschlag
f4110a72cc
Merge remote-tracking branch 'aesylwinn/fixvideotable'
2017-08-23 11:24:51 +02:00
David Cernat
2597f018d2
Merge pull request #272 from TES3MP/0.6.0
...
Add hotfix commits for 0.6.0 up to 23 Aug 2017
2017-08-23 07:22:29 +03:00
David Cernat
a883c8f8aa
[Client] Prevent scripts from creating PlayerTopic packet spam
2017-08-23 07:14:45 +03:00
Kyle Cooley
157ecb166c
Fix wrong folder name
2017-08-23 00:02:02 -04:00
David Cernat
8f543fb34e
[Client] Use less exploitable way of disabling console
...
Previously, large framerate drops allowed players to open and use the console for short periods of time.
2017-08-23 04:58:07 +03:00
David Cernat
056d54e9f7
[Client] Only send ObjectScale packets for objects located in cells
2017-08-23 02:45:38 +03:00
scrawl
30665b743d
Merge pull request #1416 from akortunov/guifixes
...
Display large journal entries correctly
2017-08-22 20:37:46 +00:00
scrawl
aa95cb3d91
Merge pull request #1406 from Aesylwinn/reloadassets
...
Editor: Asset Reloading
2017-08-22 20:17:30 +00:00
scrawl
13ccc73457
Merge pull request #1413 from akortunov/spellpriority
...
Combat AI: allow only one summoned creature at time
2017-08-22 20:11:41 +00:00
Andrei Kortunov
0177fe6602
Display large entries in journal correctly
2017-08-22 23:26:06 +04:00
Kyle Cooley
d3d04171f9
Fix seg fault, undo changes BsaArchive
2017-08-22 15:06:56 -04:00
Andrei Kortunov
e799cbdb51
Combat AI: allow only one summoned creature at time
2017-08-22 09:18:49 +04:00
Kyle Cooley
8c4b12a603
VFS changes, one VFS and resource system per document.
...
Added ability to reset a VFS::Manager.
Removed ability to rebuild the index for a VFS::Manager.
Moved VFS creation to CSM::Data.
2017-08-21 22:31:19 -04:00
Kyle Cooley
979b0d7211
Code cleanup and more cache clearing
2017-08-21 18:58:38 -04:00
Kyle Cooley
679a284735
Use scoped lock instead of directly locking/unlocking mutex
2017-08-21 13:33:11 -04:00
Kyle Cooley
3b9326d238
Clear terrain cache and reload terrain
2017-08-20 22:34:41 -04:00
Kyle Cooley
d4a722067d
Reload water
2017-08-20 20:55:56 -04:00
Kyle Cooley
b62cb0e2a4
Clear out GPU texture/stateset cache
2017-08-20 19:55:16 -04:00
Kyle Cooley
7914fd5c9c
Re-index BSAs
2017-08-20 19:36:21 -04:00
