David Cernat
79c561057c
Merge pull request #59 from OpenMW/master
...
Add OpenMW commits up to 18 Sep
2016-09-19 02:47:09 +03:00
scrawl
cd4b182091
Merge pull request #1051 from Allofich/textures
...
Use spell effect particle textures
2016-09-18 22:37:14 +02:00
Allofich
a8e9f2df67
Cleanup
2016-09-19 05:20:04 +09:00
Koncord
96e2d749c7
New auth protocol
2016-09-18 11:55:51 +08:00
Koncord
9bcca6d141
Init PacketLoaded in PacketsController
2016-09-18 11:55:51 +08:00
Koncord
fe370fa995
Add PacketLoaded
2016-09-18 11:55:51 +08:00
David Cernat
68f974d999
Merge pull request #57 from OpenMW/master
...
Add OpenMW commits up to 17 Sep
2016-09-17 21:31:51 +03:00
Allofich
be96ff1fd1
Remove redundant parameter
2016-09-18 01:57:47 +09:00
scrawl
8f5347b79b
Update comment, osgAnimation::RigGeometry is no longer used
2016-09-17 18:31:39 +02:00
David Cernat
cdada00a8a
Merge pull request #56 from OpenMW/master
...
Add OpenMW commits up to 15 Sep
2016-09-15 22:19:02 +03:00
MiroslavR
55e670c5fe
Fix animation state not saving
...
References with animation state changed but otherwise identical to their content file counterparts
were previously considered unchanged and thus dropped while saving.
2016-09-15 16:11:54 +02:00
David Cernat
3b7693c719
Resolve conflicts in pull request #55
...
# Conflicts:
# README.md
# apps/openmw/mwclass/npc.cpp
# apps/openmw/mwmechanics/combat.cpp
2016-09-15 08:49:57 +03:00
Allofich
a033ba3bd2
Override spell textures by NiTexturingProperty
2016-09-14 23:03:04 +09:00
emlai
fd2281e825
Fix typo
2016-09-10 21:25:28 +03:00
Koncord
5eaad1b92e
again fix headerSize
2016-09-04 18:38:49 +08:00
David Cernat
81999a8179
Remove outdated ID_GAME_UPDATE_SKILLS packet, part 2
2016-09-02 07:58:20 +03:00
David Cernat
8abef0bebe
Remove outdated ID_GAME_UPDATE_SKILLS packet
2016-09-02 07:36:39 +03:00
David Cernat
970e9aff2f
Remove old class methods and don't include class in ID_GAME_BASE_INFO
2016-09-02 03:45:43 +03:00
David Cernat
e9dce26f38
Resolve conflicts in pull request #50
...
# Conflicts:
# CMakeLists.txt
2016-08-31 07:28:32 +03:00
David Cernat
a20e7890a2
Fix formatting
2016-08-30 10:52:30 +03:00
Koncord
cf1a0113a1
Time API
2016-08-30 13:24:42 +08:00
Koncord
e7deff09d9
Update version
2016-08-30 11:27:03 +08:00
Koncord
3405e36ce4
Woops part 2
2016-08-29 22:59:04 +08:00
Koncord
118ab32c9b
Woops
2016-08-29 21:03:04 +08:00
Koncord
a661de2a84
PacketClass
2016-08-29 21:01:23 +08:00
Koncord
2054baf7d3
Simplified PacketsController
2016-08-29 20:28:56 +08:00
scrawl
4322e76cb6
Fix shadowing warnings
2016-08-29 12:38:24 +02:00
scrawl
a5da3a269e
Fix shadowing warnings
2016-08-29 12:20:00 +02:00
Koncord
a03c2f5019
Now server & client sensitive to version
2016-08-27 15:36:22 +08:00
David Cernat
4d2ca20445
Resolve conflicts in pull request #43
...
# Conflicts:
# README.md
2016-08-24 22:03:35 +03:00
scrawl
c968ebee96
Merge pull request #1033 from Allofich/warnings
...
Remove unnecessary destructor
2016-08-22 14:44:57 +02:00
Allofich
73463cd12f
Remove unnecessary virtual destructor
2016-08-22 21:34:57 +09:00
scrawl
f92560986e
Merge pull request #1031 from kpp/fix_uninitiaized_escape_hash_filter
...
Fix uninitialized escape_hash_filter
2016-08-21 22:56:31 +02:00
Allofich
8c5aae0722
Add virtual destructors
2016-08-21 18:31:46 +09:00
Roman Proskuryakov
416466e53e
Fix uninitialized escape_hash_filter
2016-08-19 21:13:38 +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
535731c018
Fix month in logger
2016-08-18 18:38:24 +03:00
David Cernat
436548413e
Resolve conflicts in pull request #39
...
# Conflicts:
# CMakeLists.txt
2016-08-18 15:10:52 +03:00
Koncord
dd6ebdeb4f
formated C string to C++
2016-08-18 08:44:47 +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
8eda381016
Make formatting consistent, part 2
2016-08-17 18:20:36 +03:00
David Cernat
e39b66af4f
Move logger to components
2016-08-17 06:15:44 +03: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
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
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
scrawl
a44ba0e461
Merge pull request #966 from kpp/find_mygui
...
Find mygui
2016-08-15 16:36:48 +02:00
Roman Proskuryakov
4cffdb67d8
Uses case-sensitive MyGUI_* variables
2016-08-15 15:59:02 +03:00