Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-28 03:50:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
54634 commits 71 branches 59 tags 1.2 GiB
Commit graph

54634 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dante Ruiz
9f33af479d saving work 2017-05-01 18:04:22 +01:00
Sam Cake
ae5cd3059a Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis 2017-05-01 09:59:18 -07:00
anshuman64
5731242e7f Merge pull request #10321 from ZappoMan/fixFrozenBots 
fix frozen bots
 2017-05-01 09:33:33 -07:00
Anthony J. Thibault
0c09823f67 clang warning fixes, unused variables... 2017-05-01 09:10:31 -07:00
CFresquet
72a6403eb0 Merge remote-tracking branch 'upstream/master' 2017-05-01 08:11:26 -07:00
CFresquet
28aaa545d8 Created RequestModule 2017-05-01 08:07:16 -07:00
druiz17
f60deb0cfc fixed the twitter link 2017-04-30 22:55:44 -07:00
Howard Stearns
f980d6f435 Merge branch 'master' of https://github.com/highfidelity/hifi into handshake-cleanup-2 2017-04-30 15:51:12 -07:00
Howard Stearns
e740fb67f4 convert foreign handString to jointIndex once, not often 2017-04-30 15:50:30 -07:00
Howard Stearns
a057400a92 Merge pull request #10323 from davidkelly/dk/gripThresholdGetsBigger 
increase minimum grip pressure to initiate handshake
 2017-04-30 15:49:35 -07:00
druiz17
2bf7b12c7d open webview from tabletwebscreen 2017-04-30 15:27:34 -07:00
Howard Stearns
bc9049cb42 remove extra joint search 2017-04-30 14:19:33 -07:00
Seth Alves
6808cf62b6 trying to get electron package to download 2017-04-30 14:09:44 -07:00
Seth Alves
2e23a073f7 trying to get electron package to download 2017-04-30 14:03:45 -07:00
Howard Stearns
292065a918 It may be possible to switch hands without endHandshake, and thus not reset currentHandJointIndex on updateTrigger. That was filled in later by startHanshake ONLY if there was already waiting avatars so that we didn't have wait. As a result, our distance measure would be from hips instead of hand. This changes it to always compute currentHandJointIndex on updateTriggers (and not elsewhere). 2017-04-30 13:32:21 -07:00
druiz17
b1abbbe472 Merge branch 'master' of github.com:highfidelity/hifi into webview-js 2017-04-30 13:17:28 -07:00
Seth Alves
1b67a8b251 cleanups 2017-04-30 12:23:34 -07:00
Seth Alves
41663c58b8 test app for bullet dynamics 2017-04-30 12:09:37 -07:00
Seth Alves
dabec586ec if spring is linked to another entity which we can't find, disable the spring 2017-04-30 11:01:34 -07:00
Seth Alves
c9dfebb713 allow spring action to have targets relative to another entity 2017-04-30 10:58:58 -07:00
Seth Alves
7ce0ef2ec4 fix spring action so that it can be linear or rotational or both 2017-04-30 10:04:07 -07:00
Howard Stearns
eca7292651 check your own location data on failure, and notify if it is wrong 2017-04-30 09:44:34 -07:00
Howard Stearns
92481bf475 standardize data init/clear 2017-04-30 08:04:46 -07:00
Howard Stearns
d41a911fd2 setupCandidate 2017-04-29 19:39:50 -07:00
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
Stephen Birarda
3b5851b7c3 Merge pull request #10326 from huffman/fix/atp-stuck-downloads 
Fix/atp stuck downloads (FOR RC)
 2017-04-28 16:54:18 -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
Ryan Huffman
46d4504f15 Fix poorly indented if in AssetRequest 2017-04-28 16:43:11 -07:00
Ryan Huffman
bc89af2842 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:43:11 -07:00
David Kelly
168cfa9b5d upping polling time plus min grip 2017-04-28 16:39:58 -07:00