amer cerkic
|
5d7286b055
|
removed change from my master branch, that is getting checked in on separate pr
|
2019-07-24 16:05:13 -07:00 |
|
amer cerkic
|
db945851ac
|
fixed merge conflict
|
2019-07-24 16:03:23 -07:00 |
|
amer cerkic
|
c57f60d887
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2019-07-24 15:55:05 -07:00 |
|
amer cerkic
|
e6dd52d331
|
Merge branch 'master' into bugz-1029a
|
2019-07-24 15:53:23 -07:00 |
|
amer cerkic
|
3315271493
|
reverting commit:
|
2019-07-24 15:43:31 -07:00 |
|
Anthony Thibault
|
abeba03a7e
|
Merge pull request #15975 from huffman/fix/interactive-window-qmlto-script-crash
BUGZ-1028: Fix qmlToScript getting called on script thread and causing crash
|
2019-07-24 15:39:25 -07:00 |
|
amer cerkic
|
bea31237b7
|
addressing comments
|
2019-07-24 14:30:43 -07:00 |
|
amer cerkic
|
bae3ebd577
|
fix android local build
|
2019-07-24 14:07:58 -07:00 |
|
Ryan Huffman
|
c4b63ed5e4
|
Fix qmlToScript getting called on script thread and causing crash
|
2019-07-24 13:44:20 -07:00 |
|
amer cerkic
|
f94b082946
|
addressing comment
|
2019-07-24 11:47:10 -07:00 |
|
amer cerkic
|
ac17493a40
|
removing comments
|
2019-07-24 11:37:38 -07:00 |
|
amer cerkic
|
8c022b025d
|
implementing Dante's change to connect the slots
|
2019-07-24 11:19:32 -07:00 |
|
Zach Fox
|
e1c198903d
|
Merge pull request #15973 from zfox23/fixGatedLog
BUGZ-972: Fix errant log involving 'gated' property
|
2019-07-24 11:19:02 -07:00 |
|
Zach Fox
|
3c8a4e57e6
|
Merge pull request #15972 from zfox23/SUI/fixVRButtonDimensions
DEV-301: Adjust size of VR-mode header icon
|
2019-07-24 10:22:50 -07:00 |
|
Zach Fox
|
03b5f9f7f8
|
BUGZ-972: Fix errant log involving 'gated' property
|
2019-07-24 10:18:03 -07:00 |
|
Zach Fox
|
b918979fab
|
DEV-301: Adjust size of VR-mode header icon
|
2019-07-24 10:02:26 -07:00 |
|
Shannon Romano
|
3885f143d3
|
Merge pull request #15955 from danteruiz/launcher-version
DEV-220: Lilypad Launcher: (Mac) Add versioning info to Launcher screen
|
2019-07-24 09:39:44 -07:00 |
|
Shannon Romano
|
a8842bf521
|
Merge pull request #15968 from annabrewer/android-crash-fix
BUGZ-996: Android app crashes on startup
|
2019-07-24 09:33:50 -07:00 |
|
Shannon Romano
|
34cfb6bdb9
|
Merge pull request #15960 from ctrlaltdavid/fix-coding-standards-link
Fix link to coding standards
|
2019-07-24 09:26:18 -07:00 |
|
Shannon Romano
|
1883e1d482
|
Merge pull request #15969 from Atlante45/fix/ess-crash
BUGZ-1015: Don't store unused cpuident data arrays
|
2019-07-24 09:05:47 -07:00 |
|
Shannon Romano
|
9d3d7b4e06
|
Merge pull request #15970 from Atlante45/fix/es-crash
Make sure the send thread terminates before delete
|
2019-07-24 09:04:21 -07:00 |
|
Shannon Romano
|
2942bfaad0
|
Merge pull request #15939 from SamGondelman/shader
Condense directional light shaders using slp defines
|
2019-07-24 09:01:49 -07:00 |
|
amer cerkic
|
ddc678bbc0
|
added interactivewindow proxy. moved event bridge binding to the proxy instead
|
2019-07-23 16:57:53 -07:00 |
|
dante ruiz
|
9c33454924
|
Merge branch 'master' of github.com:highfidelity/hifi into launcher-version
|
2019-07-23 16:56:31 -07:00 |
|
Anna
|
2051a9953c
|
change bounds checking to check if index is strictly less than 0
|
2019-07-23 16:00:11 -07:00 |
|
Shannon Romano
|
ad4f0f500c
|
Merge pull request #15956 from Atlante45/fix/x64_toolchain
Force build with x64 toolchain
|
2019-07-23 15:29:58 -07:00 |
|
Shannon Romano
|
849a25f576
|
Merge pull request #15966 from jherico/fix/bugz-987
BUGZ-987: fix depth testing of HUD layer 3D objects
|
2019-07-23 15:00:54 -07:00 |
|
Shannon Romano
|
b799abdac1
|
Merge pull request #15967 from sabrina-shanman/picks_too-many_grab-enabled
(BUGZ-955) Disable unnecessary picking (conservative subset)
|
2019-07-23 14:57:19 -07:00 |
|
Anna
|
a6c569dd78
|
fixed index out of bounds checking when getting cpu, gpu or display in PlatformInstance.cpp
|
2019-07-23 14:45:12 -07:00 |
|
Clement
|
7f9ad4ac25
|
Don't store unused cpuident data arrays
|
2019-07-23 14:23:12 -07:00 |
|
Clement
|
8dd18fbe62
|
Make sure the send thread terminates before delete
|
2019-07-23 14:21:07 -07:00 |
|
dante ruiz
|
08bfe00ac4
|
making requested changes
|
2019-07-23 14:09:46 -07:00 |
|
Shannon Romano
|
266230a53c
|
Merge pull request #15963 from hyperlogic/feature/avatar-reaction-api
Initial version of Avatar Reaction API
|
2019-07-23 13:13:31 -07:00 |
|
sabrina-shanman
|
d48c8d897c
|
Clarify that a Grabber member function toggles both picks and pointers
|
2019-07-23 12:58:07 -07:00 |
|
sabrina-shanman
|
abac1787a6
|
Fix using invalid pick API functions on HMD ray pointer
|
2019-07-23 12:58:07 -07:00 |
|
sabrina-shanman
|
79d09f68fd
|
Disable grab.js picks when in HMD
|
2019-07-23 12:58:07 -07:00 |
|
Brad Davis
|
449f3d00f9
|
BUGZ-987: fix depth testing of HUD layer 3D objects
|
2019-07-23 12:09:12 -07:00 |
|
Shannon Romano
|
9f2d997dbf
|
Merge pull request #15948 from SimonWalton-HiFi/dissectors-nonverified-packets
Packet dissectors: Don't read HMAC for 'nonverified' packets
|
2019-07-23 12:07:56 -07:00 |
|
Shannon Romano
|
0031b238c6
|
Merge pull request #15957 from AndrewMeadows/mac-readable-stats
BUGZ-937: more readable debug stats on MacOS
|
2019-07-23 12:05:01 -07:00 |
|
jennaingersoll
|
1e84b3f4a2
|
Merge pull request #15951 from ctrlaltdavid/DOC-122
DOC-122: LocationBookmarks JSDoc
|
2019-07-23 12:00:03 -07:00 |
|
Dante Ruiz
|
0f6a4ed13d
|
Merge pull request #15961 from danteruiz/revert-signing
Revert "Merge pull request #15944 from danteruiz/add-signing"
|
2019-07-23 11:30:02 -07:00 |
|
Anthony J. Thibault
|
687588cde7
|
Hooked up first-pass reaction animations.
|
2019-07-23 09:47:37 -07:00 |
|
dante ruiz
|
ce2849b570
|
Revert "Merge pull request #15944 from danteruiz/add-signing"
This reverts commit 47b7e9a5dc, reversing
changes made to 6d0ba98bfc.
|
2019-07-23 09:38:32 -07:00 |
|
Ryan Huffman
|
8b2c935f92
|
Merge pull request #15921 from ctrlaltdavid/ctrl-duplicate
Make Create app use Ctrl key to duplicate entities instead of Alt
|
2019-07-23 08:52:22 -07:00 |
|
David Rowe
|
4b1d243551
|
Fix link to coding standards
|
2019-07-23 21:18:45 +12:00 |
|
Shannon Romano
|
4f922e350e
|
Merge pull request #15913 from ctrlaltdavid/DOC-102
DOC-102: Overlays JSDoc Update
|
2019-07-22 16:24:53 -07:00 |
|
Shannon Romano
|
1594e25c4e
|
Merge pull request #15950 from ctrlaltdavid/DOC-121
DOC-121: AvatarBookmarks JSDoc
|
2019-07-22 15:43:57 -07:00 |
|
Shannon Romano
|
8e708b29de
|
Merge pull request #15934 from ctrlaltdavid/DOC-62
DOC-62: Reticle JSDoc
|
2019-07-22 15:32:48 -07:00 |
|
Shannon Romano
|
47b7e9a5dc
|
Merge pull request #15944 from danteruiz/add-signing
DEV-117: the signing of MAC HQ launcher AND the interface exe
|
2019-07-22 15:30:26 -07:00 |
|
David Rowe
|
1e8a205275
|
Fix typo
|
2019-07-23 10:30:10 +12:00 |
|