1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 13:49:55 +00:00
Commit graph

12846 commits

Author SHA1 Message Date
David Cernat
d830937f4e Fix typo in method name "getGUIConroller" 2016-08-24 04:48:35 +03:00
David Cernat
f93e382b8b Use tes3mp icon for executable, part 2 2016-08-24 04:01:05 +03:00
David Cernat
5385563972 Let players inform others about Lua script-induced cell & pos changes 2016-08-24 02:53:39 +03:00
David Cernat
d24b4d0a2d Disable New, Save and Load buttons in main menu 2016-08-24 00:46:32 +03:00
David Cernat
7b187d0295 Fix visual glitch when jumping without adjusting camera afterwards 2016-08-23 22:27:12 +03:00
Allofich
7db31ab58a Correct telekinesis glow length 2016-08-24 01:21:15 +09:00
scrawl
346f5a19a3 Merge pull request #1029 from Allofich/anim
Improvements for playgroup and loopgroup
2016-08-23 14:14:36 +02:00
Allofich
9b0e5d6b59 Loop mid-animation idles when loading a save game 2016-08-23 19:50:56 +09:00
Koncord
fc4d8b82fb Stubs for minimap 2016-08-23 11:11:25 +08:00
David Cernat
7691bcc958 Add server script callbacks for attribute and skill changes 2016-08-23 03:04:22 +03:00
David Cernat
03d6e0cb62 Send attributes and skills to server whenever they change 2016-08-23 02:24:10 +03:00
David Cernat
ce5553cda6 Get hand-to-hand attack victim's stats if there actually is a victim 2016-08-23 01:23:09 +03:00
scrawl
0fd810707e Remove unused stopLooping() 2016-08-22 23:33:26 +02:00
scrawl
b0dc625b18 Run setLoopingEnabled after the anim queue is updated 2016-08-22 23:33:24 +02:00
scrawl
719e884b7c Remove duplicate code 2016-08-22 23:25:00 +02:00
scrawl
0c9882956a Add AnimState::shouldLoop() 2016-08-22 23:25:00 +02:00
scrawl
6450c9be27 Simplify condition 2016-08-22 23:22:58 +02:00
Allofich
bf9dc45b2b Emulate vanilla animation loops more closely 2016-08-23 01:42:36 +09:00
David Cernat
c4f49e05e3 Remove manual newlines for logger 2016-08-19 07:54:10 +03:00
Koncord
78210ab8ce rename openmw-mp to tes3mp-server 2016-08-19 09:38:33 +08:00
Koncord
b67789aa6a Rename openmw to tes3mp 2016-08-19 09:38:06 +08:00
Koncord
90215f4e7c Fix log messages for GCC compatibility 2016-08-19 09:37:24 +08:00
Koncord
d3c9864fb0 Fix maximum connections 2016-08-19 08:18:25 +08:00
David Cernat
e1955b440f Fix player initialization on server 2016-08-19 03:11:03 +03:00
David Cernat
cba01af683 Log player initialization on server 2016-08-19 01:32:39 +03:00
David Cernat
2337a0becb Add LOG_APPEND method for writing to log without timestamp and level 2016-08-18 23:17:46 +03:00
David Cernat
f4744f8547 Add additional log info 2016-08-18 22:29:54 +03:00
David Cernat
97f944dde7 Use logger for most console messages 2016-08-18 20:20:17 +03:00
Aesylwinn
91fd966146 Fix some issues detected by coverity for the editor. 2016-08-18 12:42:35 -04:00
Allofich
b332a13b4e Don't restart looped animations on repeated calls 2016-08-18 23:23:38 +09:00
David Cernat
a36c20eaae Reduce server console spam 2016-08-18 16:13:04 +03:00
David Cernat
436548413e Resolve conflicts in pull request #39
# Conflicts:
#	CMakeLists.txt
2016-08-18 15:10:52 +03:00
Marc Zinnschlag
2fef8948f1 Merge remote-tracking branch 'aesylwinn/InstanceRotateAndScale' 2016-08-18 09:13:43 +02:00
David Cernat
a2dbeb6c95 Share skills and attributes correctly upon logging in, and fix grammar 2016-08-18 05:21:25 +03:00
Koncord
35991fcd15 Add logger to client 2016-08-18 07:58:37 +08:00
Koncord
7f8c0ecbbd Logging in file for server 2016-08-18 07:58:09 +08:00
David Cernat
c94f818478 Add script functions for getting attributes and skills by their names 2016-08-18 00:55:35 +03:00
David Cernat
41868cc9cc Add script functions for getting attributes and skills by their IDs 2016-08-18 00:13:45 +03:00
David Cernat
e5cb58e7c4 Add debug info about ID_GAME_BASE_INFO packets 2016-08-17 21:18:04 +03:00
David Cernat
8eda381016 Make formatting consistent, part 2 2016-08-17 18:20:36 +03:00
David Cernat
1363c4c5b6 Make formatting consistent 2016-08-17 18:04:35 +03:00
David Cernat
1bbd7c271f Add fail-safes to DedicatedPlayer cell updating to narrow down problems 2016-08-17 07:27:40 +03:00
David Cernat
e39b66af4f Move logger to components 2016-08-17 06:15:44 +03:00
David Cernat
38c8d2344b Uncomment sending of stats packets to and from new players 2016-08-17 04:52:15 +03:00
David Cernat
aa69c156c7 Fix race-related graphical glitches when players spawn 2016-08-17 01:06:50 +03:00
Koncord
a840d84b39 Merged branch master into master 2016-08-17 05:53:09 +08:00
Koncord
ee8d9895dc Porting Log.cpp to C++98 2016-08-17 05:52:40 +08:00
scrawl
dda5bfbc9f CharacterPreview no longer depends on osgViewer 2016-08-16 22:47:45 +02:00
scrawl
8bfcf259a3 LocalMap no longer depends on osgViewer 2016-08-16 22:37:44 +02:00
scrawl
b2ae45f0eb Remove unneeded setGraphicsContext() calls 2016-08-16 19:33:09 +02:00
scrawl
0209c70583 Improve performance by skipping update if transform is unchanged 2016-08-16 17:50:59 +02:00
scrawl
4751e0e953 Improve performance of animateCollisionShapes by caching the node path 2016-08-16 17:50:59 +02:00
scrawl
8a4722cb84 Revert "animateCollisionShape checks if the shape is really animated"
This reverts commit cbf344663f.

Doesn't work correctly because the Animation delays the assignment of the UpdateCallbacks until the animation starts. The commit broke the animation of in_dagoth_bridge00
2016-08-16 17:50:59 +02:00
scrawl
3ef9b3f44d Merge pull request #1025 from Allofich/anim
Use loopfallback for idle animation groups
2016-08-16 16:30:55 +02:00
Aesylwinn
7125775648 Change free axis rotation. 2016-08-15 15:07:43 -04:00
Allofich
c05782581e Account for all instances of play() 2016-08-16 02:52:55 +09:00
David Cernat
3c6710a7b5 Merge pull request #35 from OpenMW/master
Add OpenMW commits from 2nd week of August
2016-08-15 19:21:09 +03:00
Allofich
6163c7bb03 Use loopfallback for idle animation groups 2016-08-16 01:15:26 +09:00
David Cernat
d9cfd5bac2 Resolve conflicts with OpenMW 2016-08-15 19:14:13 +03:00
scrawl
641005b317 Remove Camera's children before removing the Camera
Should work around OSG race condition ( http://forum.openscenegraph.org/viewtopic.php?t=16077 )
2016-08-15 18:12:46 +02:00
Koncord
a92ef8b6bd Some fixes 2016-08-15 22:49:34 +08:00
scrawl
a44ba0e461 Merge pull request #966 from kpp/find_mygui
Find mygui
2016-08-15 16:36:48 +02:00
Koncord
e9ee9c8b3b Remove C++11 in Log.h 2016-08-15 21:45:49 +08:00
Koncord
b3320c7bb9 Add forgoten ctime header 2016-08-15 21:35:29 +08:00
Koncord
8d88381dac added prefix LOG_ to loglevel 2016-08-15 21:33:18 +08:00
Koncord
170455e08a Fix headers 2016-08-15 21:15:36 +08:00
Roman Proskuryakov
4cffdb67d8 Uses case-sensitive MyGUI_* variables 2016-08-15 15:59:02 +03:00
Koncord
c695923825 Added master server stuff 2016-08-15 07:48:55 +08:00
Koncord
02a447c589 Added logger 2016-08-15 07:45:42 +08:00
Aesylwinn
3e4ac0c662 Potential fix for context sensitive select mode issues. 2016-08-14 14:43:29 -04:00
scrawl
71f786ff84 Delete the WorkQueue first
Fixes a potential crash on exit.
2016-08-14 18:10:29 +02:00
scrawl
3732979eec Revert "Merge pull request #993 from mrcheko/pathfinding"
This reverts commit 5190275b37, reversing
changes made to d7845012bf.
2016-08-14 18:04:33 +02:00
scrawl
c3340ec143 Merge pull request #1022 from Allofich/anim
Make loopgroup loop correct number of times
2016-08-14 17:02:38 +02:00
scrawl
1edcea2ff5 Merge pull request #1023 from psi29a/small_fixes
small fixes
2016-08-14 16:49:26 +02:00
scrawl
30b549124e Fix use-after-free 2016-08-14 16:42:29 +02:00
scrawl
c65492193c Use osg::clone 2016-08-14 16:41:44 +02:00
scrawl
0fbc0d0da7 Attempt to silence warning 2016-08-14 16:41:17 +02:00
Bret Curtis
0547d4b937 clang says that these must be in the MWWorld namespace 2016-08-14 16:17:09 +02:00
scrawl
8c44334409 Merge pull request #1021 from Allofich/weight
Corrections to tooltip displays of zero-weight items
2016-08-14 15:14:58 +02:00
scrawl
2f6075329b Clang warning fixes 2016-08-14 15:10:50 +02:00
Allofich
a381a15b19 Make loopgroup loop correct number of times 2016-08-14 21:57:06 +09:00
Allofich
7bf04b5014 Allow showing value of zero-weight lights 2016-08-14 21:15:22 +09:00
Allofich
502a26a7ff Use getWeightString() to avoid casting to int 2016-08-14 19:38:53 +09:00
Allofich
4f5d676b4e Allow weight tooltips for gold and keys if not 0 2016-08-14 19:32:43 +09:00
Allofich
caf025f93d Don't show 0 weight tooltips except for potions 2016-08-14 19:27:59 +09:00
Allofich
cf7278f8ae Don't show weight tooltip for 0-weight equipment 2016-08-14 18:37:41 +09:00
Allofich
ee2702087c Make zero-weight boots play light boot footsteps 2016-08-14 17:27:47 +09:00
scrawl
f3f02fe154 Merge pull request #1019 from Allofich/bound
Don't allow re-casting of bound equipment spells
2016-08-13 21:02:32 +02:00
Allofich
d617651307 Don't allow re-casting of bound equipment spells 2016-08-14 02:05:23 +09:00
Aesylwinn
101c3cc90d Rotate around center of selection. 2016-08-12 17:12:10 -04:00
Aesylwinn
571969cd65 Scale from center of selection. 2016-08-12 17:11:37 -04:00
MiroslavR
ddbfe0c944 Fix disabled door markers appearing on the map (Fixes #3348) 2016-08-12 03:14:36 +02:00
Aesylwinn
388917df89 Base editor rotate/scale commit. 2016-08-10 19:31:34 -04:00
Allofich
cb9bb92b26 Play locked sounds on locked objects instead of actors 2016-08-10 21:31:14 +09:00
Allofich
83b715734f Move part of addGlow() to addSpellCastGlow() 2016-08-10 02:52:43 +09:00
Allofich
1c76c93ed8 Use raw pointer to node in glowupdater 2016-08-10 01:35:22 +09:00
Allofich
67f31d948e Add removeTexture method 2016-08-10 01:11:14 +09:00
Allofich
4b9aff7a03 Glowupdater fix when using shaders 2016-08-10 00:43:14 +09:00
Allofich
9b2cb2fb8c Cleanups 2016-08-10 00:25:33 +09:00
Allofich
775162ccdf Rewrite spell glow implementation 2016-08-09 22:56:53 +09:00