Zach Fox
|
84ed07cdb4
|
Merge pull request #13405 from zfox23/MS16007_supportPngSnapshots
Implement MS16007: Add support for PNG snapshots
|
2018-06-18 13:10:45 -07:00 |
|
Wayne Chen
|
07e689f086
|
removing compute/check for u
|
2018-06-18 13:02:53 -07:00 |
|
Zach Fox
|
e83b76781b
|
Be a bit more specific in the docs
|
2018-06-18 11:47:26 -07:00 |
|
Zach Fox
|
614b512411
|
Add docs
|
2018-06-18 11:43:31 -07:00 |
|
Elisa Lupin-Jimenez
|
9c488ff05e
|
Merge pull request #13331 from gcalero/breakpad_android
Breakpad integration for android Interface
|
2018-06-18 11:32:05 -07:00 |
|
Elisa Lupin-Jimenez
|
c08df9e39f
|
Merge pull request #13400 from kitely/parse-snapshot-fix
Don't call parseSnapshotData() in a static manner
|
2018-06-18 11:26:29 -07:00 |
|
Zach Fox
|
dbf3ade04f
|
Implement MS16007: Add support for PNG snapshots
|
2018-06-18 11:22:05 -07:00 |
|
Wayne Chen
|
e381022910
|
checking for NaN in cross products from vec3 positions
|
2018-06-18 11:21:53 -07:00 |
|
Gabriel Calero
|
3eecb2f379
|
Apply code conventions
|
2018-06-18 14:42:08 -03:00 |
|
Wayne Chen
|
ed7f008517
|
checking edge case of if input vectors are zero
|
2018-06-18 10:31:11 -07:00 |
|
Andrew Meadows
|
6d422e4678
|
Merge 'master' into 'workload'
|
2018-06-18 10:30:13 -07:00 |
|
Elisa Lupin-Jimenez
|
b255cf0ba9
|
Merge pull request #13389 from AndrewMeadows/misc-001
crash fixes, removing unnecessary writes, and misc cleanup
|
2018-06-18 09:19:22 -07:00 |
|
Oren Hurvitz
|
d8ea47b78f
|
Don't call parseSnapshotData() in a static manner.
Shouldn't call non-static methods in a static manner. (Some compilers don't even allow this, although apparently Visual Studio 2017 does.)
|
2018-06-17 14:18:25 +03:00 |
|
David Rowe
|
be4b929301
|
Fix cauterization when reparent entity to a different joint
|
2018-06-16 16:31:06 +12:00 |
|
David Rowe
|
4dd6ba1d18
|
Fix Mac crash
|
2018-06-16 16:29:45 +12:00 |
|
Gabriel Calero
|
583c46b3a0
|
Merge remote-tracking branch 'upstream/master' into breakpad_android
|
2018-06-15 21:21:03 -03:00 |
|
Gabriel Calero
|
20c147ef11
|
Fix compilation error
|
2018-06-15 21:12:38 -03:00 |
|
Gabriel Calero
|
1cdd8c2f3c
|
Fix compilation error
|
2018-06-15 20:39:24 -03:00 |
|
Gabriel Calero
|
20727378e2
|
Rename crash handler files
|
2018-06-15 20:32:10 -03:00 |
|
Anthony J. Thibault
|
2feecf6db8
|
removed unnecessary setting of 'username' annotation.
|
2018-06-15 14:56:10 -07:00 |
|
Anthony J. Thibault
|
8ddcff6070
|
Set username annotation more reliably.
|
2018-06-15 14:47:02 -07:00 |
|
John Conklin II
|
2483c45f40
|
Merge pull request #13350 from sabrina-shanman/bulletcollisionrenderonly
Remove functionality for rendering collision models directly in the Model class
|
2018-06-15 14:46:40 -07:00 |
|
Andrew Meadows
|
be0899c41d
|
remove unnecessary writes to appease Xcode's static analyzer
|
2018-06-15 11:44:22 -07:00 |
|
Anthony J. Thibault
|
24689224ce
|
removed redundant machine_fingerprent crashpad annotation.
|
2018-06-15 11:40:45 -07:00 |
|
David Rowe
|
249f72758e
|
Fix entity detaching from head joint not becoming visible
|
2018-06-15 16:36:16 +12:00 |
|
Thijs Wenker
|
05bc32b3ad
|
Merge branch 'master' of github.com:highfidelity/hifi into merge/triplelexx-21883
# Conflicts:
# interface/src/Application.cpp
# interface/src/scripting/LimitlessVoiceRecognitionScriptingInterface.cpp
|
2018-06-15 02:34:29 +02:00 |
|
Gabriel Calero
|
c02750edd1
|
Upload breakpad minidumps from an android service
|
2018-06-14 19:43:03 -03:00 |
|
Anthony J. Thibault
|
84601446bf
|
Add main thread id & machine fingerprint to crashpad annotations
|
2018-06-14 12:57:30 -07:00 |
|
John Conklin II
|
d023d6adef
|
Merge pull request #13321 from danteruiz/tablet-imporvments
Tablet improvements
|
2018-06-14 12:38:20 -07:00 |
|
Anthony Thibault
|
5d06ea1c45
|
Merge pull request #13250 from MiladNazeri/gravprep-docs
Jsdoc to Grav Automation Tool
|
2018-06-14 11:26:56 -07:00 |
|
John Conklin II
|
99b5835098
|
Merge pull request #13344 from birarda/feat/new-version-numbers
handle semantic version numbers in interface/sandbox update
|
2018-06-13 11:16:56 -07:00 |
|
John Conklin II
|
0ba97fa83b
|
Merge pull request #13338 from amantley/scriptedBlendshapesFaceFlags
Scripted Blendshapes and Procedural Face Movement Flags
|
2018-06-13 10:32:59 -07:00 |
|
Clement
|
920263ef49
|
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
|
2018-06-12 17:00:25 -07:00 |
|
Zach Fox
|
ffb9a47be0
|
Merge pull request #13355 from zfox23/MS14314_multipleSnapshots
Interface Fix for MS14314: Make use of original image filename when sharing
|
2018-06-12 15:10:22 -07:00 |
|
Anthony Thibault
|
027c4f6b9e
|
Merge pull request #13332 from hyperlogic/bug-fix/large-avatar-little-domain-rc68
Large avatars should instantly shrink when entering small height domains
|
2018-06-12 14:57:07 -07:00 |
|
Zach Fox
|
bf5d6de780
|
Merge branch 'master' of github.com:highfidelity/hifi into MS14314_multipleSnapshots
|
2018-06-12 11:19:05 -07:00 |
|
Dante Ruiz
|
f1d11f9566
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments
|
2018-06-12 10:21:12 -07:00 |
|
Andrew Meadows
|
d31ee52d79
|
revert PR-13162 from RC68
|
2018-06-12 03:51:55 -07:00 |
|
Anthony J. Thibault
|
042f902d2e
|
Merge branch 'master' into scriptedBlendshapesFaceFlags
|
2018-06-11 17:13:30 -07:00 |
|
Zach Fox
|
14034f29a1
|
Interface Fix for MS14314: Make use of original image filename when sharing
|
2018-06-11 17:10:09 -07:00 |
|
Sam Gateau
|
f769b63c3d
|
Merge pull request #13308 from jherico/fix/13677
Fix for black text rendering white in web elements
|
2018-06-11 16:17:31 -07:00 |
|
Sam Gondelman
|
e8ec32c7f8
|
Merge pull request #13340 from SamGondelman/modelTextures
Try to fix ModelOverlay texture loading
|
2018-06-11 16:09:10 -07:00 |
|
Dante Ruiz
|
6685fbbfc4
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments
|
2018-06-11 13:56:54 -07:00 |
|
Zach Fox
|
7fbc7bf1a5
|
Merge pull request #13347 from zfox23/MS15721_deleteApp
Fix MS15721: Delete app.json if installed script isn't running
|
2018-06-11 13:28:05 -07:00 |
|
Zach Fox
|
15129e37db
|
Merge pull request #13341 from zfox23/MS13761_hideOverlayFix
Fix MS13761: Change the move conditions under which overlays hide
|
2018-06-11 11:44:26 -07:00 |
|
Anthony J. Thibault
|
f773aef053
|
Merge branch 'master' into bug-fix/large-avatar-little-domain-rc68
|
2018-06-11 11:06:21 -07:00 |
|
sabrina-shanman
|
4c39d08358
|
Remove "Draw Collision Shapes" option from developer physics menu
|
2018-06-11 11:03:57 -07:00 |
|
Zach Fox
|
56bd7e3d37
|
Remove dead function declaration from header
|
2018-06-11 10:58:01 -07:00 |
|
Stephen Birarda
|
10e34000aa
|
Merge pull request #13278 from SimonWalton-HiFi/tablet-popup-remains
Domain-unreachable message remaining on slow connects
|
2018-06-11 10:46:55 -07:00 |
|
Zach Fox
|
c26b03f480
|
Cleanup
|
2018-06-11 10:40:13 -07:00 |
|
Zach Fox
|
c7c06590ac
|
Merge branch 'master' of github.com:highfidelity/hifi into MS13761_hideOverlayFix
|
2018-06-11 10:16:35 -07:00 |
|
Howard Stearns
|
5ce122f148
|
Merge pull request #13307 from howard-stearns/infinite-scroll
Infinite scroll
|
2018-06-11 10:03:52 -07:00 |
|
Anthony J. Thibault
|
b8379045a8
|
Fix MyAvatar::isReadyForPhysics() in serverless domains.
|
2018-06-11 09:53:34 -07:00 |
|
Sam Gondelman
|
be28097279
|
Merge pull request #13339 from SamGondelman/avatarHash
Possibly fix avatarHash crash
|
2018-06-11 09:39:40 -07:00 |
|
Sam Gondelman
|
535dc92213
|
Merge pull request #13334 from SamGondelman/tablet
Fix tablet not disappearing
|
2018-06-11 09:34:57 -07:00 |
|
Dante Ruiz
|
ba86c9753d
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments
|
2018-06-11 09:13:14 -07:00 |
|
howard-stearns
|
d2cf042a88
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-09 14:09:42 -07:00 |
|
Anthony Thibault
|
044d142635
|
Merge pull request #13133 from amantley/nativeCGCode
Center of Gravity Leaning
|
2018-06-08 17:53:55 -07:00 |
|
Stephen Birarda
|
9506e7edbe
|
check for update for dev-builds, handle semantic version
|
2018-06-08 17:20:57 -07:00 |
|
howard-stearns
|
ce322a4794
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-08 15:33:07 -07:00 |
|
John Conklin II
|
bc3edbc7fc
|
Merge pull request #13333 from zfox23/MS15681_securityImageProviderCrash
Fix MS15673: Ensure offscreenUI exists before updating SecurityImageProvider
|
2018-06-08 15:14:32 -07:00 |
|
howard-stearns
|
210cb23de6
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-08 14:54:15 -07:00 |
|
Stephen Birarda
|
112abc9d7e
|
Merge pull request #13148 from birarda/feat/new-version-numbers
add SHA to PR/master version, add build_type (stable/master/pr/dev)
|
2018-06-08 14:44:22 -07:00 |
|
Zach Fox
|
95faad23e2
|
Merge pull request #13329 from zfox23/MS15664_15663_fixWalletAuthStep
Fix MS15663/15664: Don't set Wallet Status to 'ready' too early
|
2018-06-08 14:20:21 -07:00 |
|
Zach Fox
|
812c28ef48
|
Fix MS13761: Change the move conditions under which overlays hide
|
2018-06-08 14:15:42 -07:00 |
|
SamGondelman
|
310e2ee063
|
attempt to fix first time model overlay loading
|
2018-06-08 13:56:21 -07:00 |
|
SamGondelman
|
a7d75b121f
|
fix avatarHash crash
|
2018-06-08 11:20:41 -07:00 |
|
Zach Fox
|
d4a19e7bc9
|
Fix MS15721: Delete app.json if installed script isn't running
|
2018-06-08 10:52:14 -07:00 |
|
Atlante45
|
83e1db14cf
|
Set UAL default value earlier to be caught by crashpad
|
2018-06-07 19:40:30 -07:00 |
|
howard-stearns
|
348d5fc359
|
inventory text filter
|
2018-06-07 17:01:48 -07:00 |
|
SamGondelman
|
c7007c089f
|
fix tablet not disappearing
|
2018-06-07 16:35:22 -07:00 |
|
amantley
|
913d78841d
|
Merge remote-tracking branch 'upstream/master' into scriptedBlendshapes
synching with upstream master
|
2018-06-07 16:20:11 -07:00 |
|
howard-stearns
|
2761688d39
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-07 16:14:57 -07:00 |
|
Zach Fox
|
c1b971a269
|
Fix MS15673: Ensure offscreenUI exists before updating SecurityImageProvider
|
2018-06-07 16:10:44 -07:00 |
|
Anthony J. Thibault
|
608575cf17
|
Large avatars should instantly shrink when entering small height domains
Also reduce the fudge factor for safeLanding from an additional 50% of avatar's height to 25%.
|
2018-06-07 15:31:40 -07:00 |
|
amantley
|
836c3da858
|
cleaned up white space and removed extra declaration of hadAudioEnabledFaceMovement
|
2018-06-07 15:11:57 -07:00 |
|
Gabriel Calero
|
3911a93a38
|
Merge remote-tracking branch 'upstream/master' into breakpad_android
|
2018-06-07 19:00:16 -03:00 |
|
Gabriel Calero
|
8869af069e
|
Integrate Breakpad in android Interface
|
2018-06-07 18:59:43 -03:00 |
|
druiz17
|
8c83bd29a3
|
making requested changes
|
2018-06-07 14:04:39 -07:00 |
|
Zach Fox
|
7d8e02e714
|
Fix MS15663/15664: Don't set Wallet Status to 'ready' too early
|
2018-06-07 14:01:52 -07:00 |
|
amantley
|
97831e61f0
|
removed stray comments
|
2018-06-07 12:54:46 -07:00 |
|
Zach Fox
|
d33875e142
|
Merge pull request #13295 from zfox23/MS15574_WalletMemoryLeak
Fix MS15574: Tiny memory leak in Wallet.h
|
2018-06-07 12:42:24 -07:00 |
|
howard-stearns
|
890c97e7cb
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-07 12:24:27 -07:00 |
|
John Conklin II
|
1646f543cd
|
Merge pull request #13273 from danteruiz/fix-show-overlays-menu
fixing show overlays menu item on start up
|
2018-06-07 11:34:30 -07:00 |
|
John Conklin II
|
3b413d0f72
|
Merge pull request #13272 from zfox23/MS14615_memoryUsageMinimized
MS14615: Prevent memory overuse when minimized
|
2018-06-07 11:16:56 -07:00 |
|
Sam Gateau
|
146732a20f
|
Merge pull request #13317 from jherico/feature/mac_resources
Use binary resources on OSX
|
2018-06-07 09:38:00 -07:00 |
|
John Conklin II
|
2b6fdb6b69
|
Merge pull request #13217 from Atlante45/fix/ds-memory
Fix uploaded content archives taking too much memory
|
2018-06-07 09:37:41 -07:00 |
|
Zach Fox
|
7f04506020
|
Merge pull request #13318 from zfox23/MS14925_doubleCallingDisplayChanged
Fix MS14925: Don't double-emit signal for display plugin change
|
2018-06-07 09:32:50 -07:00 |
|
Dante Ruiz
|
6ddc768f57
|
making overlays use precisionPicking and adjust tablet screen position
|
2018-06-06 15:40:33 -07:00 |
|
Bradley Austin Davis
|
fa51c15849
|
Use binary resources on OSX
|
2018-06-06 15:10:52 -07:00 |
|
Zach Fox
|
6869718025
|
Fix MS14925: Don't double-call signal for display plugin change
|
2018-06-06 14:41:33 -07:00 |
|
Seth Alves
|
b70ffa5bae
|
Merge pull request #13297 from ctrlaltdavid/21835
Remove some deprecated functions from the Controller API
|
2018-06-06 14:06:34 -07:00 |
|
Sam Gondelman
|
b4afabee68
|
Merge pull request #13294 from SamGondelman/overlays
Add isGroupCulled property to ModelOverlays
|
2018-06-06 13:52:33 -07:00 |
|
Sam Gateau
|
a1899e80c0
|
Merge pull request #13290 from AndrewMeadows/update-queryAACube
update server-side bounding box more correctly for grabbed things
|
2018-06-06 11:46:09 -07:00 |
|
Seth Alves
|
6c8e514367
|
Merge pull request #13224 from danteruiz/fix-key-conflicts
Allow using the key 1,2,3 to swicth views and also to enter text in web entity or overlay
|
2018-06-06 11:08:04 -07:00 |
|
Dante Ruiz
|
59c50b7f26
|
remove highlight overlay in favor of materialEntity
|
2018-06-06 08:38:58 -07:00 |
|
MiladNazeri
|
082c1fce52
|
Merge pull request #13251 from ctrlaltdavid/21880
JSDoc updates
|
2018-06-05 19:04:54 -07:00 |
|
amantley
|
f21431ca88
|
added check for the actual face tracker in MyHead.cpp to prevent crash
|
2018-06-05 16:33:28 -07:00 |
|
Anthony J. Thibault
|
b5a3b25adc
|
Tuned hip smoothing times.
|
2018-06-05 16:07:54 -07:00 |
|
Anthony J. Thibault
|
993d035d37
|
Smooth out fly to idle transition, to prevent hip thrusting and pops.
|
2018-06-05 15:45:19 -07:00 |
|
SamGondelman
|
aec7206901
|
get rid of overlay pipelines and just use forward rendering
|
2018-06-05 14:44:44 -07:00 |
|
Bradley Austin Davis
|
e7e9ca4b2b
|
Disable chromium distance field text rendering on ATI GPUs
|
2018-06-05 14:16:03 -07:00 |
|
howard-stearns
|
3d75a793cc
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-05 13:35:54 -07:00 |
|
amantley
|
5132466ca0
|
kept the transient coeff. and sending the blendshapes accross the
network. and removed procedural updates to face from myhead.cpp
|
2018-06-05 13:32:45 -07:00 |
|
SamGondelman
|
968758a022
|
CR
|
2018-06-05 09:35:17 -07:00 |
|
Ken Cooke
|
aa19794a94
|
Merge pull request #13243 from danteruiz/fix-copy-paste-cut-delete
fix copy delete cut paste commands and menus
|
2018-06-05 09:17:34 -07:00 |
|
Ken Cooke
|
83dda420ba
|
Merge pull request #13256 from danteruiz/remove-dead-code
remove dead code in Application::keyPressEvent
|
2018-06-05 09:16:28 -07:00 |
|
Anthony J. Thibault
|
558711f906
|
Smooth hips transition between idle and fly.
Also, take dt into account for the critically damped spring lerp calculation.
|
2018-06-04 16:57:41 -07:00 |
|
Andrew Meadows
|
d220d437cc
|
remove payloadGetLayer() from GameWorkloadRenderer
|
2018-06-04 16:39:29 -07:00 |
|
amantley
|
61592cdada
|
completed first try at all changes for scripted blendshapes
|
2018-06-04 16:37:47 -07:00 |
|
Andrew Meadows
|
4329ea5240
|
Merge master' into 'workload'
|
2018-06-04 16:11:25 -07:00 |
|
David Rowe
|
a7a0cfeef2
|
Remove some deprecated functions from the Controller API
|
2018-06-05 10:56:19 +12:00 |
|
howard-stearns
|
25ee948662
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-04 15:30:10 -07:00 |
|
Sam Gondelman
|
38e7b31c32
|
Merge pull request #13176 from SimonWalton-HiFi/low-connectivity
Try reducing concurrent downloads
|
2018-06-04 14:48:46 -07:00 |
|
Zach Fox
|
60aff7a224
|
Whoops
|
2018-06-04 14:41:18 -07:00 |
|
David Rowe
|
b5028a9626
|
Merge branch 'master' into 21880
# Conflicts:
# interface./src/scripting/WindowScriptingInterface.h
|
2018-06-05 09:13:54 +12:00 |
|
Zach Fox
|
7407507f0b
|
Fix MS15574: Tiny memory leak in Wallet.h
|
2018-06-04 14:13:25 -07:00 |
|
SamGondelman
|
bde3382657
|
merge with master
|
2018-06-04 12:55:17 -07:00 |
|
SamGondelman
|
8af1beca8d
|
add isGroupCulled for model overlays
|
2018-06-04 12:07:57 -07:00 |
|
howard-stearns
|
24a67c6008
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-04 11:15:39 -07:00 |
|
John Conklin II
|
08fcad1932
|
Merge pull request #13227 from SamGondelman/entityMirror
Add local-only isVisibleInSecondaryCamera flag to entities
|
2018-06-04 11:06:00 -07:00 |
|
howard-stearns
|
bf7453482a
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-04 10:26:49 -07:00 |
|
John Conklin II
|
29f2ab01d8
|
Merge pull request #13244 from danteruiz/fix-shortcuts
fix copy delete cut paste commands and menus (RC68)
|
2018-06-04 10:02:49 -07:00 |
|
Anthony J. Thibault
|
c3d1daf855
|
Merge branch 'master' into nativeCGCode
|
2018-06-04 09:32:38 -07:00 |
|
Dante Ruiz
|
606b6d8947
|
fix code standard issue
|
2018-06-04 09:16:39 -07:00 |
|
Andrew Meadows
|
9ae19714b5
|
also update queryAACube for children of worn entities
|
2018-06-01 16:38:57 -07:00 |
|
John Conklin II
|
378e84b7ce
|
Merge pull request #13257 from danteruiz/rc68-reload-scripts
adding back reload scripts shortcut and clean up AboutUtil(RC68)
|
2018-06-01 15:10:28 -07:00 |
|
Zach Fox
|
7f344c33a7
|
Docs update
|
2018-06-01 13:51:18 -07:00 |
|
Zach Fox
|
96858c9586
|
MS15529: Add secondary camera snapshot notification flag
|
2018-06-01 13:38:41 -07:00 |
|
amantley
|
01848fafe0
|
made all changes except those to AvatarData toByteArray function also to do: verify that transientBlendshapes are set to 0 in headData simulate when there are blendshapes from script but no face tracker present
|
2018-06-01 11:37:11 -07:00 |
|
Simon Walton
|
f58e1ebdd9
|
Only take down tablet if it was brought up
|
2018-06-01 10:41:08 -07:00 |
|
howard-stearns
|
84f5f0a653
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-01 09:58:08 -07:00 |
|
John Conklin II
|
194c33bf19
|
Merge pull request #13254 from danteruiz/add-back-reload-scripts
adding back reload scripts shortcut and clean up AboutUtil
|
2018-06-01 09:31:13 -07:00 |
|
Simon Walton
|
7d1d7f7bcd
|
Closing the open tablet dialog - try harder
|
2018-05-31 18:31:53 -07:00 |
|
amantley
|
3bda5bf6a0
|
added MyAvatar.hasProceduralBlinkFaceMovement and MyAvatar.hasProceduralEyeFaceMovement properties to MyAvatar.h and cpp and HeadData.h
|
2018-05-31 17:58:37 -07:00 |
|
SamGondelman
|
86ee5c12d8
|
merge and update based on sam's changes
|
2018-05-31 17:53:36 -07:00 |
|
Sam Gateau
|
f372e25a9f
|
Merge pull request #13247 from NissimHadar/DailyTests
Daily tests
|
2018-05-31 14:50:32 -07:00 |
|
Simon Walton
|
7598c7aaf3
|
Remove tablet message-box when required
Desktop request was being honoured but not HMD.
|
2018-05-31 13:52:06 -07:00 |
|
samcake
|
386c0f9ab2
|
Re review adjustments
|
2018-05-31 12:16:57 -07:00 |
|
Dante Ruiz
|
caa7f64865
|
fixing show overlays menu item
|
2018-05-31 10:58:04 -07:00 |
|
amantley
|
7cc5e96f2d
|
Merge remote-tracking branch 'upstream/master' into feat/hasScriptedBlendshapes
merging hifi master to update the branch
|
2018-05-31 10:35:31 -07:00 |
|
Zach Fox
|
259803f856
|
MS14615: Prevent memory overuse when minimized
|
2018-05-31 10:30:25 -07:00 |
|
Sam Gateau
|
513acc529e
|
INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine
|
2018-05-30 23:31:54 -07:00 |
|
howard-stearns
|
b0d3729d4d
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-05-30 17:09:57 -07:00 |
|
NissimHadar
|
bea21e3a68
|
WIP.
|
2018-05-30 17:06:49 -07:00 |
|
NissimHadar
|
6717a16098
|
WIP.
|
2018-05-30 17:04:19 -07:00 |
|
NissimHadar
|
51b1188bdb
|
WIP.
|
2018-05-30 17:01:47 -07:00 |
|
NissimHadar
|
df668e44ca
|
WIP.
|
2018-05-30 16:59:53 -07:00 |
|
NissimHadar
|
c1bc3bd154
|
WIP.
|
2018-05-30 16:58:35 -07:00 |
|
NissimHadar
|
d01d774f76
|
WIP.
|
2018-05-30 16:51:17 -07:00 |
|