Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-09 05:08:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
64581 commits 25 branches 28 tags 1.2 GiB
Commit graph

221 commits

Author SHA1 Message Date
SamGondelman
4500ed17e7 merge from master 2018-02-13 13:58:39 -08:00
Elisa Lupin-Jimenez
a61021f46c
Merge pull request #12272 from elisa-lj11/2d-images 
2d images (JPG and PNG) are now supported as (quasi) entities
 2018-02-13 11:44:02 -08:00
SamGondelman
5337377ef5 Merge remote-tracking branch 'upstream/master' into decals 2018-02-09 14:40:20 -08:00
Seth Alves
14d8259a5e try harder to bump avatar-mixer protocol version 2018-02-05 11:54:48 -08:00
SamGondelman
4d4294dd6a Merge remote-tracking branch 'upstream/master' into decals 2018-02-02 16:50:01 -08:00
SamGondelman
d7f4b033e8 wip finish adding material entity 2018-02-02 16:49:33 -08:00
Elisa Lupin-Jimenez
3d000d3d01 changed packet number 2018-02-02 10:08:39 -08:00
Anthony J. Thibault
cd4d9255bd Added defaultPoseFlags to avatar protocol 
Change rotationSet to rotationIsDefaultPose for JointData
Also for translation.  Fixed all code to flip boolean value.
Created EntityJointData so that the ModelEntity stuff doesn't need to change.
 2018-01-19 15:34:27 -08:00
Dante Ruiz
b526842a46 Merge branch 'master' of github.com:highfidelity/hifi into soft-entities 2018-01-04 14:23:10 -08:00
Atlante45
294a7ca3c6 Make sure the protocol signature still changes 2018-01-04 13:15:01 -08:00
Dante Ruiz
30bbe6e41b added relayParentJoints property 2017-12-28 15:43:59 -08:00
Zach Fox
73eb258e79 IT'S WORKING!!! 2017-12-21 15:17:52 -08:00
SamGondelman
90d0e9dc32 bump protocol version 2017-12-18 18:35:15 -08:00
Anthony J. Thibault
fbcecbfc89 Merge branch 'master' into feature/domain-limited-height 2017-12-07 10:01:33 -08:00
Stephen Birarda
8978254037 kick logged in by fingerprint/ip if enabled in DS settings 2017-11-27 18:23:14 -08:00
Anthony J. Thibault
9f54ce55f3 Change domain setting from min/max avatar scale to min/max avatar height 
* Domain settings version has been bumped from version 2.0 to 2.1
* Old domain settings for avatar scale will be auto-converted to avatar height
* Avatar code has been changed so that limitDomainScale() works with the new height limits
* Avatar getUnscaledEyeHeight() was added to C++.
* MyAvatar.getHeight() was added to JS.
 2017-11-21 13:25:47 -08:00
Stephen Birarda
eedb77dae9 add clearing of known state if client resets ES connection 2017-11-16 11:40:35 -08:00
Nissim Hadar
03d2ca19b9 Moving consts into mode::Haze namespace. 2017-10-31 13:46:58 -07:00
divya
de4fd269ef
Merge pull request #11701 from birarda/bug/local-ds-inconnect 
only respond to expected ICE peers in DS
 2017-10-28 21:23:05 -07:00
Stephen Birarda
689828e3fa add packet version change for ICE ping change 2017-10-27 10:00:49 -07:00
Zach Fox
91333cdf7b Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-25 10:26:50 -07:00
ZappoMan
5901d1a311 clean up VERSION_ENTITIES stuff 2017-10-24 13:48:27 -07:00
ZappoMan
12c32d5834 bump protocol version 2017-10-24 13:08:48 -07:00
Daniela
832e30ad1c Edited Packet headers. 2017-10-19 19:53:47 +01:00
Zach Fox
3f0b08aea8 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-18 10:37:47 -07:00
Zach Fox
552defb418 Change protocol version 2017-10-16 11:23:34 -07:00
Nissim
0a5302ce25 Merge branch 'master' of https://github.com/highfidelity/hifi 2017-10-16 11:01:13 -07:00
Daniela
a46ef56af9 Merge with hifi:master. Packet Headers version were increased. 2017-10-10 17:26:33 +01:00
Stephen Birarda
72b23a0fbb update default avatar to be better with oculus grab triggers 2017-10-09 10:33:34 -07:00
Daniela
179a426389 Address QA comments. 2017-09-26 17:44:46 +01:00
Nissim Hadar
c4419fede8 Bumped up the version number. 2017-09-22 19:07:05 -07:00
Howard Stearns
7724fc204b working checkpoint 2017-09-22 14:19:54 -07:00
Daniela
d054c6dc36 Merge branch 'master' of https://github.com/highfidelity/hifi 2017-09-21 18:29:45 +01:00
Artur Gomes
b65520e788 Merge remote-tracking branch 'upstream/master' 2017-09-13 12:32:17 +01:00
Stephen Birarda
5e1decb02b Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake 2017-09-07 12:06:53 -07:00
Seth Alves
0855dfc1c6 PR-11290 didn't actually bump protocol version 2017-09-01 17:26:32 -07:00
Zach Fox
fdcc149c34 Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface 2017-08-30 13:27:18 -07:00
Daniela
58f0601af2 Fix identation. 2017-08-29 17:19:41 +01:00
Atlante45
eaa2b9fda8 Fix packet version conflict 2017-08-25 15:36:33 -07:00
Atlante45
348be788f7 Add BakingEnabled protocol 2017-08-25 10:56:27 -07:00
humbletim
9348048387 Merge remote-tracking branch 'upstream/master' into 21180-C++ 2017-08-24 16:23:47 -04:00
Zach Fox
2a75d97006 First steps 2017-08-22 12:56:16 -07:00
Artur Gomes
678dd5fbae Do not test! 
Add missing information to property.
 2017-08-16 18:33:43 +01:00
Delanir
e70303c53e Add the following items to the libraries/networking/src/udt/PacketHeaders.h and cpp files. 
add new value to the PacketVersion enum
in the versionForPacketType function, return the new version number when
packetType is EntityAdd, EntityEdit or EntityData.
 2017-08-16 18:28:50 +01:00
Stephen Birarda
db3524a48f add re-direct of get mapping for baked assets 2017-08-11 14:26:27 -07:00
Seth Alves
186035dc5d adjust various things that cause a crash-on-exit on Linux 2017-08-06 11:57:55 -07:00
Zach Fox
9147bc21d0 Getting there. 2017-07-26 11:41:27 -07:00
humbletim
d9de0a8687 bump AvatarMixer protocol version 2017-07-18 17:46:59 -04:00
Ryan Huffman
86ed61a15d Push avatar packet version for isReplicated 2017-06-23 14:26:13 -07:00
Stephen Birarda
6da5a63152 verify replicated packets in packet filter 2017-06-22 13:33:57 -07:00