krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
20053 commits 35 branches 0 tags 65 MiB
Commit graph

3728 commits

Author SHA1 Message Date
David Cernat
841a4f90c1 Merge pull request #301 from TES3MP/master 
Add master commits up to 28 Sep 2017
 2017-09-28 11:13:51 +03:00
David Cernat
ddf0dfed55 Merge pull request #298 from OpenMW/master 
Add OpenMW commits up to 26 Sep 2017
 2017-09-26 21:54:55 +03:00
scrawl
be7bdec2ed Merge pull request #1471 from crussell187/nif_stream_optimization 
first pass on optimization of nif parsing functions from the file stream
 2017-09-25 22:43:34 +00:00
scrawl
2494c22d66 Merge pull request #1470 from MiroslavR/convertmprj 
ESS-Importer: Convert magic projectiles
 2017-09-23 22:55:56 +00:00
825de71b29 removed an iostream include used for debug prints from nifstream.hpp 2017-09-23 11:10:05 -05:00
30a213a9b3 updates for nifstream optimization including fixing the non-x86 path for little endian reads 2017-09-22 21:08:25 -05:00
David Cernat
b5ce3cebbc Merge pull request #297 from TES3MP/master 
Add master commits up to 22 Sep 2017
 2017-09-22 19:15:42 +03:00
David Cernat
73e7aa838d Merge pull request #296 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwgui/container.cpp
 2017-09-22 19:12:41 +03:00
8834066dea make streaming to a type array in nif a direct copy from the file into the vector 2017-09-21 23:47:09 -05:00
090a8408b8 made nif basic type read optimizations more portable 2017-09-21 22:37:19 -05:00
c72aa19d6d first pass on optimization of nif parsing functions from the file stream 2017-09-20 23:53:12 -05:00
scrawl
58f9688433 Use client coordinates in HBox/VBox 2017-09-20 22:24:19 +00:00
MiroslavR
f15de6d3ca ESS-Importer: Convert magic projectiles (Closes #2320) 2017-09-20 18:58:56 +02:00
David Cernat
76f1a61538 Merge pull request #295 from TES3MP/master 
Add master commits up to 20 Sep 2017
 2017-09-20 16:56:46 +03:00
David Cernat
7f0ea7d01f Merge pull request #294 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwmechanics/character.cpp
 2017-09-20 16:52:44 +03:00
David Cernat
4d4eb1bb9f Merge pull request #292 from OpenMW/master 
Add OpenMW commits up to 18 Sep 2017
 2017-09-19 09:40:45 +03:00
Chris Robinson
021627bdf8 Mark some functions with override 
Fixes some Clang warnings about overriding a virtual function without the
override keyword.
 2017-09-18 01:51:11 -07:00
Andrei Kortunov
4bb349a525 Use default 0 precision in the float formatting (bug #4096) 2017-09-17 15:07:04 +04:00
David Cernat
cccbe753d7 [General] Update version to 0.7-alpha 2017-09-13 10:29:36 +03:00
Koncord
045dc566ea Merge branch 'master' into new-script-api 2017-09-12 21:41:25 +08:00
David Cernat
bd541b1e5b Merge pull request #287 from OpenMW/master while resolving conflicts 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
 2017-09-12 07:38:49 +03:00
Andrei Kortunov
538498230b Declare mClient variable 2017-09-06 15:59:54 +04:00
scrawl
dca31b7ffa Remove redundant _boundingBoxComputed which no longer exists in osg master (Fixes #4075) 2017-09-04 19:35:42 +00:00
David Cernat
b64f379949 Merge pull request #286 from OpenMW/master while resolving conflicts 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/actors.hpp
 2017-09-04 18:05:24 +03:00
David Cernat
ccb15cc09e [Client] When players die, make guards willing to arrest them again 2017-09-04 15:13:05 +03:00
Koncord
f5e23d5fc6 [General] Empty strings should be sent too 2017-09-04 04:03:02 +08:00
scrawl
2e58024f1c Fix intersections with Rig/MorphGeometry, was caused by an issue in the LineSegmentIntersector not respecting the cullingActive flag of a drawable. 2017-09-03 14:14:15 +00:00
Koncord
d904628103 [General] Avoid limitation of 512 symbols in RakString Ctor 2017-09-03 18:53:45 +08:00
Koncord
510e657c93 Merge branch 'master' into new-script-api 2017-09-02 19:48:44 +08:00
Koncord
060ebe3d4a [Server] Init isWerewolf variable 
Comment unused code
 2017-09-02 19:45:19 +08:00
scrawl
5e790b567e Fix node path issue 
Needs to be set so that the 'cullingActive' flag of the node path's end can be checked
 2017-09-01 22:12:40 +00:00
scrawl
4bef8260ab Add const qualifiers 2017-09-01 21:42:36 +00:00
scrawl
5d524a6a10 Add custom version of MorphGeometry replacing osgAnimation 
Double buffering, custom bounding box and the update in the cull visitor (instead of update) are now all handled internally rather than needing hacks and/or callbacks.
 2017-09-01 21:42:36 +00:00
scrawl
f1ebb129c1 Fix ShaderVisitor to deal with the fact RigGeometry no longer derives from Geometry 2017-09-01 21:42:35 +00:00
scrawl
209e139aa8 Move double buffering implementation inside RigGeometry 
The double buffering is an implementation detail so it should be handled as such, rather than mandating the scene graph to be structured in a certain way.

Override accept(NodeVisitor&) instead of using callbacks.
 2017-09-01 21:42:34 +00:00
scrawl
45f7563a55 Revert "Revert "Check for a Geometry node when attaching bodyparts"" 
Issue with shaders has been fixed with b9931fb71c

This reverts commit a1e3fb7604.
 2017-08-31 21:40:35 +00:00
scrawl
b9931fb71c Set the shader on the node containing the StateSet 2017-08-31 21:39:21 +00:00
David Cernat
08df8f8d83 [General] Update version to 0.6.1 2017-08-31 18:45:41 +03:00
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
cca4991e74 [Utils] Use consistent names for utility functions added by tes3mp 2017-08-31 10:12:22 +03:00
scrawl
a1e3fb7604 Revert "Check for a Geometry node when attaching bodyparts" 
This reverts commit 3fc8634206.
 2017-08-29 22:40:19 +00:00
scrawl
3fc8634206 Check for a Geometry node when attaching bodyparts (Fixes #3957) 2017-08-29 12:55:42 +00: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
Koncord
2d0840cb3a [General] Modernize Script API 
This commit changes the style of tes3mp serverside scripting mods. Short list of changes:
* Break compatibility with old server mods
* OOP style lua API
* Basic dependency checker, allowing the installation of multiple server mods without changing configs
* Remove support for C++ plugins
* Change outdated LuaBridge to [sol2](https://github.com/ThePhD/sol2);
* Support GCC, Clang and MSVC compilers
* New environment variables: "TES3MP_SERVER_DIR" and "TES3MP_SERVER_USERDIR";
* New entity "Command controller" for registering new chat commands;
* New Event system
* Simplified Timer API
* All Lua mods now run in their own environments
* Add global namespace - Data that can be used for communicating between mods
* Player and Actor inherit base class NetActor
 2017-08-28 00:15:56 +08:00
scrawl
4fba157d3b Implement releaseGLObjects for cached resources 2017-08-26 19:29:12 +00:00
Kyle Cooley
d3d04171f9 Fix seg fault, undo changes BsaArchive 2017-08-22 15:06:56 -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