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
dd6ebdeb4f
formated C string to C++
2016-08-18 08:44:47 +08: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
Koncord
1537fdbb76
Add SetLevel function & Verbose log level
2016-08-18 07:57:11 +08:00
Koncord
554810fbeb
Removed redundant const in headerSize()
2016-08-18 07:42:08 +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
341e3846c0
Use initial particle state to compute the initial bounding box ( Fixes #3500 )
2016-08-16 23:28:03 +02: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
b26478b860
Merge pull request #1028 from kpp/find_osg_plugins
...
Find osg_plugins
2016-08-16 17:05:44 +02:00
scrawl
ec14fe4d4c
Merge pull request #1026 from kpp/find_sphinx
...
Fix FindSphinx.cmake
2016-08-16 16:49:43 +02:00
scrawl
46d3845fb3
Merge pull request #1027 from kpp/find_sdl2
...
Find sdl2
2016-08-16 16:49:23 +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
Roman Proskuryakov
0d83121a6f
Removes unused FindPkgMacros
2016-08-16 06:06:30 +03:00
Roman Proskuryakov
95dc1258d6
Rewrites find_package for OpenSceneGraph plugins using LibFindMacros and osg_find_library
2016-08-16 06:06:30 +03:00
Roman Proskuryakov
ed2c2170f0
Rewrites FindSDL2 using LibFindMacros
2016-08-15 23:57:39 +03:00
Roman Proskuryakov
3df57b1833
Fixes LibFindMacros for libfind_process
2016-08-15 23:55:53 +03:00
Roman Proskuryakov
9d51e1966f
Rename SDL_SDK -> SDL2DIR as it is said in FindSDL2 documentation
2016-08-15 23:55:53 +03:00
Roman Proskuryakov
2311969f05
Reduce the number of copypaste in FindSphinx.cmake
2016-08-15 22:29:07 +03:00
Aesylwinn
7125775648
Change free axis rotation.
2016-08-15 15:07:43 -04:00
scrawl
dae4a8353a
Merge pull request #1024 from kpp/kpp_travis_improvements
...
Improve Travis config
2016-08-15 20:05:33 +02: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
David Cernat
fc54f12b31
Merge branch 'OpenMW-master'
2016-08-15 19:16:01 +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
Roman Proskuryakov
f4f81a14c9
Use Travis addons.apt.packages to install packages
2016-08-15 18:45:29 +03: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