Commit Graph

16914 Commits (436548413eca8312cef618ac121d84ef68988aca)
 

Author SHA1 Message Date
David Cernat 436548413e Resolve conflicts in pull request #39
# Conflicts:
#	CMakeLists.txt
8 years ago
Marc Zinnschlag 2fef8948f1 Merge remote-tracking branch 'aesylwinn/InstanceRotateAndScale' 8 years ago
David Cernat a2dbeb6c95 Share skills and attributes correctly upon logging in, and fix grammar 8 years ago
Koncord dd6ebdeb4f formated C string to C++ 8 years ago
Koncord 35991fcd15 Add logger to client 8 years ago
Koncord 7f8c0ecbbd Logging in file for server 8 years ago
Koncord 1537fdbb76 Add SetLevel function & Verbose log level 8 years ago
Koncord 554810fbeb Removed redundant const in headerSize() 8 years ago
David Cernat c94f818478 Add script functions for getting attributes and skills by their names 8 years ago
David Cernat 41868cc9cc Add script functions for getting attributes and skills by their IDs 8 years ago
David Cernat e5cb58e7c4 Add debug info about ID_GAME_BASE_INFO packets 8 years ago
David Cernat 8eda381016 Make formatting consistent, part 2 8 years ago
David Cernat 1363c4c5b6 Make formatting consistent 8 years ago
David Cernat 1bbd7c271f Add fail-safes to DedicatedPlayer cell updating to narrow down problems 8 years ago
David Cernat e39b66af4f Move logger to components 8 years ago
David Cernat 38c8d2344b Uncomment sending of stats packets to and from new players 8 years ago
David Cernat aa69c156c7 Fix race-related graphical glitches when players spawn 8 years ago
Koncord a840d84b39 Merged branch master into master 8 years ago
Koncord ee8d9895dc Porting Log.cpp to C++98 8 years ago
scrawl 341e3846c0 Use initial particle state to compute the initial bounding box (Fixes #3500) 8 years ago
scrawl dda5bfbc9f CharacterPreview no longer depends on osgViewer 8 years ago
scrawl 8bfcf259a3 LocalMap no longer depends on osgViewer 8 years ago
scrawl b2ae45f0eb Remove unneeded setGraphicsContext() calls 8 years ago
scrawl 0209c70583 Improve performance by skipping update if transform is unchanged 8 years ago
scrawl 4751e0e953 Improve performance of animateCollisionShapes by caching the node path 8 years ago
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
8 years ago
scrawl b26478b860 Merge pull request #1028 from kpp/find_osg_plugins
Find osg_plugins
8 years ago
scrawl ec14fe4d4c Merge pull request #1026 from kpp/find_sphinx
Fix FindSphinx.cmake
8 years ago
scrawl 46d3845fb3 Merge pull request #1027 from kpp/find_sdl2
Find sdl2
8 years ago
scrawl 3ef9b3f44d Merge pull request #1025 from Allofich/anim
Use loopfallback for idle animation groups
8 years ago
Roman Proskuryakov 0d83121a6f Removes unused FindPkgMacros 8 years ago
Roman Proskuryakov 95dc1258d6 Rewrites find_package for OpenSceneGraph plugins using LibFindMacros and osg_find_library 8 years ago
Roman Proskuryakov ed2c2170f0 Rewrites FindSDL2 using LibFindMacros 8 years ago
Roman Proskuryakov 3df57b1833 Fixes LibFindMacros for libfind_process 8 years ago
Roman Proskuryakov 9d51e1966f Rename SDL_SDK -> SDL2DIR as it is said in FindSDL2 documentation 8 years ago
Roman Proskuryakov 2311969f05 Reduce the number of copypaste in FindSphinx.cmake 8 years ago
Aesylwinn 7125775648 Change free axis rotation. 8 years ago
scrawl dae4a8353a Merge pull request #1024 from kpp/kpp_travis_improvements
Improve Travis config
8 years ago
Allofich c05782581e Account for all instances of play() 8 years ago
David Cernat 3c6710a7b5 Merge pull request #35 from OpenMW/master
Add OpenMW commits from 2nd week of August
8 years ago
David Cernat fc54f12b31 Merge branch 'OpenMW-master' 8 years ago
Allofich 6163c7bb03 Use loopfallback for idle animation groups 8 years ago
David Cernat d9cfd5bac2 Resolve conflicts with OpenMW 8 years ago
scrawl 641005b317 Remove Camera's children before removing the Camera
Should work around OSG race condition ( http://forum.openscenegraph.org/viewtopic.php?t=16077 )
8 years ago
Roman Proskuryakov f4f81a14c9 Use Travis addons.apt.packages to install packages 8 years ago
Koncord a92ef8b6bd Some fixes 8 years ago
scrawl a44ba0e461 Merge pull request #966 from kpp/find_mygui
Find mygui
8 years ago
Koncord e9ee9c8b3b Remove C++11 in Log.h 8 years ago
Koncord b3320c7bb9 Add forgoten ctime header 8 years ago
Koncord 8d88381dac added prefix LOG_ to loglevel 8 years ago