Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
30443 commits 2 branches 0 tags 1.1 GiB
Commit graph

11829 commits

Author SHA1 Message Date
Stephen Birarda
998a8168a3 remove an extra unneeded message 2015-08-05 14:38:14 -07:00
Stephen Birarda
653e0d29c7 resolve conflicts on merge with upstream/core 2015-08-05 14:37:30 -07:00
Stephen Birarda
6c337b8aeb repairs for build type of glew external 2015-08-05 14:30:36 -07:00
bwent
8868148c94 Parital fix for padding error using RSA_sign and RSA_verify 2015-08-05 14:07:25 -07:00
Bradley Austin Davis
89cc2ccfa5 More merge comments 2015-08-05 13:53:19 -07:00
Bradley Austin Davis
649b9d6ce9 Fixing signed/unsigned comparisons 2015-08-05 13:48:05 -07:00
Brad Davis
754bf5c6f7 Merge pull request #5509 from birarda/core 
get GLEW for all platforms as external project
 2015-08-05 13:41:48 -07:00
Sam Gondelman
513c652ab3 merge from master and attempt to fix connexion conflicts 2015-08-05 12:42:39 -07:00
Stephen Birarda
cc909507f4 get GLEW for all platforms as external project 2015-08-05 12:34:11 -07:00
Anthony Thibault
49be7c49b7 Merge pull request #5506 from howard-stearns/smooth-faded-animations 
Smooth fading of animations in and out.
 2015-08-05 12:02:44 -07:00
Bradley Austin Davis
04d579be7a Removing integrated glew 2015-08-05 11:21:59 -07:00
Stephen Birarda
0fe3213d38 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2015-08-05 11:16:34 -07:00
Stephen Birarda
052978898e resolve conflicts on merge with upstream master 2015-08-05 11:16:20 -07:00
Howard Stearns
bb974edf7f Add assert on mix range. 2015-08-05 11:09:04 -07:00
Howard Stearns
f51b5be167 Simplify fade normalization, eliminating a loop. 2015-08-05 11:00:40 -07:00
Andrew Meadows
5be8583b7d Merge pull request #5494 from sethalves/gzip-json-entity-persist-files 
gzip json entity persist files
 2015-08-05 10:56:03 -07:00
Howard Stearns
653e46fdd3 const methods. 2015-08-05 10:51:26 -07:00
bwent
60fdc390c5 fix username signature not const 2015-08-05 10:42:10 -07:00
Atlante45
dfaa16d15c Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-08-05 10:39:02 -07:00
bwent
fc385d9bc1 debugging 2015-08-05 10:29:30 -07:00
Seth Alves
eb87023416 code review 2015-08-05 10:16:45 -07:00
Howard Stearns
2f2b59b6b6 Merge branch 'master' of https://github.com/highfidelity/hifi into smooth-faded-animations 2015-08-05 10:05:05 -07:00
samcake
6783ec300a Merge pull request #5499 from jherico/homer 
CORE PROFILE: Fix star point smoothing... sort of
 2015-08-04 20:15:09 -07:00
Howard Stearns
a1f86cc7b8 Make MSVC happy. 2015-08-04 19:49:12 -07:00
David Rowe
0c174e27c3 Merge branch 'master' into 20639 2015-08-04 18:36:53 -07:00
Seth Alves
80909b4531 work toward getting textures on polyvox entities 2015-08-04 17:53:47 -07:00
Seth Alves
56c0f9c814 work toward getting textures on polyvox entities 2015-08-04 17:37:15 -07:00
Bradley Austin Davis
fc5ec22810 Fix diagonal slashes in text 2015-08-04 17:28:42 -07:00
Howard Stearns
731bcba956 Merge branch 'master' of https://github.com/highfidelity/hifi into smooth-faded-animations 2015-08-04 17:27:23 -07:00
Seth Alves
419caccd8e unmangle merge 2015-08-04 17:06:17 -07:00
Howard Stearns
61198a658c Smooth fading of animations in and out. 
Also, turn on the secret rig animations from Javascript with MyAvatar.setEnableRigAnimations(true). (persists)
 2015-08-04 17:04:15 -07:00
Seth Alves
78091fd983 Merge branch 'master' of github.com:highfidelity/hifi into polyvox-render 2015-08-04 16:56:45 -07:00
Sam Gateau
730ad2da2f removing dead code 2015-08-04 16:37:01 -07:00
Sam Gateau
d2360d1406 Merge branch 'core' of https://github.com/highfidelity/hifi into punk 2015-08-04 16:31:33 -07:00
Sam Gateau
fc0ee28b84 FIx the mirror rendering bugs by replacing the prvious technique by a simple true mirror during the final blit for both rear view mirror and full screen mirror, not working for HMD 2015-08-04 16:31:20 -07:00
Stephen Birarda
7b8ca2c0f2 fix suppression of link saturation messages 2015-08-04 16:29:53 -07:00
Bradley Austin Davis
2221c839c3 Fix star point smoothing... sort of 2015-08-04 16:29:07 -07:00
samcake
59b69be251 Merge pull request #5501 from jherico/lisa 
CORE PROFILE: Working on HMD crash on mac
 2015-08-04 16:27:37 -07:00
Bradley Austin Davis
4f759ee46a Merge remote-tracking branch 'upstream/master' into core 2015-08-04 16:26:16 -07:00
Stephen Birarda
23e1ee71cc suppress writeDatagram errors for saturated links 2015-08-04 16:18:12 -07:00
Seth Alves
9171033f21 Merge branch 'master' of github.com:highfidelity/hifi into rig 2015-08-04 16:06:38 -07:00
Seth Alves
b318c1122c Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-04 16:00:27 -07:00
Seth Alves
fcec6cb1f0 Merge pull request #5464 from nnesse/master 
Remove redundant code in getOrCreateChildElementAt()
 2015-08-04 15:54:14 -07:00
Seth Alves
a218f0de83 Merge pull request #5483 from AndrewMeadows/caesium 
remove legacy shapes and friends
 2015-08-04 15:40:20 -07:00
Bradley Austin Davis
241ee00ca5 Working on HMD crash on mac 2015-08-04 15:18:01 -07:00
Eric Levin
f506e58687 Merge pull request #5490 from howard-stearns/restart-animations-at-specified-parameters 
restart animations at specified parameters
 2015-08-04 15:09:11 -07:00
Atlante45
01749ad0de TimeoutNAK fixes 2015-08-04 15:07:04 -07:00
Sam Gateau
79e4cdd514 Merge branch 'core' of https://github.com/highfidelity/hifi into punk 2015-08-04 14:55:00 -07:00
samcake
a2536c75f4 Merge pull request #5498 from jherico/lisa 
CORE PROFILE: Fix bug in lightmap and specular map fragment shaders
 2015-08-04 14:54:09 -07:00
Brad Davis
6d15a274a6 Merge pull request #5496 from samcake/daft 
CORE PROFILE: Removing the line width completely from gpu::lib
 2015-08-04 14:42:00 -07:00
Sam Gateau
10fcce7064 FIx again the issue of the COlor 32 format to NUINT8 2015-08-04 14:38:43 -07:00
Bradley Austin Davis
c454bc96a0 Fix bug in lightmap and specular map fragment shaders 2015-08-04 14:36:42 -07:00
Seth Alves
45643a3aad try, try again 2015-08-04 14:36:16 -07:00
Sam Gateau
0d727934bb Merge branch 'core' of https://github.com/highfidelity/hifi into punk 2015-08-04 14:27:30 -07:00
Seth Alves
a4bf169ade on windows, copy zlib dll next to programs that link with shared 2015-08-04 14:13:41 -07:00
Bradley Austin Davis
89aa596717 Fix white rendering of many primitives 2015-08-04 14:05:05 -07:00
Stephen Birarda
925cb4bd56 fix for slow start algo on loss 2015-08-04 12:48:58 -07:00
Sam Gateau
34183b9ddf COmmenting the remove of the glLIneWidth and demoving dead code 2015-08-04 12:36:35 -07:00
Stephen Birarda
3d0c71d95c remove a double on arrival time record 2015-08-04 12:29:22 -07:00
bwent
54dd5da64c To debug RSA padding error 2015-08-04 12:02:23 -07:00
bwent
af293ec6dd Fix DomainServerConnectionTOken packet writing/resetting 2015-08-04 12:02:23 -07:00
bwent
244cc016ab Generate session token UUIDs to be signed with username 2015-08-04 12:02:23 -07:00
Sam Gateau
d07ab353fc remove glLineWidth completely because it s not available anymore for wide lines in core 2015-08-04 11:57:20 -07:00
Seth Alves
ff477b35a8 fix zlib include directory 2015-08-04 11:33:39 -07:00
Seth Alves
dbda5ba40e change polyvox rendering 2015-08-04 11:26:29 -07:00
Stephen Birarda
52b1b647a2 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2015-08-04 10:51:23 -07:00
Bradley Austin Davis
3c76c0d4b6 Merge remote-tracking branch 'upstream/master' into core 2015-08-04 10:23:54 -07:00
Seth Alves
fb9fa76018 adjust comments 2015-08-04 08:26:28 -07:00
Seth Alves
5369f4c5eb adjust comments 2015-08-04 08:25:33 -07:00
Seth Alves
adcd91e3ff Added an option to domain-server settings to persist entities as gzipped json. With this setting enabled, persist files take much less space on disk than with the other two options. 2015-08-04 07:23:24 -07:00
Bradley Austin Davis
d415ee1f2e Case sensitivity breaking ubuntu 2015-08-04 01:08:52 -07:00
Bradley Austin Davis
7593a134db Moving oglplus to rely on glew on all platforms 2015-08-04 00:57:55 -07:00
Bradley Austin Davis
29c9e6e45e Updating plugins to core profile 2015-08-04 00:33:03 -07:00
Bradley Austin Davis
53ccbfc4fa Merge branch 'core' into plugins 2015-08-03 22:25:50 -07:00
David Rowe
b71ad31812 Merge branch 'master' into 20639 2015-08-03 20:53:12 -07:00
Stephen Birarda
a10746a448 set the max window size, correct a typo 2015-08-03 19:12:39 -07:00
Bradley Austin Davis
1a589160f4 Fixing the skinning shaders sizing problems 2015-08-03 18:44:51 -07:00
Atlante45
40520c204f Stats improvement 2015-08-03 17:39:09 -07:00
Atlante45
99fcb08fd1 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-08-03 17:15:12 -07:00
Atlante45
c0852f0eb2 Remove call to has pending datagrams 2015-08-03 17:14:42 -07:00
Howard Stearns
61afc362e7 For startAnimation (but not startAnimationByRole), use the specified parameters even if the animation 
was already playing.  This fixes the behavior exercised by the squeezeHands.js script.
Fixes https://app.asana.com/0/32622044445063/44025709513292
 2015-08-03 17:00:39 -07:00
Stephen Birarda
36a0ef50d4 add assert for BasePacket write, fix time in Connection 2015-08-03 16:21:17 -07:00
Howard Stearns
2e5142e9bb Fix end of idle. 2015-08-03 16:09:48 -07:00
Sam Gateau
44e7223547 Fixing the skinning by simply reverting the change to the format for the inSkinIndex 2015-08-03 16:05:04 -07:00
Stephen Birarda
acd7a7a732 fix send/process for ACK packets 2015-08-03 16:04:08 -07:00
ericrius1
12770edbe1 Merge branch 'master' into polyLineInProgress 2015-08-03 15:52:26 -07:00
ericrius1
94acb23f27 no longer redefining payloadRender method in effort to avoid linux build errors 2015-08-03 15:51:11 -07:00
Howard Stearns
cdb697760f Remove some debug. 2015-08-03 15:51:07 -07:00
Howard Stearns
4c1d1a65d5 Provide initial fight club animations and use them in rig. 
Still only active when you do Settings.setValue('enableRig', true) and restart.
(Will be more exposed after fadein/fadeout is implemented.)
 2015-08-03 15:41:15 -07:00
Stephen Birarda
b5ec02bd01 go back to previous PacketTimeWindow code 2015-08-03 15:36:08 -07:00
Stephen Birarda
d937cf1cc7 set RTT on congestion control in ctor 2015-08-03 15:05:41 -07:00
ericrius1
9125b3a2a9 attempting to fix windows and linux builds again 2015-08-03 14:53:02 -07:00
samcake
caa5732e06 Remove completely GL transform legacy support 2015-08-03 14:51:57 -07:00
Atlante45
8704f05812 Added UDTTest server stats 2015-08-03 14:40:18 -07:00
Atlante45
a1bd558d71 Safe locks 2015-08-03 14:39:51 -07:00
Atlante45
7bfc9f7fd1 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-08-03 14:34:54 -07:00
Stephen Birarda
20f33b3b64 fix sendqueue sleep timing to use microseconds 2015-08-03 14:34:12 -07:00
Sam Gateau
647abe5009 Replace the glCOlor4f by a glVertexAttribute4f on the color slot instead 2015-08-03 13:41:02 -07:00
Atlante45
f2b6db584a Fix list insert 2015-08-03 13:36:38 -07:00
Sam Gateau
f23df03ea9 REsolve the bracket issue, 2015-08-03 13:10:06 -07:00
samcake
32c253453b REsolving the input 2015-08-03 12:47:51 -07:00
ericrius1
e36099f2b6 fixing ambiguous "call to overloaded function compiler" errors on windows and linux builds 2015-08-03 12:31:21 -07:00
Atlante45
efb04fac21 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-08-03 12:12:45 -07:00
Atlante45
00ab4a58f3 Fix LossList::insert 2015-08-03 12:12:21 -07:00
Stephen Birarda
62d4467f41 use a vector for events in ConnectionStats 2015-08-03 12:09:25 -07:00
ericrius1
e4ff3fa9da corrected author name at top of PolyLineEntity.h file 2015-08-03 11:26:48 -07:00
ericrius1
98a5d1e759 fixed merge conflics in hit effect 2015-08-03 11:25:18 -07:00
Andrew Meadows
b00d47d62e merge master into cleanup of legacy shapes 2015-08-03 11:19:29 -07:00
samcake
d3fc05e99f FIxed a few shaders varyings, problem identified on MAC to be solved 2015-08-03 11:18:08 -07:00
Andrew Meadows
acfc907704 Merge pull request #5438 from howard-stearns/rig 
Rig: Bottleneck animation management through a Rig class
 2015-08-03 11:14:21 -07:00
Atlante45
e182bbbc1b Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-08-03 11:08:22 -07:00
Atlante45
de8f730f78 Fix connection stats error 2015-08-03 11:07:58 -07:00
Atlante45
f513a28953 Added better assert in LossList 2015-08-03 11:06:57 -07:00
Sam Gateau
785fd03085 Merge branch 'core' of https://github.com/highfidelity/hifi into punk 2015-08-03 10:26:06 -07:00
Stephen Birarda
ffb5fcee7b use nth element for median in PacketTimeWindow 2015-08-03 10:25:40 -07:00
samcake
85077604dc Merge pull request #5478 from jherico/marge 
CORE BRANCH - More shader fixes
 2015-08-03 10:25:33 -07:00
Sam Gateau
1a276924f0 Merging core 2015-08-03 10:05:23 -07:00
David Rowe
7749b912ea Merge branch 'master' into 20639 2015-08-03 09:55:35 -07:00
ericrius1
b2753507dc cleanup of comments and dead code 2015-08-03 09:35:47 -07:00
ericrius1
f50c482451 Merge branch 'master' into polyLineInProgress 2015-08-03 08:46:01 -07:00
ericrius1
47bc8f50ab cleaning 2015-08-03 08:45:14 -07:00
Howard Stearns
8f616c04fb Fix https://app.asana.com/0/32622044445063/43589567731045 2015-08-02 21:46:39 -07:00
Brad Davis
5c07a7d85b Merge remote-tracking branch 'upstream/master' into plugins 2015-08-01 21:58:05 -07:00
Brad Davis
53feaf2ab6 More shader fixes 2015-08-01 20:17:57 -07:00
Bradley Austin Davis
f19653f3e2 Integrate glew 2015-08-01 20:08:19 -07:00
Brad Davis
180f912924 Merge remote-tracking branch 'upstream/master' into core 
Conflicts:
	interface/src/ui/overlays/Circle3DOverlay.cpp
	libraries/gpu/src/gpu/Format.h
	libraries/render-utils/src/GeometryCache.cpp
	libraries/render-utils/src/Model.cpp
	libraries/render-utils/src/text/Font.cpp
 2015-08-01 20:01:59 -07:00
ZappoMan
493836e363 remove QUADS from GLBackendShared and Format 2015-08-01 17:26:38 -07:00
ZappoMan
b02f751830 diff redux 2015-08-01 16:53:35 -07:00
ZappoMan
b138c16c7f use Austins QUAD to TRIANGLE_STRIP approach 2015-08-01 16:50:36 -07:00
Brad Davis
b84eef93c9 Core profile shader work and test code 2015-08-01 14:43:52 -07:00
ZappoMan
05a4a6aa9b implement on-the-fly conversion of FBXMeshParts that are quads, into their triangle equivalents 2015-08-01 13:07:56 -07:00
ZappoMan
452225ddaf removed QUADS from Font::drawString() 2015-08-01 11:51:07 -07:00
ZappoMan
1dd6c1117d change GeometryCache::renderQuad() to use TRIANGLES as lower level render primitive 2015-08-01 11:29:28 -07:00
Seth Alves
dbca3fe2fb attempt to give polyvox its own rendering bung 2015-08-01 05:58:22 -07:00
Sam Gateau
6a8faca0ee Install the GLCore way of doing input without all the legacy stuff 2015-07-31 22:46:06 -07:00
Seth Alves
443b9e1e78 attempt to give polyvox its own rendering bung 2015-07-31 21:58:43 -07:00
Stephen Birarda
bc5ddd3837 send a light ACK every 64, not each after 64 2015-07-31 20:12:48 -07:00
Stephen Birarda
0c44fc53de fix for process of timeout NAKs 2015-07-31 19:45:43 -07:00
Stephen Birarda
7f8c993bd7 make send rate actually send rate, don't sync as sender 2015-07-31 19:42:27 -07:00
Stephen Birarda
74a2d985eb tell the send queue about ACKs on light ACK 2015-07-31 19:17:02 -07:00
Stephen Birarda
3833623cfe fix assert for control packet type 2015-07-31 18:41:46 -07:00
Atlante45
29b3051aeb Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-31 18:39:52 -07:00
Atlante45
ca342fb3b4 Fix std::find_if 2015-07-31 18:39:24 -07:00
Stephen Birarda
8bc94454b4 pre-increment the _currentACKSubSequenceNumber 2015-07-31 18:39:09 -07:00
Atlante45
8f54cd6f7e Fix find_if_not 2015-07-31 18:19:15 -07:00
Stephen Birarda
e74f47b64c use a list of pairs of pairs for ACK2 2015-07-31 18:13:11 -07:00
Howard Stearns
2713115336 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-31 18:05:47 -07:00
Howard Stearns
0dad1adf7d Speculative guard against crashing. 2015-07-31 18:05:14 -07:00
Atlante45
9537aea5c0 Fix nak timeout packet size 2015-07-31 17:31:30 -07:00
Stephen Birarda
41c6220731 resolve conflicts on merge with upstream/master 2015-07-31 17:27:23 -07:00
Stephen Birarda
ea5da73683 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-31 17:19:23 -07:00
Stephen Birarda
df1e97c591 cleanup RTT stats, add assert for CT 2015-07-31 17:19:14 -07:00
Atlante45
2946cb7ed5 Collapse ControlPacket ctors 2015-07-31 17:15:10 -07:00
Stephen Birarda
0e3403833d make capacitySpeedDelta a double 2015-07-31 17:00:53 -07:00
Atlante45
cba51ac63d Fix congestion control 2015-07-31 16:53:43 -07:00
Stephen Birarda
15ce9aabc5 don't assert on moved CC 2015-07-31 16:52:59 -07:00
Stephen Birarda
fa6628e7eb make sure we init CongestionControl 2015-07-31 16:52:09 -07:00
Stephen Birarda
84b8fc9f06 fix casing of onACK method in CC 2015-07-31 16:41:22 -07:00
Stephen Birarda
9b6c8bcf77 update EWMA for delivery rate and bandwidth 2015-07-31 16:37:38 -07:00
Stephen Birarda
2db540ffde fix for double in PacketTimeWindow 2015-07-31 16:35:42 -07:00
Stephen Birarda
681c9afe90 add parens to PacketTimeWindow division 2015-07-31 16:31:42 -07:00
Stephen Birarda
e39611dc1c fix for PacketTimeWindow calculations 2015-07-31 16:31:08 -07:00
Atlante45
f9c8f30083 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-31 16:16:06 -07:00
Atlante45
7083d84372 Fix ack timestamps 2015-07-31 16:15:21 -07:00
Sam Gateau
ca4dbdb996 Merging with upstream and compiling on windows 2015-07-31 16:14:53 -07:00
Stephen Birarda
d420bca88e fix for ACK2 sending, output prettier stats 2015-07-31 16:14:33 -07:00
Atlante45
c5b92d319f Update stats gathering 2015-07-31 16:14:19 -07:00
Seth Alves
299d834e0e Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-07-31 15:30:28 -07:00
Atlante45
ed614521fd Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-31 15:12:15 -07:00
Atlante45
fcec53bdce Fix sequence number crash 2015-07-31 15:09:58 -07:00
Stephen Birarda
ce21204151 add output of connection stats in UDTTest 2015-07-31 15:09:30 -07:00
Seth Alves
bbee001366 Merge pull request #5470 from birarda/master 
fix for unique_ptr<char> allocations
 2015-07-31 15:09:18 -07:00
Brad Davis
aea07fe671 Merge branch 'master' into gl4_1 
Conflicts:
	libraries/gpu/src/gpu/Config.slh
	libraries/render-utils/src/deferred_light_limited.slv
	libraries/render-utils/src/simple.slf
	libraries/render-utils/src/simple_textured.slf
	tests/render-utils/src/main.cpp
	tools/scribe/src/main.cpp
 2015-07-31 15:08:37 -07:00
Stephen Birarda
b0afdb21ad correct the unique_ptr char allocations 2015-07-31 14:29:05 -07:00
Andrew Meadows
661a916ebd merge rig into cleanup (removal of legacy shapes) 
Conflicts:
	interface/src/avatar/Avatar.h
	tests/physics/src/ShapeColliderTests.cpp
	tests/physics/src/ShapeColliderTests.h
 2015-07-31 13:40:51 -07:00
Brad Hefta-Gaub
b46a430fba Merge pull request #5468 from bwent/reset-position 
Add gettable naturalPosition property for model entities
 2015-07-31 11:03:27 -07:00
Atlante45
06bbb7c4f1 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-31 11:00:22 -07:00
Atlante45
354621b33c Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-31 11:00:04 -07:00
Stephen Birarda
e346dbcfee seqlen fix in SendQueue 2015-07-31 10:59:06 -07:00
Stephen Birarda
ee9ae9ceec fix for vector initialization in PacketTimeWindow 2015-07-31 10:51:17 -07:00
Atlante45
9ef5f87aed Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-31 10:47:10 -07:00
bwent
aab1f70800 Renaming vars 2015-07-31 10:47:05 -07:00
Stephen Birarda
50c0b59ba2 handle priority of re-transmission of loss 2015-07-31 10:46:52 -07:00
Atlante45
b437f3bca9 Made connection hash hold unique ptr 2015-07-31 10:42:43 -07:00
Atlante45
da7a8f6e2f Added new connection stats 2015-07-31 10:41:16 -07:00
Brad Davis
155f88e267 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
	interface/src/devices/TV3DManager.h
	libraries/gpu/src/gpu/GPUConfig.h
 2015-07-31 10:28:06 -07:00
Atlante45
4f8f9903c2 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-31 10:18:42 -07:00
bwent
67760fad79 Add gettable naturalPosition property for model entities 2015-07-31 10:15:35 -07:00
Howard Stearns
b685378ab0 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-31 10:08:30 -07:00
Stephen Birarda
98a53cbd72 don't require a sendQueue for control packet sending 2015-07-31 09:56:50 -07:00
Stephen Birarda
f2ab2fb08a start with a congestion window of 16, not 25 grand 2015-07-31 09:36:55 -07:00
Stephen Birarda
c2d39f0f6a make packet send period update respect max bandwidth 2015-07-31 09:02:43 -07:00
Stephen Birarda
0ea1bb578f support max bandwidth in congestion control 2015-07-31 08:57:25 -07:00
Seth Alves
3b88500735 Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox 2015-07-30 21:22:52 -07:00
Seth Alves
f2fb156d66 merge from upstream 2015-07-30 21:21:13 -07:00
Seth Alves
241e767ab6 move setHandPosition from SkeletonModel to AvatarRig. Tell Rig::initJointStates joint-indexes for hands and elbows and shoulders 2015-07-30 18:44:09 -07:00
Seth Alves
c80516a051 Merge branch 'rig' of github.com:howard-stearns/hifi into rig 2015-07-30 18:39:09 -07:00
Seth Alves
c1f777e18f move setHandPosition from SkeletonModel to AvatarRig. Tell Rig::initJointStates joint-indexes for hands and elbows and shoulders 2015-07-30 18:39:01 -07:00
samcake
fbf21cb089 FIxed the problem on Mac, by removing all of the gpuConfig includesgit status 
q
:q
wq
 2015-07-30 18:27:47 -07:00
Atlante45
d7713d7aec Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-30 18:22:52 -07:00
Stephen Birarda
6c4a36fb7f lock then check size 2015-07-30 18:22:43 -07:00
Atlante45
e81e1c42b0 Add send queue getter 2015-07-30 18:22:27 -07:00
Atlante45
421d3c4123 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-30 18:17:27 -07:00
Stephen Birarda
036cb8859d Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-30 18:14:59 -07:00
Stephen Birarda
98385ce8cd default sequence numbers to 0 2015-07-30 18:14:54 -07:00
Atlante45
a714f8081d Fix a couple networking bugs 2015-07-30 18:10:59 -07:00
Stephen Birarda
a38e7b0431 cleanup SendQueue start and UDTTest bind 2015-07-30 17:59:27 -07:00
Stephen Birarda
8e786cb953 repairs while testing with UDTTest 2015-07-30 17:40:51 -07:00
Bradley Austin Davis
f3e701e0d5 Don't allow leaving VR mode to target the rift 2015-07-30 17:40:02 -07:00
Stephen Birarda
91355a5396 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-30 17:20:27 -07:00
Stephen Birarda
367fa7b07b fixes for assert in Connection and ControlPacket create 2015-07-30 17:20:22 -07:00
Stephen Birarda
1724e3c632 fix a couple of bugs in SendQueue 2015-07-30 17:17:03 -07:00
Stephen Birarda
0f1d1a16a7 actually call sendReliablePacket for write of reliable 2015-07-30 17:12:44 -07:00
Stephen Birarda
d340515ab3 complete the initial version of UDTTest 2015-07-30 17:09:25 -07:00
Bradley Austin Davis
ac0ec0a458 Ensure the app moves back to a non-rift screen if the saved geometry is bad 2015-07-30 17:09:08 -07:00
Howard Stearns
51ed912f5e Merge branch 'rig' of https://github.com/howard-stearns/hifi into rig 2015-07-30 17:03:06 -07:00
Howard Stearns
78a900c866 Prototype blend. Just equal weighting for now. 2015-07-30 17:01:48 -07:00
Atlante45
bcff9730f6 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-30 15:58:28 -07:00
Atlante45
e8ffe96232 Remove const_cast 2015-07-30 15:58:05 -07:00
Atlante45
3a9aedea68 Fix packet ctors size param 2015-07-30 15:56:42 -07:00
Anthony J. Thibault
e52bf2e12d Fix for head cauterization. 
When rendering rigidly bound mesh clusters were not properly using
the cauterization matrix set.
 2015-07-30 15:51:34 -07:00
Seth Alves
8d2aacb46d send X texture to renderer 2015-07-30 15:36:07 -07:00
Stephen Birarda
4529eea5f8 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-30 15:23:40 -07:00
Atlante45
784cc880a7 Fix Packet ctor 2015-07-30 15:15:51 -07:00
Stephen Birarda
8e55655ec3 call setSystemBufferSizes once bound 2015-07-30 15:07:49 -07:00
Sam Gateau
14f4c9c6c0 REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend 2015-07-30 15:07:36 -07:00
Atlante45
9e7644ee78 Change headers/payload size computation 2015-07-30 15:05:51 -07:00
Stephen Birarda
3f0eecc599 actually change the system socket buffer size 2015-07-30 15:04:48 -07:00
Anthony J. Thibault
7a10b31dd9 Clear translation on root joint. 
Also, delete/rename all instances of updateJointState except for the one in Rig
and derived classes.
 2015-07-30 15:04:27 -07:00
Seth Alves
52ee9526ce add 3 new texture-url properties for polyvox 2015-07-30 13:20:19 -07:00
Brad Davis
f7a2513f26 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/MyAvatar.h
	tests/ui/src/main.cpp
 2015-07-30 12:55:22 -07:00
Niels Nesse
85f06639a5 Remove redundant code in getOrCreateChildElementAt() 2015-07-30 12:50:57 -07:00
Bradley Austin Davis
a260be9a4d HMDTools dialog restoration phase 2, electric boogaloo 2015-07-30 12:25:21 -07:00
Brad Davis
5878a4661c Restoring HMD tools dialog, phase 1 2015-07-30 11:35:55 -07:00
Sam Gateau
d84e2d31ea Merge with master 2015-07-30 11:20:00 -07:00
Brad Davis
382ef057b0 Revert to using QGLWidget 2015-07-30 10:59:05 -07:00
Stephen Birarda
e7f5bec3d0 take out the incorrect attempt to cast for bitwise 2015-07-30 10:30:14 -07:00
Stephen Birarda
57025cff74 fix packet pair sending from SendQueue 2015-07-30 10:20:09 -07:00
Seth Alves
03456f1a06 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-07-30 10:13:44 -07:00
Howard Stearns
06aa107762 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-30 09:57:02 -07:00
Anthony J. Thibault
4bb415fd0d Fix for torso twist. 
Off by one error, 0 is a valid parent bone index.
 2015-07-30 09:31:23 -07:00
Brad Hefta-Gaub
96fdb32edc Merge pull request #5461 from venkatn93/avatar 
HBAO implementation
 2015-07-30 08:46:55 -07:00
Brad Hefta-Gaub
b95e4e1e93 Merge pull request #5323 from MarcelEdward/20605 
Removed the  line where the directory is stripped off the RelativeFile
 2015-07-30 07:30:01 -07:00
Marcel Verhagen
fa6d6a5123 Added the & references to the const variables 2015-07-30 15:08:02 +02:00
Atlante45
3d523552f8 Cast buffer ptr before bitwise op 2015-07-30 01:02:53 -07:00
Seth Alves
a9556660c4 fix linux build 2015-07-29 20:53:24 -07:00
Atlante45
da480bcaf0 Fix ControlPackets read/write header 2015-07-29 20:05:15 -07:00
Brad Hefta-Gaub
398bace83c Merge pull request #5439 from samcake/punk 
Remove alias gl calls from Batch and Introduce a ResetStage Batch command
 2015-07-29 20:05:06 -07:00
Atlante45
db5e5a4f75 Remove Environment Server 2015-07-29 20:04:29 -07:00
Atlante45
fd11e13eaa Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-29 19:54:01 -07:00