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
Koncord
32a2327f59
fix header size
2016-08-15 07:52:54 +08:00
scrawl
513e1da8a3
Remove unneeded casts
2016-08-14 16:44:11 +02:00
scrawl
33d27a2285
Use ref_ptr
2016-08-14 16:41:33 +02:00
scrawl
2f6075329b
Clang warning fixes
2016-08-14 15:10:50 +02:00
David Cernat
babba95413
Merge pull request #34 from OpenMW/master
...
Add OpenMW commits from 1st week of August
2016-08-08 15:53:56 +03:00
scrawl
46538b9438
Merge pull request #1011 from devnexen/master
...
Mainly making compilable under OpenBSD.
2016-08-07 20:34:03 +02:00
Marc Zinnschlag
aa1ed9b172
Merge remote-tracking branch 'aesylwinn/RenderWater'
2016-08-07 17:03:58 +02:00
David Carlier
83bab29e4b
Mainly making compilable under OpenBSD.
...
Renaming one resource file as the space led to issue for qt/moc.
2016-08-06 19:00:27 +01:00
Koncord
1022b6b27c
Fix a header size
2016-08-06 03:28:01 +08:00
Aesylwinn
5753f52b47
Move water mesh + simple state generation to components library.
2016-08-05 13:25:05 -04:00
Koncord
7898b1181d
Reduced package size
2016-08-05 14:21:09 +08:00
David Cernat
8686b9cc12
Merge pull request #29 from OpenMW/master
...
Add OpenMW commits from end of July
2016-08-04 00:56:36 +03:00
MiroslavR
b65f379b7f
Save scripted animation state ( Fixes #1931 , #2150 , #3393 )
2016-08-03 03:52:35 +02:00
Koncord
ed3dc8ca7b
Reduced server dependings
2016-08-02 18:52:58 +08:00
Koncord
7107136808
New API
...
SetExterior(pid, x, y)
GetExteriorX(pid)
GetExteriorY(pid)
also "SetCell" will now move to the named external cells (e.g. SetCell(pid, "Balmora"))
2016-07-30 01:33:28 +08:00
Marc Zinnschlag
63fd1e8df7
Merge remote-tracking branch 'origin/master'
2016-07-27 15:49:11 +02:00
AnyOldName3
a0699ce20d
Change some <> characters to double quotes, resolving compilation problems.
2016-07-27 01:19:05 +01:00
AnyOldName3
20f73f4a32
Relocate escape-related code to new files escape.hpp and escape.cpp.
2016-07-27 00:58:31 +01:00
Koncord
1e3eff91ac
Merged branch tes3mp-gui into tes3mp-gui
2016-07-23 22:08:01 +08:00
Koncord
9ab77cb123
New API functions: MessageBox, CustomMessageBox, InputDialog
...
New Callback: OnGUIAction
2016-07-23 22:02:06 +08:00
Stanislav Zhukov
917fa63f5c
Fixed security issue
2016-07-23 17:14:54 +08:00
MiroslavR
d790747389
Implement deletion of moved references (Bug #3471 )
2016-07-22 01:59:02 +02:00
AnyOldName3
7243583963
Change a switch to a series of if/else if/.../else, hopefully resolving compilation issues on OSX and Linux.
2016-07-21 01:36:14 +01:00
AnyOldName3
2b829f7f7b
Move some stuff to a header, removing the need for a dodgy hack.
2016-07-21 01:07:25 +01:00
AnyOldName3
becc053555
Trick the software into building by using what I assume is a really dirty hack.
2016-07-21 00:16:00 +01:00
AnyOldName3
519fbab864
Remove useless print
2016-07-20 23:18:09 +01:00
AnyOldName3
32f0ded8f6
Fix bug in unescape filter, but still manage not to fix build issue.
2016-07-20 23:15:44 +01:00
AnyOldName3
423919abb5
Make it not build again (but theoretically enable the desired functionality).
2016-07-20 15:19:34 +01:00
AnyOldName3
59639e3988
Make it build again (but remove the new functionality).
2016-07-20 15:16:53 +01:00
AnyOldName3
d9d5a6561b
Adjust the code so that it should (maybe) work, changing the compilation error to a less straighforward one.
2016-07-20 14:50:34 +01:00
AnyOldName3
95d2c7ea5c
Attempt to unescape characters when constructing file paths, introducing compilation errors.
2016-07-20 02:48:57 +01:00
David Cernat
360eec30a0
Merge pull request #2 from OpenMW/master
...
Add recent OpenMW commits by AnyOldName3
2016-07-20 02:58:57 +03:00
Marc Zinnschlag
c17e1ca24a
Merge remote-tracking branch 'anyoldname3/ignore-hash-test'
2016-07-19 16:19:28 +02:00
Aesylwinn
b4a000913c
Merge remote-tracking branch 'yar/master' into Even
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwdialogue/filter.cpp
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwworld/localscripts.cpp
# components/CMakeLists.txt
# components/compiler/exprparser.cpp
# components/sceneutil/workqueue.cpp
2016-07-17 23:50:52 -04:00
davidcernat
7bf08e5e5a
Fix transition between exterior cells for non-local players
...
Make the local player send a packet whenever moving from one exterior cell to another, don't require objects to have RefNums to be moved correctly between exterior cells, and increase the packet priority for cell changes.
2016-07-17 22:03:20 +03:00
MiroslavR
721fa28c1e
Fix assertion failure with NiTextureEffect missing source texture
2016-07-16 18:59:18 +02:00
davidcernat
b7e377c636
Remove _boundingBoxComputed from sceneutil's riggeometry.cpp
...
Recent versions of OpenSceneGraph have no _boundingBoxComputed, which is why building TES3MP with them causes an error. As expected, recent versions of OpenMW do not use _boundingBoxComputed either.
2016-07-16 15:12:22 +03:00
AnyOldName3
f1b5ad5804
Remove unused unsafe function and properly remove inheritance from std::string, providing implementations of missing stream operators preventing boost reading and writing to escape strings.
2016-07-12 17:09:57 +01:00
GrimKriegor
ace719507c
Ported OpenMW's "Don't use unordered_map" commit to TES3MP to fix Issue #1
...
https://github.com/TES3MP/TES3MP/issues/1
2016-07-12 01:42:05 +01:00
AnyOldName3
e6f78ae5b7
Switch indentation to spaces to remain consistent with the rest of the project
2016-07-12 01:06:57 +01:00
AnyOldName3
08df463c94
Separate declaration and definition of some static members to hopefully calm Travis down.
2016-07-12 00:37:08 +01:00
AnyOldName3
7475d90693
Fix dodgy include by changing backslashes to forwardslashes
2016-07-12 00:14:19 +01:00
AnyOldName3
5121e77a95
Remove the cause of a warning which upset Travis (but not the thing that made the Travis build fail, as I have no idea why it wouldn't work or how to fix it
2016-07-12 00:00:29 +01:00
AnyOldName3
1a0642f1db
Make it work by realising that what boost::program_options calls validation is what any sane person would regard as parsing
2016-07-11 22:33:15 +01:00
AnyOldName3
195dd27780
Resolve obvious runtime error revealing more subtle one
2016-07-11 22:05:38 +01:00
MiroslavR
9c6739f1b3
Fix doubled particle spawn range
2016-07-11 22:40:58 +02:00
AnyOldName3
fbe6dc9704
Change compilation error to runtime exception and decide that inheriting from std::string may have been a bad idea in C++
2016-07-11 21:33:36 +01:00
AnyOldName3
7697406467
Partially fix '2 overloads have similar conversions' compilation error
2016-07-11 14:39:38 +01:00
AnyOldName3
2a9b12bb3f
Fix an issue preventing compilation, revealing another that doesn't make much sense.
2016-07-11 14:15:35 +01:00
AnyOldName3
c1ffc9e776
Remove a compilation error and set up framework to remove the others
2016-07-11 01:59:16 +01:00
AnyOldName3
e17e354e84
Make # only start a comment in openmw.cfg if it starts a line and introduct compilation errors
2016-07-11 01:16:32 +01:00
MiroslavR
2a987b6857
Do not skip inactive keyframe controllers (Bug #1942 )
2016-07-10 19:02:28 +02:00
