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
54491 commits 2 branches 0 tags 1.1 GiB
Commit graph

54491 commits

This branch
This branch
All branches
Author SHA1 Message Date
Howard Stearns
18dbe3568c clarify names, particularly hand vs handString 2017-04-29 18:25:33 -07:00
David Rowe
819f02a988 Fix keyboard not raising for Facebook username field 2017-04-30 11:40:28 +12:00
Howard Stearns
9c83e21e17 fix that 2017-04-29 15:50:04 -07:00
Seth Alves
8f2fc24885 remove motors from constraints 2017-04-29 15:46:04 -07:00
Howard Stearns
d7a2e571a7 simplify animation load and code 2017-04-29 14:39:35 -07:00
Howard Stearns
274cc5b555 unique message for exceeding poll limit 2017-04-29 14:29:43 -07:00
Seth Alves
41f699ec9b fix hinge limits 2017-04-29 14:28:56 -07:00
Seth Alves
e52c94895e remove motor from hinge. fix hinge limits 2017-04-29 14:18:14 -07:00
Howard Stearns
84ac863a32 lint 2017-04-29 13:58:20 -07:00
Seth Alves
4c4e0dffcc bullet cone-twist constraint 2017-04-29 12:30:12 -07:00
Seth Alves
6623028d71 ball-and-socket constraint 2017-04-29 08:35:55 -07:00
Seth Alves
e2e9371e96 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-4 2017-04-29 08:04:31 -07:00
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