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

50965 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
2ec4f118fd Merge pull request #9639 from hyperlogic/feature/tablet-pal 
Ported PAL to tablet
 2017-02-08 21:17:38 -08:00
Seth Alves
908df7ee8a Merge pull request #9637 from thoys/FixHiddenCursorForBrowseAndSaveDialogs 
Fix for hidden cursor while using Export Entities / Import Entities form
 2017-02-08 19:42:33 -08:00
Anthony J. Thibault
e25ad0f332 Fix debug assert in FBXReader. 2017-02-08 18:56:58 -08:00
Anthony J. Thibault
b3a46c3518 Bug fix for TabletProxy::loadQMLSource() 2017-02-08 18:56:16 -08:00
Anthony J. Thibault
c2b832fb9c removed debug prints from pal.js 2017-02-08 18:55:22 -08:00
Anthony J. Thibault
090f632189 Pal: Moved keyboard tray to be flush with bottom of window. 2017-02-08 18:16:48 -08:00
Anthony J. Thibault
7cc3079328 Tightened up margins for the tablet. 2017-02-08 17:58:24 -08:00
Anthony J. Thibault
a209d0372a First cut of pal on tablet. 2017-02-08 17:34:03 -08:00
Thijs Wenker
6957ac5f8b Fixes cursor being hidden while Window.browse(), Window.save() are being called from the defaultScript.js thread 2017-02-09 01:31:07 +01:00
Clément Brisset
f608892e47 Merge pull request #9633 from ZappoMan/betterBots 
Various Bot fixes
 2017-02-08 16:08:43 -08:00
Brad Hefta-Gaub
b399420190 CR 2017-02-08 15:42:59 -08:00
Brad Hefta-Gaub
07cf87749f Merge branch 'master' of https://github.com/highfidelity/hifi into betterBots 2017-02-08 13:41:33 -08:00
Brad Hefta-Gaub
82e4b1c690 only recordings with audio 2017-02-08 13:41:20 -08:00
Brad Hefta-Gaub
9d3c674271 fix warning 2017-02-08 13:41:09 -08:00
Brad Hefta-Gaub
202e430adb added 4 more recordings to the script 2017-02-08 13:38:55 -08:00
Brad Hefta-Gaub
89368afd68 add back accidentally removed line 2017-02-08 12:52:17 -08:00
Brad Hefta-Gaub
42e9fed64a improved version of random recording bot script 2017-02-08 12:36:13 -08:00
Brad Hefta-Gaub
eedfc4fd38 fix various bot related bugs 2017-02-08 12:35:00 -08:00
Clément Brisset
91bfa65fe2 Merge pull request #9586 from Triplelexx/21146 
21146
 2017-02-08 11:07:27 -08:00
Dante Ruiz
7db86204d1 general function to load QML for javascript for tablet 
(cherry picked from commit b50e20c545)
 2017-02-08 10:25:11 -08:00
Philip Rosedale
4554d8ba68 Merge pull request #9630 from TopRamenGod/21138 
CR for Job #21138 Make jumping easier in the Vive
 2017-02-08 08:11:04 -08:00
Seth Alves
47976406fc Merge pull request #9607 from hyperlogic/bug-fix/better-haptics 
More consistent haptics on web overlays and entities
 2017-02-08 05:47:05 -08:00
Anthony J. Thibault
244437d971 set WANT_DEBUG_STATE back to false 2017-02-07 23:50:06 -08:00
Seth Alves
e1a3b0c551 Merge pull request #9629 from hyperlogic/feature/tablet-2d-window-pos 
In desktop mode create tablet near mouse click location.
 2017-02-07 19:51:05 -08:00
mike
6cba2049dd Made jumping easier on the Vive 2017-02-07 19:46:16 -08:00
Anthony J. Thibault
cb58c567b8 In desktop mode create tablet near mouse click location. 
But prevent the tablet from being displayed off screen.
 2017-02-07 18:18:34 -08:00
Howard Stearns
811f8d9c1d Merge pull request #9627 from howard-stearns/pal-performance 
PAL performance
 2017-02-07 16:54:22 -08:00
howard-stearns
2e88f1ab1f conserving audio interval 2017-02-07 16:21:14 -08:00
howard-stearns
23fc9b6fb3 Merge branch 'master' of https://github.com/highfidelity/hifi into pal-performance 2017-02-07 16:00:08 -08:00
howard-stearns
3bd11978aa low-hanging fruit on pal performance 2017-02-07 15:59:38 -08:00
Seth Alves
d75512f680 Merge pull request #9619 from birarda/bug/domain-settings-save-row 
fix for default value insertion in domain server settings
 2017-02-07 15:40:30 -08:00
Seth Alves
90fa8bf572 Merge pull request #9612 from druiz17/users 
some tweaks to users and menus got tablet
 2017-02-07 15:38:43 -08:00
Clément Brisset
eb0a316b6f Merge pull request #9604 from hyperlogic/feature/allow-multiple-instances 
Allow multiple instances to run if environment variable is set
 2017-02-07 15:32:31 -08:00
Howard Stearns
628ce1cf4f Merge pull request #9624 from howard-stearns/update-summon-crowd 
update crowd-agent and summon for bubble, avatar-mixer optimizations.
 2017-02-07 14:05:24 -08:00
Triplelexx
e7244b47a9 increase LETTER_OFFSET value 
allow more room for characters, could be improved by detecting each one
 2017-02-07 21:55:55 +00:00
howard-stearns
9a44f63b74 update crowd-agent and summon for bubble, avatar-mixin optimizations. 2017-02-07 13:14:15 -08:00
samcake
24a3a514a4 Merge pull request #9594 from AndrewMeadows/cap-fbx-texture-size 
Cap fbx texture size
 2017-02-07 12:46:22 -08:00
Anthony J. Thibault
7d630f6c9a Added Mat4.createFromColumns 2017-02-07 12:03:28 -08:00
Anthony J. Thibault
2952be5fc8 Added MouseX and MouseY axes to Keyboard device. 2017-02-07 12:02:41 -08:00
Zach Pomerantz
ff56eb24c8 Merge pull request #9537 from zzmp/audio/throttle-filter 
Add injector/avatar attenuation to audio-mixer throttling
 2017-02-07 20:57:43 +01:00
David Kelly
9788b4bdaf Merge pull request #9601 from davidkelly/dk/deadlockPrevention 
Minor cleanup
 2017-02-07 12:56:03 -07:00
Brad Hefta-Gaub
0fb9ef947a Merge pull request #9618 from druiz17/snapshot 
Remove duplicate snapshot settings in general settings and avatar settings
 2017-02-07 08:53:38 -08:00
Chris Collins
d2feb4202b Merge pull request #9621 from sethalves/tablet-ui-track-opens-and-closes 
send UserActivityLogger events when tablet is opened or closed
 2017-02-07 08:23:09 -08:00
Anthony Thibault
2f09be5ead Merge pull request #9605 from druiz17/tabletClicking 
enforce more button clicking logic
 2017-02-06 20:23:16 -08:00
Anthony Thibault
caefb6c711 Merge pull request #9620 from hyperlogic/bug-fix/find-entity-bug 
Fix for findEntities not returning some entities that are within range.
 2017-02-06 20:22:34 -08:00
Chris Collins
194fd925cf Merge pull request #9609 from sethalves/tablet-ui-fix-equipping 
don't send AVATAR_SELF_ID over wire
 2017-02-06 16:56:11 -08:00
Seth Alves
e3af5032c0 send UserActivityLogger events when tablet is opened or closed 2017-02-06 16:49:26 -08:00
Howard Stearns
1c7c0f7a76 Merge pull request #9617 from howard-stearns/physics-packets 
Physics packets
 2017-02-06 16:41:08 -08:00
Anthony J. Thibault
a14dcbd513 Fix for findEntities not returning some entities that are within range. 
This bug has been around a long time... introduced by commit 39ed7f7b in 2014.
This became apparent to me when testing the tablet-ui, there was a case where the
hand styluses were not appearing when close to a web entity.  Because findEntities
is such a fundamental feature used by handControllerGrab, this fix should make all
grabbing feel more consistent and predictable.

I added a unit test that reproduces the issue.
 2017-02-06 15:13:25 -08:00
Stephen Birarda
5c46cecf6a handle empty initial groups when comparing 2017-02-06 14:32:02 -08:00