Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 01:29:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
50181 commits 76 branches 59 tags 1.2 GiB
Commit graph

50181 commits

This branch
This branch
All branches
Author SHA1 Message Date
Chris Collins
1df13d6a56 Merge pull request #9399 from howard-stearns/hand-controll-grab-update 
handControllerGrab update loop change
 2017-01-16 16:41:02 -08:00
humbletim
c9fd650e70 update to support click/far-click toggling and userData.disabled setting 2017-01-16 19:37:31 -05:00
David Rowe
a1fe908380 Remove a lingering line of old code 2017-01-17 12:56:56 +13:00
Chris Collins
5f34ad3596 Merge pull request #9400 from AndrewMeadows/fix-cauterization-hack 
don't render non-skinned meshes on head when in first person
 2017-01-16 15:47:52 -08:00
Zach Fox
1e8effdcc4 Packet verison bump 2017-01-16 15:28:53 -08:00
Zach Fox
e72c25736e Cleanup 2017-01-16 15:21:18 -08:00
Andrew Meadows
fd28457807 fix cauterization hack 2017-01-16 15:13:28 -08:00
howard-stearns
0a3236dcc9 handControllerGrab update loop change 2017-01-16 14:54:32 -08:00
Zach Fox
e98a40c30e Does this work? 2017-01-16 14:43:30 -08:00
Zach Fox
3b56f46206 Style changes 2017-01-16 13:18:24 -08:00
Zach Fox
079e5c4296 Merge pull request #9397 from zfox23/FB-2814 
Fix FB-2814 "Users.requestUsernameFromID() doesn't work for yourself"
 2017-01-16 12:54:28 -08:00
Zach Fox
e22c1ac30e Fix the bug 2017-01-16 11:48:51 -08:00
David Kelly
95aad3140d Merge pull request #9386 from davidkelly/dk/manageAudioIntervalInPal 
Manage audio interval timer in PAL
 2017-01-16 11:29:05 -08:00
Zach Fox
32e330320e Cleanup after rebase 2017-01-16 11:26:57 -08:00
Stephen Birarda
1993e358d6 Merge pull request #9318 from birarda/ovr-platform-entitlement 
handle OVR Platform entitlement checks
 2017-01-16 11:16:31 -08:00
Zach Fox
2f176f50fa Another checkpoint 2017-01-16 10:44:54 -08:00
Zach Fox
6e4a4da92a Checkpoint 2017-01-16 10:42:29 -08:00
Zach Fox
117e302b2a First pass 2017-01-16 10:39:11 -08:00
Zach Fox
d2c7342a62 Merge pull request #9352 from zfox23/PerAvatarVolume 
PAL: Per-Avatar Volume Slider; visual tweaks
 2017-01-16 10:34:31 -08:00
samcake
36ee7758cf Merge pull request #9394 from jherico/fbx_parse_fix 
Fix bug in FBX parse changes
 2017-01-16 10:27:52 -08:00
Seth Alves
c212fc93c9 Merge pull request #9395 from sethalves/tablet-ui 
more changes to handle camera-relative-controller joints.
 2017-01-16 10:27:23 -08:00
Seth Alves
23ea65e2b5 more changes to handle camera-relative-controller joints. 2017-01-16 10:26:16 -08:00
Brad Davis
67ce5040ec Fix bug in FBX parse changes 2017-01-16 10:09:47 -08:00
Seth Alves
bd67715cd2 don't early-exit from the loop that checks for loaded collision hulls because the check is what causes the hulls to be constructed 2017-01-16 08:54:56 -08:00
Chris Collins
2557c797af Merge pull request #9300 from zzmp/graphics/forward-opaque 
Add opaques/skinned to forward rendering path
 2017-01-16 08:48:18 -08:00
Seth Alves
455c60b7fb Merge pull request #9392 from sethalves/tablet-ui 
Tablet ui
 2017-01-16 07:51:12 -08:00
Seth Alves
b617b3a114 put code to delete prim-stylus tip back in 2017-01-16 07:50:36 -08:00
Seth Alves
756d96c368 fix search ray getting left on. started adding stylus models 2017-01-16 07:46:12 -08:00
Seth Alves
e434defc7f Merge pull request #9391 from sethalves/tablet-ui 
Tablet ui
 2017-01-16 06:49:15 -08:00
Seth Alves
c2d6bf10d2 hard-code dimensions on home-button so that it doesn't sometimes show-up with the wrong size 2017-01-16 06:47:50 -08:00
Seth Alves
f0248275ec Merge branch 'load-models-in-keyhole' of github.com:sethalves/hifi into tablet-ui 2017-01-16 06:47:15 -08:00
Seth Alves
050a7e87d2 load entity models that don't yet need to be rendered but are close enough to keep physics from being enabled. 2017-01-15 17:04:51 -08:00
Seth Alves
17b1bdba86 Merge pull request #9389 from sethalves/tablet-ui 
Tablet ui grab changes
 2017-01-15 11:31:34 -08:00
Seth Alves
4a451e95dc don't call release when off state is entered. don't attempt to unhook stylus as a stray child 2017-01-15 11:29:29 -08:00
Seth Alves
3b4f5e3023 don't include overlays in results from EntityScriptingInterface::getChildrenIDsOfJoint 2017-01-15 11:27:29 -08:00
Seth Alves
7ab3e60f36 Merge pull request #9388 from sethalves/tablet-ui-grab-changes 
Tablet ui grab changes
 2017-01-15 10:18:23 -08:00
Seth Alves
b8234ad75c try a different way of keeping track of original parentIDs of grabbed entities 2017-01-15 10:16:28 -08:00
Seth Alves
36fdaa6350 avoid a little pop when grabbing something with ignore-ik as true 2017-01-15 10:10:54 -08:00
Seth Alves
75db4354fd Merge pull request #9387 from sethalves/tablet-ui 
Tablet ui merge from upstream
 2017-01-14 18:01:42 -08:00
Seth Alves
0744a148b1 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-14 18:00:09 -08:00
Brad Hefta-Gaub
98699885f4 Merge pull request #9385 from kencooke/audio-mixformat-invalid 
Fix audio failures
 2017-01-14 14:53:01 -08:00
David Kelly
baed3bc3b3 Manage audio interval timer in PAL 
Now, it is only running when PAL is up.  Was running (but doing nothing
before.  Somewhat more efficient this way.
 2017-01-14 12:57:00 -07:00
Ken Cooke
42e13d1e97 Fix audio failures on systems that return incorrect/unsupported mixFormat 2017-01-14 10:26:13 -08:00
Zach Fox
a5343d9aa9 Final tweaks before PR! 2017-01-13 17:20:29 -08:00
Seth Alves
9fd86de47c Merge pull request #9384 from sethalves/tablet-ui 
adjust overlay position so that it shows up on new tablet fbx
 2017-01-13 16:15:48 -08:00
Seth Alves
e46b40e729 adjust overlay position so that it shows up on new tablet fbx 2017-01-13 16:14:12 -08:00
Zach Fox
a89868dcad Make sliders appear only when row is selected 2017-01-13 15:41:17 -08:00
Zach Fox
8343769352 NameCard improvements & user feedback 2017-01-13 15:25:07 -08:00
Seth Alves
85104b442f Merge pull request #9381 from sethalves/tablet-ui 
auto-end a near-grab if the parentID is changed to something else
 2017-01-13 14:23:13 -08:00
Seth Alves
e00814dd53 auto-end a near-grab if the parentID is changed to something else 2017-01-13 14:21:44 -08:00