Commit graph

70594 commits

Author SHA1 Message Date
Dante Ruiz
8c5eefcc95 some file and code cleanup 2018-08-07 10:58:45 -07:00
Dante Ruiz
d78c571df6 revert to use overlays instead of entities for tablet highlighting 2018-08-07 10:56:53 -07:00
amantley
a61909446a Merge remote-tracking branch 'upstream/master' into animationBlendChanges 2018-08-07 10:40:22 -07:00
amantley
84619e7adc cleaned up to match coding standards 2018-08-07 10:40:11 -07:00
David Back
d88615219c CR changes 2018-08-07 10:19:48 -07:00
David Back
deee73f14d Merge branch 'master' of https://github.com/highfidelity/hifi into serverScriptStatus 2018-08-07 10:05:56 -07:00
David Back
174519e86e fix reselecting same entity in list 2018-08-07 09:56:51 -07:00
Ryan Huffman
61fdce9c11 Fix duplicating multiple entities causing infinite looping 2018-08-07 09:52:14 -07:00
SamGondelman
82029b4cb0 fix v1 and transparent procedurals 2018-08-07 09:28:40 -07:00
Thijs Wenker
95c32c8e45 fix reset triggerable checkbox 2018-08-07 17:23:49 +02:00
r3tk0n
1aa9fcd41a
Fix a typo
In jsdoc comments for getWorldFeetPosition() in Avatar.h
2018-08-06 21:23:06 -07:00
David Rowe
c9c23b8db3 Fix entity stay highlighted after hand leaves when far grabbing another 2018-08-07 15:34:17 +12:00
MuteTab
b590ff793a New function for changing location in domains such that the AVatar's leg-length is taken into account. 2018-08-06 20:26:44 -07:00
MuteTab
d04ac2b8ed Fixed jsdoc comments for Avatar::getWorldFeetPosition 2018-08-06 19:40:47 -07:00
amantley
1ad6b041cd updated the elipes equation code for determining the forward speed of the avatar. We can now set the max forward == walkSpeed, max side and backwards == walkBackwardsSpeed and the sprint speed == sprintSpeed 2018-08-06 18:36:32 -07:00
David Back
f9e25d36e7 use wrapper emitScriptEvent, change to Fetching 2018-08-06 17:52:27 -07:00
Anthony Thibault
079b276c2b
Merge pull request #13733 from luiscuenca/fixElbowPoleVector3
Elbow pole vectors improvements
2018-08-06 17:33:03 -07:00
NissimHadar
998cc916e9 Merge branch 'master' of github.com:highfidelity/hifi into exportToTestRail1 2018-08-06 17:27:01 -07:00
David Back
e5abd9d57d fix server script status event, use [ Getting status ] 2018-08-06 17:03:32 -07:00
Sam Gateau
00c5b6f5f4
Merge pull request #13743 from SamGondelman/transparent
Fix primitives always drawing as transparents
2018-08-06 16:28:30 -07:00
MuteTab
de5c7f6dcd Change lambda for address manager position getter. 2018-08-06 16:02:00 -07:00
SamGondelman
a7dec8fb75 parabola and particle shader fixes 2018-08-06 15:49:52 -07:00
MuteTab
40889c8f09 Added getWorldFeetPosition() function to Avatar 2018-08-06 15:35:54 -07:00
Sam Gondelman
7dd80d0180
Merge pull request #13240 from jherico/feature/glsl_layouts
Update shader pipeline, improve mac startup time
2018-08-06 15:30:46 -07:00
NissimHadar
27124284d5 Merge branch 'master' of github.com:highfidelity/hifi into exportToTestRail1 2018-08-06 14:48:16 -07:00
Brad Davis
dcdc3a323c Use defines for packed textures to satisfy both GLES and GL 4.1 2018-08-06 14:35:36 -07:00
Brad Davis
993e1e1c4d Use GLES compatible context for shader tests 2018-08-06 14:35:11 -07:00
amantley
f1990378fd merged the json from the ik 2 bone pr into the new animation json 2018-08-06 14:27:09 -07:00
David Back
112327a3c1
Merge pull request #13735 from dback2/entityCameraKeyFix
Use key codes for entity camera keys
2018-08-06 14:07:48 -07:00
Clément Brisset
9de0c25eb5
Merge pull request #13763 from hyperlogic/feature/avatar-data-packet-size-addition
Added readme and size field to avatar data packet dissector
2018-08-06 13:59:12 -07:00
Clément Brisset
5c3ab2c354
Merge pull request #13762 from kencooke/audio-hrtf-bugfix
Fix possible assert in HRTF
2018-08-06 13:58:45 -07:00
Anthony J. Thibault
2cd01ad189 Added readme and size field to avatar data packet dissector 2018-08-06 11:15:43 -07:00
Brad Davis
a0ef0c0b13 Fix procedurals 2018-08-06 10:31:14 -07:00
NissimHadar
0377be2d0d Can update test results in TestRail. 2018-08-06 10:21:33 -07:00
SamGondelman
6b7f5b662e jsdoc fixes 2018-08-06 09:41:05 -07:00
NissimHadar
188d82b384 Python script seems complete. 2018-08-06 09:29:41 -07:00
amantley
08889b627a Merge remote-tracking branch 'upstream/master' into animationBlendChanges 2018-08-06 09:16:53 -07:00
NissimHadar
e5c0fa0af9 Working on updating test results. 2018-08-06 08:25:05 -07:00
Angus Antley
a63b213d65 fixed the weight calculation for the hand overlays. to do: check the blends in hmd mode 2018-08-06 15:18:17 +01:00
Olivier Prat
c56bb9a855 Small optimization by using squared distance and not distance in depth sort 2018-08-06 08:20:21 +02:00
Olivier Prat
8eb7ceb66a Fixed the bug with the thin dark lines at cascade shadow switches (hopefully) 2018-08-05 12:06:36 +02:00
Ken Cooke
496724f0db formatting cleanup 2018-08-04 20:15:04 -07:00
Ken Cooke
2121e201d5 fix assert when azimuth is negative subnormal 2018-08-04 20:09:27 -07:00
Robin Wilson
c4e8205a79 reordered build.md instructions 2018-08-04 14:02:05 -07:00
NissimHadar
e61a686923 Merge branch 'exportToTestRail1' of github.com:NissimHadar/hifi into exportToTestRail1 2018-08-04 09:04:38 -07:00
NissimHadar
d5108540d6 Merge branch 'master' of github.com:highfidelity/hifi into exportToTestRail1 2018-08-04 09:04:05 -07:00
Olivier Prat
d457cf45d5 Fixed bug with NaN shadow anti frustum leading to disappearing shadows on some occasions 2018-08-04 16:51:05 +02:00
Olivier Prat
92e64510ec Fixed draw frustum and draw aabb code 2018-08-04 15:58:24 +02:00
David Rowe
83ed572a33 Render Touch controllers at physical hands's locations 2018-08-04 19:27:44 +12:00
Brad Davis
e6fb2a9e15 Add scribe source files to project 2018-08-03 21:57:53 -07:00