Commit graph

3651 commits

Author SHA1 Message Date
Sabrina Shanman
63fa9afa13
Merge pull request #16323 from highfidelity/master
Merge master into instancing
2019-10-09 16:59:54 -07:00
Maia Hansen
6b5f90f641
Merge pull request #16315 from jherico/qt_5.13
Qt 5.13 changes
2019-10-09 15:04:07 -07:00
Brad Davis
960cab9994 Qt 5.13 warnings & fixes 2019-10-08 15:40:13 -07:00
Howard Stearns
9d17c32ff4
Merge pull request #16309 from SimonWalton-HiFi/assignment-client-logging-for-paging
DEV-2329: Identify Alerting requirements for Assignment Client reliable operation
2019-10-08 15:35:22 -07:00
Simon Walton
f63360a87a Change read back to peek - guess it was that way for a reason 2019-10-08 11:01:42 -07:00
Simon Walton
f73a7c0883 Modified AC logging for paging requirements 2019-10-07 17:35:14 -07:00
jennaingersoll
47aa43f56a
Merge pull request #16251 from ctrlaltdavid/DOC-155
DOC-155: EntityViewer JSDoc
2019-10-07 15:45:42 -07:00
Sabrina Shanman
2fcb526a5c
Merge pull request #16305 from highfidelity/master
Merge master into instancing
2019-10-07 15:44:42 -07:00
Simon Walton
67d80cdd15 Add per-Node & ESS-specific stats 2019-10-04 15:38:05 -07:00
Simon Walton
6a4406ad12 Put generic stats in sendStatsPacket() stub 2019-10-03 17:46:52 -07:00
Sam Gateau
1d19671e88 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-01 11:27:16 -07:00
Atlante45
a4c857315a Add shutdown annotations for crash reporting 2019-09-30 14:54:17 -07:00
David Rowe
0cafae2422 EntityViewer JSDoc 2019-09-26 10:54:12 +12:00
Simon Walton
6ccfc37f27 Merge remote-tracking branch 'upstream/master' into connection-class-ignored-unused 2019-09-25 13:06:32 -07:00
Brad Hefta-Gaub
068fb0e177
Merge pull request #16240 from ctrlaltdavid/BUGZ-577
BUGZ-577: Implement Recording.setPlayerVolume()
2019-09-25 10:31:57 -07:00
Simon Walton
4f11e46b5e Don't move Connection class to changed address until it's used 2019-09-24 16:39:59 -07:00
David Rowe
2fe24b39db Code review 2019-09-25 07:50:56 +12:00
David Rowe
f60e863b66 Remove wayward comment 2019-09-24 16:36:11 +12:00
David Rowe
b174e002a9 Implement Recording.setPlayerVolume() 2019-09-24 12:52:51 +12:00
Clement
1ca30b688d Put flush timer on right thread without parenting 2019-09-20 15:39:35 -07:00
Clement
527b27b32d Make sure the flush timer is not spawned too early 2019-09-18 17:05:05 -07:00
sabrina-shanman
76b1f551b1 Merge branch 'master' into instancing 2019-09-16 10:17:59 -07:00
sabrina-shanman
5837053f50 Fix miscellaneous build errors/warnings 2019-09-13 16:56:30 -07:00
Shannon Romano
65d0bb1342
Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc
Kasen Plugin Infrastructure v½ Codename "Modkit Mini"
2019-09-11 13:04:01 -07:00
Clement
3b734b2222 Always stop challenge timer from the right thread 2019-09-09 16:01:45 -07:00
Andrew Meadows
0a8c640ab5 give entity-script-server a simulation 2019-09-06 17:23:38 -07:00
Andrew Meadows
6e35c8b804 cleanup 2019-09-06 17:23:38 -07:00
humbletim
271fac4bca Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge 2019-09-05 09:46:21 -04:00
Clement
86b635d80a Add context object to timer connection 2019-09-03 13:40:02 -07:00
Howard Stearns
26256c383a
Merge pull request #16081 from SimonWalton-HiFi/avatar-thrashing
DEV-336: Fixes for avatar-verify failures with rapid avatar selection
2019-08-22 15:58:24 -07:00
Simon Walton
3d2e5dc816 Change method name for consistency 2019-08-21 14:19:57 -07:00
Simon Walton
cf21bc438e Remove unused function and debugging variable 2019-08-21 14:00:13 -07:00
Simon Walton
9d0cd83ca4 Better handling of challenge timer 2019-08-21 11:59:04 -07:00
Simon Walton
61668d3480 Handle concurrent verify operations better; other improvements 2019-08-20 18:03:46 -07:00
Simon Walton
2fafb6822d Remove identity-resend hack - shouldn't be required now 2019-08-16 18:03:20 -07:00
Simon Walton
4de720a456 Enable the event-queue hack on Linux in addition to Windows 2019-08-09 11:12:33 -07:00
Roxanne Skelly
2e5127fa98 Merge branch 'master' of https://github.com/highfidelity/hifi into bugz1046 2019-08-07 10:40:23 -07:00
Roxanne Skelly
a991b6d619 BUGZ-1046 - send entity packets reliably for initial query 2019-07-31 16:59:21 -07:00
David Rowe
ade85ad8c0 Update API JSDoc with glTF 2019-07-30 10:41:07 +12:00
Simon Walton
d9572d9e8c Improved avatar-verify diagnostics 2019-07-26 15:35:09 -07:00
humbletim
058c81aa1a Merge branch 'hifi-master' into kpi-v1-modkit-rc 2019-07-26 01:36:52 -04: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
Clement
8dd18fbe62 Make sure the send thread terminates before delete 2019-07-23 14:21:07 -07:00
Simon Walton
63c3452cf2 Restore avatar theft functionality; banner-click to appropriate menu 2019-07-19 16:35:07 -07:00
kasenvr
e9e9607a3b modkit core changes initial commit
whitespace corrections + warnings
updated cmake plugin
rework with focus on JS API integration example
cleanup edit_filter scope
separate-out edit_filter wantsScope stuff
-plugin metadata
split scriptengines out separately
cleanup __url/__filename sets
additional cleanup
fix typo; consolidate ScriptInitializerMixin inits
add more example API protoypes
cleanup pass; fix entity_server / agent init
fix whitespace
remove technically unnessary plugin filtering
+EDIT_FILTER_SCRIPT; cleanup
reorder public/slot/private
use std::count_if
formatting
better debug output; cleanup
fix msvc compiler warning
cleanup
eradicate QtScript references from API Example
updated header comments
Updated KasenAPIExample
2019-07-14 21:35:13 -04:00
Simon Walton
597477614c Debugging for missing Avatar Data 2019-07-03 17:51:05 -07:00
jennaingersoll
1935b49538
Merge pull request #15676 from ctrlaltdavid/DOC-33
DOC-33: MyAvatar API JSDoc catch-up
2019-06-11 15:05:06 -07:00
David Rowe
231d1373b6 Update MyAvatar, Avatar JSDoc per recent changes 2019-06-05 08:38:34 +12:00
Simon Walton
c92a688130 Don't send AvatarIdentity from mixer if socket not yet active 2019-06-03 18:14:49 -07:00
Clement
0f38001d28 Clear traits ack data on node disconnect 2019-05-29 16:34:13 -07:00