samcake
|
7d32efb5e6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload
|
2018-03-05 11:03:11 -08:00 |
|
John Conklin II
|
8cb7e0584f
|
Merge pull request #12547 from Atlante45/fix/session-uuid-lock
Protect session UUID from concurrent read/writes
|
2018-03-05 08:24:22 -08:00 |
|
John Conklin II
|
3f751bb5ca
|
Merge pull request #12546 from druiz17/fix-hyperlink
Fix hyperlink when far/near grabbing enitities
|
2018-03-05 08:23:51 -08:00 |
|
Sam Gateau
|
bc44b142d6
|
Merge pull request #12549 from samcake/master-workload
Master workload merge
|
2018-03-02 17:50:53 -08:00 |
|
samcake
|
cc392944b5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload
|
2018-03-02 17:49:10 -08:00 |
|
Atlante45
|
85b4c3b422
|
Protect session UUID from concurrent read/writes
|
2018-03-02 17:34:18 -08:00 |
|
Sam Gateau
|
8856d4af4f
|
Merge pull request #12530 from samcake/punk
Fixing the graphics bugs introduced since last recent dual quaternion change
|
2018-03-02 16:12:23 -08:00 |
|
John Conklin II
|
ed07b3c28b
|
Merge pull request #12531 from AndrewMeadows/use-pick-not-raypick
Purge RayPick and LaserPointers from default scripts
|
2018-03-02 14:59:32 -08:00 |
|
Dante Ruiz
|
d12a4f0c18
|
little change
|
2018-03-02 14:30:02 -08:00 |
|
Dante Ruiz
|
5dc336bfae
|
remove dead code and eslint files
|
2018-03-02 14:23:35 -08:00 |
|
John Conklin II
|
8f403ebc23
|
Merge pull request #12543 from zfox23/improveFontLoading
Improve font loading via QRC instead of file path
|
2018-03-02 14:22:17 -08:00 |
|
samcake
|
fc8f1c1e65
|
Resolving conflicts
|
2018-03-02 14:20:33 -08:00 |
|
Dante Ruiz
|
05fb3cfd9a
|
fixing hyper link for entities
|
2018-03-02 14:03:24 -08:00 |
|
Brad Hefta-Gaub
|
762e36ef19
|
Merge pull request #12545 from birarda/bug/fix-nlpacket-ascii
fix ASCII art for packet headers in NLPacket
|
2018-03-02 13:49:27 -08:00 |
|
John Conklin II
|
7ebe3df2b1
|
Merge pull request #12537 from zfox23/fixJsRequest
Fix undefined request from JS
|
2018-03-02 13:39:27 -08:00 |
|
John Conklin II
|
ff94587518
|
Merge pull request #12544 from jherico/fix_android
Disable virtual trackpad rendering on non-Android builds
|
2018-03-02 13:37:08 -08:00 |
|
Stephen Birarda
|
4f151a4237
|
fix ASCII art for packet headers in NLPacket
|
2018-03-02 12:41:22 -08:00 |
|
Brad Davis
|
9e8368e50e
|
Disable virtual trackpad rendering on non-Android builds
|
2018-03-02 11:12:44 -08:00 |
|
samcake
|
b8fb97c824
|
Resolving conflicts
|
2018-03-02 10:36:55 -08:00 |
|
Sam Gateau
|
9ae1b5b37f
|
Merge pull request #12541 from samcake/master-workload
Master workload merge
|
2018-03-02 08:56:21 -08:00 |
|
samcake
|
d4d5f3a7f0
|
Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload
|
2018-03-02 08:50:47 -08:00 |
|
Sam Gateau
|
88ecfe7895
|
Merge pull request #12464 from jherico/android_dev
Android Master
|
2018-03-01 17:22:34 -08:00 |
|
Zach Fox
|
c4e90c24eb
|
Fix undefined request from JS
|
2018-03-01 16:40:24 -08:00 |
|
Dante Ruiz
|
1f4aed31f1
|
adding hyperlink
|
2018-03-01 16:16:47 -08:00 |
|
Brad Hefta-Gaub
|
d24cea2f07
|
Merge pull request #12521 from sethalves/no-prelocked-for-non-lockers
if a node can't change locks, don't allow it to create an already-locked entity
|
2018-03-01 14:56:29 -08:00 |
|
Brad Hefta-Gaub
|
2bc37d37bd
|
Merge pull request #12512 from birarda/update-brace-expansion-for-cve
update fs-extra for dependency update of brace-expansion
|
2018-03-01 14:53:02 -08:00 |
|
Andrew Meadows
|
fef3552851
|
Merge pull request #12535 from samcake/workload
Workload: adding a ui app for debugging
|
2018-03-01 14:35:46 -08:00 |
|
samcake
|
6e7ef1e609
|
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
|
2018-03-01 13:42:51 -08:00 |
|
samcake
|
3a9a93f502
|
Introducing a ui app for debugging the workload and fixing the vissible/invisisble behavior of the render item
|
2018-03-01 13:40:58 -08:00 |
|
Sam Gateau
|
8a0196b1fd
|
Merge pull request #12534 from AndrewMeadows/workload-006
workload: clear orphaned workload::Space proxies when leaving domain
|
2018-03-01 12:35:57 -08:00 |
|
Andrew Meadows
|
1e1d9907a4
|
also clear _staleProxies when clearing all else
|
2018-03-01 12:22:42 -08:00 |
|
Andrew Meadows
|
7a852a0e31
|
clear the Space
|
2018-03-01 12:11:30 -08:00 |
|
Andrew Meadows
|
18a6ac057a
|
add Space::clear() method
|
2018-03-01 12:09:28 -08:00 |
|
samcake
|
a227cf1edb
|
Fixing bad key/pipeline pair
|
2018-03-01 10:49:58 -08:00 |
|
Anthony Thibault
|
d888e7fd95
|
Merge pull request #12528 from hyperlogic/bug-fix/fix-anim-tests
Animation Unit Tests build and pass
|
2018-03-01 10:48:15 -08:00 |
|
Andrew Meadows
|
67c78a2df1
|
remember list of stale proxies
|
2018-03-01 10:21:25 -08:00 |
|
Andrew Meadows
|
f9db9e999e
|
Merge 'master' into 'workload'
|
2018-03-01 10:19:06 -08:00 |
|
Zach Fox
|
877fa52034
|
Merge branch 'master' of github.com:highfidelity/hifi into improveFontLoading
|
2018-03-01 10:14:23 -08:00 |
|
John Conklin II
|
1e1836c009
|
Merge pull request #12502 from elisa-lj11/2dimages-update
Image entity has correct orientation and is collisionless
|
2018-03-01 09:57:08 -08:00 |
|
Andrew Meadows
|
b3a37e4516
|
Merge pull request #12527 from samcake/workload
Adding debuggin tool for workload
|
2018-03-01 09:02:15 -08:00 |
|
Andrew Meadows
|
27c6e7915e
|
purge LaserPointers refs from scripts that don't use it
|
2018-03-01 08:43:30 -08:00 |
|
Andrew Meadows
|
b4f941af03
|
finish purge of RayPick from grab.js
|
2018-03-01 08:42:08 -08:00 |
|
Andrew Meadows
|
181944d5db
|
fix bugs in controllerDispatcher.js
|
2018-03-01 08:41:13 -08:00 |
|
samcake
|
94fa2ef6a0
|
Adding debug color of the region
|
2018-02-28 17:59:59 -08:00 |
|
Zach Fox
|
67034274fa
|
Improve font loading by using QRC instead of relative paths
|
2018-02-28 17:59:37 -08:00 |
|
samcake
|
b1b539e07a
|
Adding debug color of the region
|
2018-02-28 17:56:37 -08:00 |
|
samcake
|
dc286544c5
|
Merging with nissim's pr
|
2018-02-28 17:54:54 -08:00 |
|
samcake
|
a7542d5b90
|
fixing the shadow
|
2018-02-28 17:46:22 -08:00 |
|
samcake
|
d91fb543f3
|
Fix the ssbo in GL4.5 and represent the workload proxies of the space and expose the workload engine to the JS api
|
2018-02-28 17:15:40 -08:00 |
|
Anthony J. Thibault
|
cb1d453f10
|
Removed RigTests
|
2018-02-28 17:15:24 -08:00 |
|