Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-12 17:14:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
54421 commits 25 branches 0 tags 1.1 GiB
Commit graph

54421 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
14d52cdc8a Merge pull request #10329 from 1st-BrainStormer/patch-1 
Update EntityDynamicInterface.cpp
 2017-04-29 08:04:08 -07:00
Seth Alves
9e7ef83bd1 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-4 2017-04-29 07:01:44 -07:00
Brad Davis
2b43a1989f Moving face and eye trackers out of interface 2017-04-28 23:28:17 -07:00
1st-BrainStormer
953a3f7a6f Update EntityDynamicInterface.cpp 
Grammar correction.
 2017-04-28 20:14:01 -07:00
Howard Stearns
b6ae0a5bde add nextTick, and cleanup 2017-04-28 20:06:13 -07:00
samcake
04895864b5 Factorizing the code... 2017-04-28 17:34:15 -07:00
Stephen Birarda
fed747a545 Merge pull request #10325 from huffman/atp-range-caching 
Fix for stuck ATP downloads
 2017-04-28 16:54:21 -07:00
samcake
83618d45a2 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis 2017-04-28 16:53:09 -07:00
howard-stearns
f9debf1388 checkpoint 2017-04-28 16:53:08 -07:00
samcake
bfe8bc7593 Adding the 45 codepath for debug 2017-04-28 16:52:43 -07:00
David Kelly
168cfa9b5d upping polling time plus min grip 2017-04-28 16:39:58 -07:00
Brad Davis
5e1bc0d908 Remove faceshift 2017-04-28 16:34:54 -07:00
Dante Ruiz
59f84a60c5 saving work 2017-04-29 00:31:09 +01:00
Ryan Huffman
89fb0a917b Fix poorly indented if in AssetRequest 2017-04-28 16:27:44 -07:00
Ryan Huffman
765a061086 Fix stuck ATP downloads 
Occasionally ATP requests would get stuck because of a race inside
AssetClient::handleAssetReply. This was more likely to happen to small
resources.
 2017-04-28 16:26:03 -07:00
Stephen Birarda
c518aa55be Merge pull request #10312 from birarda/upload-new-models-to-entity 
add an entity file replacement via domain-server content page
 2017-04-28 16:06:05 -07:00
David Kelly
a99c242646 increase minimum grip pressure to initiate handshake 2017-04-28 15:52:32 -07:00
Clément Brisset
90e79c7bbc Merge pull request #10317 from birarda/atp-range-caching 
don't save ATP range requests to cache
 2017-04-28 15:16:11 -07:00
ZappoMan
bace47af7c CR review 2017-04-28 14:46:27 -07:00
ZappoMan
086941356a fix frozen bots 2017-04-28 14:36:38 -07:00
Anthony J. Thibault
58de67ba11 Fix tests/controllers/src/main.cpp clang/gcc warnings 2017-04-28 14:12:00 -07:00
samcake
d0fa8fe887 Debuging the bad transfers... 2017-04-28 12:26:44 -07:00
Anthony J. Thibault
f3cc1c2d86 Added hipsContorllerTest.js for QA Testing 2017-04-28 11:30:06 -07:00
Anthony J. Thibault
108cd80bb5 Merge branch 'master' into feature/head-standard-action 2017-04-28 10:41:29 -07:00
Stephen Birarda
b44a56db80 don't save ATP requests to cache if they are range requests 2017-04-28 10:32:06 -07:00
Seth Alves
4b0e7ceef5 show hand lasers when edit is enabled, but not if there are not hand-controllers 2017-04-28 10:24:04 -07:00
Andrew Meadows
994eed7b83 safer delete of AvatarMotionStates 2017-04-28 10:18:19 -07:00
Andrew Meadows
32c367b644 use 'using' rather than 'typedef' 2017-04-28 10:18:15 -07:00
Stephen Birarda
9bc0609b1e address code review comments 2017-04-28 10:17:48 -07:00
samcake
bb0bdac864 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis 2017-04-28 09:33:17 -07:00
Seth Alves
2a0fc5b34c Merge pull request #10273 from hyperlogic/feature/hips-ik-target 
Avatar IK system now supports manipulating the hips.
 2017-04-28 09:17:33 -07:00
Howard Stearns
a2721d21ef Merge pull request #10278 from zfox23/newSnapshotReview 
New Snapshot Review Dialog
 2017-04-28 07:25:47 -07:00
Howard Stearns
e0282f63f3 Merge pull request #10315 from howard-stearns/address-bar-ux 
address bar ux
 2017-04-28 07:21:53 -07:00
Howard Stearns
0ad8f4d985 remove debugging 2017-04-28 07:15:22 -07:00
Anthony J. Thibault
c61e6a8a9e AnimInverseKinematics: reduce number of magic constants 2017-04-27 18:24:21 -07:00
Anthony J. Thibault
b80270400f Merge branch 'master' into feature/hips-ik-target 2017-04-27 18:15:12 -07:00
samcake
8240c3f761 Fixing the spam issue triggered by the external textures, removed 2 warnings 2017-04-27 18:05:52 -07:00
Anthony J. Thibault
2120e63e3a Merge branch 'master' into feature/head-standard-action 2017-04-27 17:51:13 -07:00
Stephen Birarda
038ac745c8 clear domain octree details if ES killed 2017-04-27 17:47:18 -07:00
Anthony J. Thibault
764f6c69ea Head input action will override the HMD for IK. 2017-04-27 17:39:25 -07:00
samcake
d7dfab6405 Fixing the broken texture copy (during texture streaming) for compressed format in GL41Backend 2017-04-27 17:31:46 -07:00
samcake
7c15609136 Fixing the broken texture copy (during texture streaming) for compressed format in GL41Backend 2017-04-27 17:28:10 -07:00
howard-stearns
aed762e986 ux 2017-04-27 17:16:03 -07:00
Stephen Birarda
a21a34a4a4 add entities file replacement to DS and ES 2017-04-27 16:56:27 -07:00
Zach Fox
3f146fca9d Fix announcement audience; Fix disabled buttons 2017-04-27 15:36:59 -07:00
Seth Alves
2c2f51689a Merge pull request #10300 from vladest/tablet-edit-tocreate 
Renamed EDIT to CREATE
 2017-04-27 15:31:14 -07:00
Ryan Huffman
2faa8fb671 Fix ResourceCache warning on OSX 2017-04-27 14:45:18 -07:00
Seth Alves
21df08aa88 set limits when slider constraint is first created 2017-04-27 14:02:38 -07:00
Zach Fox
4152e44d2c Click anywhere on the image except the bottom to toggle share buttons 2017-04-27 14:01:08 -07:00
Zach Fox
3ce81844da Snapshot JS interface for better Settings handling 2017-04-27 14:01:08 -07:00