Seth Alves
37db1cba26
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-09-06 09:38:44 -07: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
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
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
Seth Alves
f4eee8d480
Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers
2016-08-30 09:12:53 -07:00
elisa-lj11
f2e61aa504
added status bar to marketplace
2016-08-29 18:43:32 -07:00
Seth Alves
314b7617ac
Merge pull request #8543 from hyperlogic/bug-fix/entity-pointer-events
...
Bug fix for click events received by entity scripts
2016-08-29 17:57:56 -07:00
James B. Pollack
2b2b2ecbac
caps
2016-08-29 17:44:33 -07:00
James B. Pollack
d3aad53e0e
cleanup
2016-08-29 17:43:32 -07:00
Andrew Meadows
2d8bb54b93
fix typo
2016-08-29 17:37:24 -07:00
James B. Pollack
2a12f2feae
marketplaces html
2016-08-29 17:27:39 -07:00
Andrew Meadows
99acc9045d
disable defaultScripts.js debugging by default
2016-08-29 17:15:01 -07:00
Andrew Meadows
b50d24fb00
don't use Script.resolvePath() in local functions
2016-08-29 17:11:29 -07:00
Anthony J. Thibault
e34aecde49
Bug fix for click events received by entity scripts
...
PointerEvent.isLeftButton should be true even on left button release events.
in a previous PR this behavior was changed. isLeftButton was used as a flag indicating the button state, which would be false on left button release events.
Because we have scripts that rely on the old behavior, I've changed it back to the original and introduced isPrimaryHeld properties instead.
2016-08-29 16:21:39 -07:00
James B. Pollack
cceae50b90
no more delete with backspace
2016-08-29 14:28:05 -07:00
James B. Pollack
95c627aa71
dev
2016-08-29 14:24:36 -07:00
Anthony J. Thibault
3ed11d2e5f
When trigger is pulled, snap search beam to correct length instead of animating.
...
This improves interaction on web browser tablets. Instead of the beam shooting
through the tablet and animating back to the surface, it starts at the correct length.
2016-08-29 13:22:57 -07:00
Andrew Meadows
b1d472c9ba
workaround for Script.resolvePath() bug
2016-08-29 12:28:59 -07:00
