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

20560 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Cernat
29cb51cdce [Server] Enable SOL_SAFE_USERTYPE for both Debug and RelWithDebInfo 2017-11-01 18:09:25 +02:00
Koncord
1d111fdca8 [General] Update sol submodule to 2.18.5 2017-11-01 22:27:52 +08:00
Koncord
bd7082f57e [Server] Use custom Lua error handler not only on Windows 
For some reason sol's default error handler does not wroking properly
 2017-11-01 21:48:42 +08:00
David Cernat
71c921faa7 [Server] Rename property cell into description, initialize Cells type 2017-11-01 13:22:41 +02:00
rexelion
a9e5e19482 OnActivate is triggered when the item is picked up 2017-10-31 22:33:26 +00:00
David Cernat
5653d07c7b [Server] Fix build on Windows 2017-10-31 22:00:03 +02:00
Koncord
948090676a [Server] Impove Lua Error handler for Windows 2017-11-01 01:17:11 +08:00
Miloslav Číž
ff1265c0e7 refactor jump animation 2017-10-31 14:22:24 +01:00
David Cernat
61db22f5ae
Merge pull request #329 from TES3MP/master 
Add master commits up to 31 Oct 2017
 2017-10-31 06:31:49 +02:00
David Cernat
a31d43965f
Merge pull request #328 from OpenMW/master 
Add OpenMW commits up to 31 Oct 2017
 2017-10-31 06:22:57 +02:00
scrawl
5e69f6033f
Merge pull request #1531 from drummyfish/cyclefix 
Don't switch weapon when cycling to the same weapon (issue #4180)
 2017-10-31 00:28:15 +00:00
rexelion
e8743f3f79 check the presence of OnActivate using the SuppressActivate flag instead of looking for keywords 2017-10-30 21:16:25 +00:00
Miloslav Číž
3c65bdaf14 weapon cycle fix 2017-10-30 18:05:45 +01:00
Miloslav Číž
7bc512974f use mcurrentjump instead of custom attrib 2017-10-30 15:26:38 +01:00
rexelion
4e6f53d6f1 item added to the player and OnActivate is triggered when the inventory is closed 2017-10-29 11:45:17 +00:00
rexelion
1ee5dcff77 added a function to determine if a script contains OnActivate 2017-10-28 20:56:08 +01:00
Miloslav Číž
5c8f491441 move animation disabling code to a better place 2017-10-28 18:46:52 +02:00
scrawl
9c9da7b49f
Merge pull request #1527 from drummyfish/master 
Remove redundant condition
 2017-10-28 15:59:35 +00:00
Miloslav Číž
f9c396e0ea stop landing animation when turning 2017-10-28 15:48:07 +02:00
David Cernat
b7e5e77166 [Server] Fix getCaseInsensitiveFilename, simplify Players.size() 2017-10-28 03:58:53 +03:00
David Cernat
378d30834b [Server] Add special error handler for Sol back in, but only for Windows 2017-10-28 01:44:02 +03:00
Koncord
14d47213ef [Server] Add Players.size() to Lua API 2017-10-28 02:34:45 +08:00
Miloslav Číž
03401bb5df remove redundant condition 2017-10-27 20:19:20 +02:00
Koncord
3495fd43f4 [Client] Add network statistics (CTRL+F2) 2017-10-28 00:39:46 +08:00
Koncord
e7a5919477 [Server] Fix path to native libs 2017-10-27 20:58:02 +08:00
Koncord
1aa630e4a9 [Server] Add StackWalker for Windows 2017-10-27 05:27:07 +08:00
Koncord
e8915f8ec5 [Client] Fix build 2017-10-27 01:33:01 +08:00
Koncord
14fdec2478 [Server] Add forgotten stacktrace.cpp 2017-10-26 23:24:35 +08:00
David Cernat
b801cf2c9e Merge pull request #327 from TES3MP/master 
Add master commits up to 26 Oct 2017
 2017-10-26 17:34:00 +03:00
David Cernat
37304655da Merge pull request #326 from OpenMW/master 
Add OpenMW commits up to 25 Oct 2017
 2017-10-26 17:28:56 +03:00
David Cernat
878294e4fe Merge branch 'new-script-api' of https://github.com/TES3MP/openmw-tes3mp into new-script-api 2017-10-26 17:25:53 +03:00
Bret Curtis
d19839a666 standerdise on 3.1.0 2017-10-25 21:55:58 +02:00
scrawl
ae14aa0c84 Merge pull request #1522 from AnyOldName3/yet-another-cmake-fix 
Ensure the git-version target puts the version file in the appropriate directory/ies
 2017-10-25 13:58:04 +00:00
scrawl
90f4e9530a Merge pull request #1517 from ace13/update-osg 
Updating OSG packages to 3.4.1
 2017-10-25 13:49:55 +00:00
Koncord
d44848ecbb [Server] Fix build 2017-10-25 16:05:45 +08:00
Koncord
05abb8ace3 [Server] Add Log level constants to lua 2017-10-25 15:22:07 +08:00
Koncord
04a844a9c0 [Server] Use sol's default_handler 2017-10-25 15:21:11 +08:00
Koncord
dad0b38f25 [Server] Add custom terminate handler with stacktrace 2017-10-25 14:45:36 +08:00
Koncord
a3d5fbbdcd [Server] Add stacktrace 2017-10-25 14:45:36 +08:00
Koncord
916ada108f [General] Modernize Log utility 
* Reverse Log levels
* Add LOG_TRACE
* Spawn instance of Log in Get() function
 2017-10-25 14:45:36 +08:00
AnyOldName3
c1a871ff1f Make indentation consistent. 2017-10-24 23:31:40 +01:00
AnyOldName3
daf7d8451c Switch to a more reliable method of passing the git-version targt the data it needs 2017-10-24 23:29:18 +01:00
AnyOldName3
e3142b9643 Add missing variables to those forwarded to the git-version target 2017-10-24 23:10:50 +01:00
scrawl
4a7be0ffda Don't reset journal index to a lower value (Fixes #4172) 2017-10-24 20:02:35 +00:00
David Cernat
bece095579 [Server] Add getCaseInsensitiveFilename script function back in 2017-10-24 20:25:02 +03:00
David Cernat
d6dc75e94b Merge branch 'new-script-api' of https://github.com/TES3MP/openmw-tes3mp into new-script-api 2017-10-24 19:45:16 +03:00
David Cernat
76a4abd7c0 Merge pull request #325 from TES3MP/master while resolving conflicts 
# Conflicts:
#	apps/openmw-mp/processors/player/ProcessorPlayerTopic.hpp
 2017-10-24 19:45:11 +03:00
David Cernat
dd25c7db4e Merge pull request #324 from OpenMW/master 
Add OpenMW commits up to 24 Oct 2017
 2017-10-24 19:36:14 +03:00
David Cernat
a94d4ce6f5 Merge pull request #323 from TES3MP/0.6.1 
Add hotfix commit for 0.6.1 from 23 Oct 2017
 2017-10-24 19:34:34 +03:00
scrawl
4437a72e47 Merge pull request #1519 from drummyfish/rainfix 
fix rain ripple regression (bug #4169)
 2017-10-24 15:31:16 +00:00