David Rowe
0a7cccc3f7
Move Vec2 and Vec4 JSDoc
2018-04-20 12:47:53 +12:00
samcake
cb706cb9d9
Reapply extra sanity check that hasn;t been applied correctly in rc66
2018-04-19 17:24:04 -07:00
Simon Walton
377fc6d6c6
Revert to old packet version for ICE packets
...
Some ICE (& STUN) packets were using the default version,
which we bumped for the HMAC change. This commit breaks
out the switch for them and reverts to 17.
2018-04-19 16:55:32 -07:00
David Back
ef447cedfb
Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip
2018-04-19 16:30:01 -07:00
David Back
8950c31378
fix mouse equipping while someone else far grabbing
2018-04-19 16:29:49 -07:00
David Rowe
8ade4f34f4
Tweak wording
2018-04-20 10:11:01 +12:00
David Rowe
0552a7242a
Further JSDoc updates for serverless domains
2018-04-20 09:52:35 +12:00
David Rowe
08defea755
Merge branch 'master' into 21836
2018-04-20 09:20:56 +12:00
John Conklin II
11f509e57a
Merge pull request #12873 from Zvork/haze
...
Fix for weird color shifting of teleportation target in Rust domain
2018-04-19 14:11:47 -07:00
Ryan Huffman
bef4eb1d05
Increase packet version for Ping
2018-04-19 14:04:17 -07:00
MiladNazeri
6b5ed27559
Merge pull request #12926 from highfidelity/MiladNazeri-patch-1
...
Fix QT typo
2018-04-19 14:01:25 -07:00
MiladNazeri
7e780ed55a
Merge pull request #12915 from ctrlaltdavid/21849
...
Add Entities materialData JSDoc
2018-04-19 13:49:24 -07:00
milad
42471c539b
initial fixes from ctralt david's comments
2018-04-19 13:40:57 -07:00
Howard Stearns
6d151f022d
Merge pull request #12910 from zfox23/MS12217_letterboxMessageFix
...
Only dismiss letterbox when clicking on grey areas
2018-04-19 11:47:10 -07:00
vladest
663af09605
Fix SpinBox. attempt 1
2018-04-19 20:43:48 +02:00
David Back
f7723a5bba
Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip
2018-04-19 11:17:34 -07:00
David Back
8cbe0f4633
safer clear grab actions
2018-04-19 11:17:26 -07:00
Seth Alves
6f420ffae2
Merge pull request #12936 from druiz17/more-tablet-changes
...
Change tablet model and spawn position
2018-04-19 10:25:34 -07:00
Sam Gateau
f87bfc14de
Merge pull request #12898 from kitely/emissivemap-relative-path
...
In Material resources, support relative paths for 'emissiveMap'
2018-04-19 10:25:02 -07:00
John Conklin II
5ef90b242e
Merge pull request #12925 from thoys/fix/create-errorOnShutdown
...
Create app: Save light selection menu option properly
2018-04-19 10:16:40 -07:00
SimonWalton-HiFi
9d06890aea
Merge branch 'master' into short-id
2018-04-19 10:09:34 -07:00
John Conklin II
cad4d45941
Merge pull request #12871 from Atlante45/fix/dead-octree-code
...
Remove dead Octree code
2018-04-19 09:58:20 -07:00
David Back
d1bb11562b
Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip
2018-04-19 09:36:19 -07:00
Sam Gateau
1e086332cc
Merge pull request #12911 from jherico/feature/splash
...
Pre-requisite changes for splash screen rendering
2018-04-19 09:19:05 -07:00
Ken Cooke
764aa00069
Coding standard fixes
2018-04-19 07:33:14 -07:00
Olivier Prat
c8bef8651f
Fixed weird specular on hair an teleportation target! Was a stupid mistake...
2018-04-19 10:04:38 +02:00
milad
364d193499
audio added
2018-04-18 21:04:57 -07:00
milad
3f129bda13
More done on audio
2018-04-18 20:04:41 -07:00
Stephen Birarda
c4ad93bafb
Merge pull request #12782 from SimonWalton-HiFi/qregexp
...
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
2018-04-18 17:28:48 -07:00
Zach Fox
e01e7cc7bc
Be a bit more efficient
2018-04-18 16:34:02 -07:00
John Conklin II
e557e0ae52
Merge pull request #12844 from druiz17/feature-entity-highlighting
...
Highlight grabbable and equippable entities.
2018-04-18 15:35:46 -07:00
John Conklin II
51a98961a6
Merge pull request #12920 from thoys/fix/create-dontCloneOthersAvatarEntities
...
edit.js - remove ability to clone non-owned avatar-entities
2018-04-18 15:27:09 -07:00
Simon Walton
c964852e45
Another use of NULL_LOCAL_ID
2018-04-18 15:09:00 -07:00
Clement
a8d6a4e0b6
CR
2018-04-18 15:05:49 -07:00
David Back
bf21a4cf56
tabs
2018-04-18 15:05:29 -07:00
David Back
666653dd96
tabs
2018-04-18 15:01:14 -07:00
David Back
4a37c4ba18
add entityIsEquipped utils for grab.js check
2018-04-18 15:00:10 -07:00
John Conklin II
87f60e1e25
Merge pull request #12894 from sethalves/fix-tractor-action-crazy
...
fix bug that caused tractor action to go crazy
2018-04-18 14:13:56 -07:00
John Conklin II
eedc8a8c0a
Merge pull request #12929 from misslivirose/fix/misc-edit-bugs
...
Fix edit icon behavior
2018-04-18 13:46:38 -07:00
Zach Fox
e0012ed5dc
Merge pull request #12924 from zfox23/MS12292_snapshotResourcesPath
...
Fix paths to various Snapshot resource files
2018-04-18 13:44:53 -07:00
Clément Brisset
482f8ddbff
Merge pull request #12913 from birarda/bug/login-no-perms
...
delay NL reset on login until new username is known
2018-04-18 13:31:56 -07:00
Dante Ruiz
86d3ba658f
Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting
2018-04-18 13:30:24 -07:00
Dante Ruiz
cf22f61361
adding cleanup of selection
2018-04-18 13:30:14 -07:00
Zach Fox
3ef0598871
Merge pull request #12923 from zfox23/MS10864_preventSnapshotSpam
...
Don't allow users to spam Still Only snapshot capture
2018-04-18 13:19:36 -07:00
Anthony Thibault
147da86668
Merge pull request #12933 from hyperlogic/feature/wireshark-avatar-data
...
Add more detailed AvatarData packet support to Wireshark dissector plugin
2018-04-18 13:13:54 -07:00
Dante Ruiz
9d6fc13a04
Merge branch 'master' of github.com:highfidelity/hifi into more-tablet-changes
2018-04-18 13:06:51 -07:00
Dante Ruiz
a65f5f7917
making tablet changes
2018-04-18 13:06:26 -07:00
Simon Walton
01c39d4310
Use NULL_LOCAL_ID in more places, as requested by review
2018-04-18 11:53:47 -07:00
John Conklin II
db99d12736
Merge pull request #12919 from kitely/fix-import-entities-distance
...
Fixed crash when importing entities from JSON multiple times
2018-04-18 11:52:46 -07:00
John Conklin II
710bfb894a
Merge pull request #12907 from AndrewMeadows/more-correct-stats-002
...
more correct stats names
2018-04-18 10:50:38 -07:00
