Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-02 16:31:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
46507 commits 25 branches 0 tags 1.1 GiB
Commit graph

884 commits

Author SHA1 Message Date
David Rowe
28cfca993f Add and wire up "search in view" JavaScript API stub 2016-09-08 14:58:48 +12:00
David Rowe
a4b5f5395d Add "in view" button 2016-09-08 12:56:41 +12:00
David Rowe
7d6ab77c16 Merge branch 'master' into 21040 2016-09-08 11:30:19 +12:00
David Rowe
db30e36b3b Implement expand/collapse action to show/hide table columns 2016-09-07 19:11:53 +12:00
David Rowe
b372f82f78 Ensure that the expand/collapse icon is always visible 2016-09-07 17:09:56 +12:00
Ken Cooke
9457d49103 Merge branch 'master' of https://github.com/highfidelity/hifi into low-latency-audio 2016-09-06 20:56:20 -07:00
David Rowe
dba3efd857 Add expand/collapse extra info toggle icon to entities table header 2016-09-07 15:04:27 +12:00
SamGondelman
88d0aa3737 removed showButtonDown, which didn't exist 2016-09-06 17:36:55 -07:00
David Rowe
156866f835 Fix "has script" entities list icon 2016-09-07 11:12:04 +12:00
David Rowe
83593087b6 Resize table headers after filter value changed 2016-09-07 11:08:06 +12:00
David Rowe
f83599f855 Merge branch 'master' into 21040 2016-09-07 10:08:51 +12:00
Seth Alves
37db1cba26 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-09-06 09:38:44 -07:00
David Rowe
c44bd902c3 Display render info values only if provided 2016-09-03 13:07:40 +12:00
Andrew Meadows
0a55afda69 Merge pull request #8554 from elisa-lj11/marketplaces_html 
Include a marketplace status bar and access to "marketplace" of marketplaces
 2016-09-02 17:12:05 -07:00
David Rowe
980df19db1 Merge branch 'master' into 21040 
Conflicts:
	libraries/entities/src/EntityItemProperties.cpp
 2016-09-03 11:38:27 +12:00
Seth Alves
b8b1127d55 merge from upstream 2016-09-02 15:11:21 -07:00
Brad Hefta-Gaub
861cf468a3 Merge pull request #8547 from imgntn/save_default_scripts_settings 
Remember setting for 'debug defaultScripts.js'
 2016-09-02 13:08:19 -07:00
Brad Hefta-Gaub
8ec5798b7a Merge pull request #8548 from samcake/blue 
Exposing GPU & Batch running time to Engine gpu jobs
 2016-09-02 09:31:09 -07:00
Brad Hefta-Gaub
cf242eca9f Merge pull request #8537 from hyperlogic/feature/larger-marketplace-tablet 
Marketplace tablet is a bit larger and lower DPI.
 2016-09-02 08:45:29 -07:00
Seth Alves
9ef03b1205 avoid having auto-unequip code trigger during a teleport 2016-09-01 19:13:08 -07:00
Seth Alves
8505d1eeed avoid a bootstrap 2016-09-01 17:51:02 -07:00
Seth Alves
da35281941 don't assume collides-with-dynamic during a multi-grab 2016-09-01 16:57:23 -07:00
Seth Alves
b1eb4c361d if a hand is disabled while holding something, release it 2016-09-01 15:02:41 -07:00
Seth Alves
dd7e25441c include which hand in grab messages 2016-09-01 14:58:37 -07:00
Seth Alves
045042a9c6 don't disable grabbing when teleporting 2016-09-01 14:15:49 -07:00
Seth Alves
a35e527128 try to fix far-trigger 2016-09-01 11:46:08 -07:00
Seth Alves
53ba190ca6 don't do auto-release test unless the hand is equipping 2016-09-01 09:57:46 -07:00
James B. Pollack
a8a9577866 actually remove the math.random 2016-08-31 21:14:50 -07:00
elisa-lj11
288ba96795 reverted default scripts to load marketplace.js 2016-08-31 17:47:16 -07:00
elisa-lj11
bebf9c5890 Added error feature when user tries to download a non fbx file 2016-08-31 17:46:35 -07:00
Seth Alves
47259ee053 find equip-points with controller position rather than hand 2016-08-31 16:52:46 -07:00
James B. Pollack
2acf316d1c fix 2016-08-31 13:45:58 -07:00
Ken Cooke
72535ce237 Fix reverbTest.js which was broken due to missing helper script 2016-08-31 13:09:06 -07:00
James B. Pollack
193065eb05 remove auto toggle 2016-08-31 12:36:28 -07:00
Seth Alves
21b4759b6d Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-31 10:27:44 -07:00
Ryan Downe Karpf
6c853ec77d Merge pull request #8538 from AndrewMeadows/workaround-resolvePath 
workaround for Script.resolvePath() bug
 2016-08-31 08:59:14 -07:00
Andrew Meadows
12e6920a8d fix syntax error 2016-08-31 08:15:00 -07:00
elisa-lj11
d16ef521f4 fixed merge conflicts from Howard's webview fix 2016-08-30 15:33:59 -07:00
elisa-lj11
aceddb0cf8 merge with james repo 2016-08-30 15:07:01 -07:00
Seth Alves
78f54a7f33 get rid of some jitter in equipped items. do a better job of deciding when something equipped has been torn-away 2016-08-30 14:39:11 -07:00
samcake
2a5ee5d6b1 Fixing the unit for the cpuTIme feed and the titles for the GPU PERf Plots 2016-08-30 14:28:52 -07:00
James B. Pollack
e4bdc2e86c cleanup 2016-08-30 14:17:27 -07:00
James B. Pollack
a6a834f2c7 remember and work on toggle 2016-08-30 13:58:28 -07:00
samcake
c553e5f2fe fine tune the scripts for proper presentation of the timing values 2016-08-30 13:57:47 -07:00
samcake
faef8a9930 Adding the timing for GPU support with a simpelr JobConfig 2016-08-30 12:22:21 -07:00
Seth Alves
617880479a Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-30 11:19:40 -07:00
Seth Alves
3a5f92d7a2 ignoreIK for equipping. change how auto-unequip searches 2016-08-30 11:16:13 -07:00
Brad Davis
eb0a8db0af Merge pull request #8539 from hyperlogic/bug-fix/snappy-search-beam 
When trigger is pulled, snap search beam to correct length instead of animating
 2016-08-30 11:13:58 -07:00
elisa-lj11
37cc50a14a Merge remote-tracking branch 'highfidelity/master' into marketplaces_html 2016-08-30 10:45:26 -07:00
elisa-lj11
fa941e4a1b Merge remote-tracking branch 'origin' into marketplaces_html 2016-08-30 10:42:56 -07:00