Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 13:13:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
54634 commits 71 branches 56 tags 1.2 GiB
Commit graph

54634 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
7b387c52c3 Fix reliability of keyboard enabling in tablet Web pages 2017-05-03 14:42:06 +12:00
Zach Fox
ff3a76f716 No magic numbers! 2017-05-02 18:23:15 -07:00
samcake
84305c2049 Fixing the by region update of the compressed texture to match the 4 x 4 tiles alignment 2017-05-02 17:30:31 -07:00
Zach Fox
653dda7000 Fix pausing after snapshot in HMD 2017-05-02 17:21:50 -07:00
samcake
48eb30936e Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis 2017-05-02 17:20:10 -07:00
samcake
0ecf599267 Adressing the warning 2017-05-02 17:19:22 -07:00
Zach Fox
aa46534b60 Whoops. 2017-05-02 17:10:57 -07:00
Zach Pomerantz
ad8d3e5490 continue idling while minimized 2017-05-02 20:05:55 -04:00
Zach Fox
964e79ce14 It's working! 2017-05-02 16:58:33 -07:00
Zach Fox
68fa8e06ef Super amped about this. Only need to add disabled state? 2017-05-02 16:38:16 -07:00
samcake
dc50db7ee5 One more warning from gcc 2017-05-02 16:27:28 -07:00
Seth Alves
0cd0e46ca5 make clone work again 2017-05-02 16:20:59 -07:00
howard-stearns
6f52bb4b37 Merge branch 'master' of https://github.com/highfidelity/hifi into notification-circumstances 2017-05-02 16:16:27 -07:00
Zach Fox
5d38cd543d Yet another checkpoint 2017-05-02 16:06:13 -07:00
Seth Alves
ef628eaec6 Merge pull request #10352 from highfidelity/move-recorder 
Move old recorder.js script to script-archive
 2017-05-02 16:03:36 -07:00
Zach Fox
7817c72ea1 Another checkpoint 2017-05-02 15:58:43 -07:00
Seth Alves
f1170dc17d AvatarList not AvatarManager 2017-05-02 15:48:12 -07:00
Seth Alves
eed4da3570 some cleanups, delete far-grabs during transition to near-grab rather than set ttl to zero 2017-05-02 15:36:38 -07:00
Zach Fox
0beceae59b Checkpoint 2017-05-02 15:19:20 -07:00
Sam Gateau
a7eecdfb26 Merge pull request #10265 from samcake/ambient 
Making the render engine Job/Task system configurable and reusable
 2017-05-02 14:55:53 -07:00
Zach Pomerantz
0353940d9e decouple initialization from storage in Table.getTablet() 2017-05-02 17:49:40 -04:00
samcake
41f0b1682e Fixing warnings too 2017-05-02 14:45:41 -07:00
Zach Fox
1067d1e0f6 Don't let user blast in certain cases 2017-05-02 14:43:16 -07:00
Zach Fox
d8095c5ea5 New setup instructions; new 'blank snapshot' text 2017-05-02 14:20:27 -07:00
Seth Alves
cc586b7c6d make ragdoll test honor lifetime from UI 2017-05-02 14:12:55 -07:00
Zach Fox
d1dff7606c Lint cleanup; Immediate share button visibility; 2017-05-02 14:10:24 -07:00
ZappoMan
de134adb95 CR review 2017-05-02 13:42:08 -07:00
ZappoMan
00a4fe044a fix frozen bots 2017-05-02 13:42:00 -07:00
Howard Stearns
7ba5ea4229 On touch, grip is a trigger, not a button, so it can have lots of callbacks with slightly different values that we ignore. In that case, don't update hand/joint. 2017-05-02 13:19:04 -07:00
Howard Stearns
4839a6e872 convert foreign handString to jointIndex once, not often 2017-05-02 13:15:13 -07:00
Howard Stearns
6af21525d5 remove extra joint search 2017-05-02 13:15:03 -07:00
Howard Stearns
921242fbe5 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-05-02 13:14:49 -07:00
Howard Stearns
3f99509a19 check your own location data on failure, and notify if it is wrong 2017-05-02 13:14:38 -07:00
Howard Stearns
d3c9cb9574 standardize data init/clear 2017-05-02 13:14:17 -07:00
Howard Stearns
154af42180 setupCandidate 2017-05-02 13:13:14 -07:00
Howard Stearns
03e929ca18 clarify names, particularly hand vs handString 2017-05-02 13:13:01 -07:00
Howard Stearns
7f120febbd fix that 2017-05-02 13:12:48 -07:00
Howard Stearns
13e10873ce simplify animation load and code 2017-05-02 13:12:33 -07:00
Howard Stearns
e2dd00bdc4 unique message for exceeding poll limit 2017-05-02 13:12:24 -07:00
Howard Stearns
43f8467708 lint 2017-05-02 13:12:09 -07:00
Vladyslav Stelmakhovskyi
b3e078eb74 Trigger rebuild 2017-05-02 13:11:32 -07:00
Vladyslav Stelmakhovskyi
7f1db38390 Renamed EDIT to CREATE 2017-05-02 13:11:23 -07:00
Zach Fox
5302110e7b Merge pull request #10346 from zfox23/newSnapshotReview_Improvements 
Lots of Snapshot app improvements, Round One
 2017-05-02 13:00:08 -07:00
Howard Stearns
8e7b294380 Merge pull request #10351 from howard-stearns/handshake-touch 
handshakes on rift
 2017-05-02 12:22:55 -07:00
Anshuman Dewangan
0d1d6924e8 Adding to script-archive 2017-05-02 12:20:05 -07:00
Anshuman Dewangan
a22be93d69 Move old recorder.js script to script-archive 2017-05-02 12:15:06 -07:00
howard-stearns
750f1e5723 Merge branch 'master' of https://github.com/highfidelity/hifi into notification-circumstances 2017-05-02 11:57:21 -07:00
samcake
32d675c82b Clean up the new code and adress review comments 2017-05-02 11:46:51 -07:00
howard-stearns
9b117165bd expire our announcements when we leave, and turn off messagesWaiting when 
everything is expired.
 2017-05-02 11:44:16 -07:00
Howard Stearns
3a36feacad On touch, grip is a trigger, not a button, so it can have lots of callbacks with slightly different values that we ignore. In that case, don't update hand/joint. 2017-05-02 11:29:51 -07:00