Gabriel Calero
a767540b76
Fix connection issue syncing two AccountManagers
2018-05-03 17:53:18 -03:00
John Conklin II
f43b9ee7e8
Merge pull request #12960 from hyperlogic/feature/bullet-debug-draw
...
Added items to the developer menu for debugging physics
2018-05-02 14:25:09 -07:00
Gabriel Calero
4dce62cc2e
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-05-02 16:27:41 -03:00
John Conklin II
7a5fce4315
Merge pull request #12991 from luiscuenca/avatarScript
...
Avatar Scripts
2018-05-02 12:23:13 -07:00
luiscuenca
689fbd2da0
added requested changes
2018-05-02 11:09:17 -07:00
Anthony J. Thibault
4fa9af5534
Added items to the developer menu for debugging physics
...
Hooked up Bullet's internal debug draw functionality to our client.
Under the Developer > Physics Menu there are five new items:
* Show Bullet Collision - will draw all collision shapes in wireframe. WARNING: can be slow on large scenes.
* Show Bullet Bounding Boxes - will draw axis aligned bounding boxes around all physics shapes.
* Show Bullet Contact Points - will draw all contact points where two or more objects are colliding.
* Show Bullet Constraints - will render wire frame axes for each constraint connecting bodies together.
* Show Bullet Constraint Limits - will render the joint limits for each constraint.
2018-05-02 10:51:00 -07:00
Gabriel Calero
c15ef56d90
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-05-02 14:38:10 -03:00
John Conklin II
83d370f1af
Merge pull request #12872 from huffman/fix/vertex-colors-fbx
...
Fix FBX vertex colors not being read correctly
2018-05-02 10:22:01 -07:00
Sam Gateau
22e5465767
Merge pull request #13013 from AndrewMeadows/avoid-update-flood
...
fix bug: interface sends too many updates on settle
2018-05-02 08:52:58 -07:00
Ken Cooke
a4105f1081
Merge pull request #13052 from kitely/fix-gcc-warnings
...
Eliminated warnings in gcc
2018-05-02 06:43:32 -07:00
Oren Hurvitz
26ffb3213c
Changed "[[gnu::fallthrough]]" to "// FALLTHRU"
2018-05-02 07:06:47 +01:00
Stephen Birarda
12f7dd93dc
Merge pull request #13068 from birarda/67-to-master
...
merge RC67 back to master
2018-05-01 17:24:46 -07:00
Stephen Birarda
0838381e4c
Merge pull request #13070 from SimonWalton-HiFi/getdomainlocalid-assert
...
Prevent call of getDomainLocalID() by domain server itself more robustly
2018-05-01 15:45:37 -07:00
Simon Walton
bbcb07d9ab
Brute force it with isDomainServer()
2018-05-01 15:07:44 -07:00
Simon Walton
0627099667
In packetSourceAndHashMatchAndTrackBandwidth() check LocalID after check for DS source
...
Makes check more robust in case domain server itself reaches this point,
since LimitedNodeList::getDomainLocalID() debug-asserts.
2018-05-01 14:33:48 -07:00
Stephen Birarda
f5441c05b3
Merge branch 'master' of github.com:highfidelity/hifi into 67-to-master
2018-05-01 14:18:24 -07:00
Stephen Birarda
cad63ad107
Revert "Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently""
...
This reverts commit acb21cc96a
.
2018-05-01 14:15:12 -07:00
John Conklin II
250aa3ab43
Merge pull request #13027 from jherico/fix/web_crash2
...
Some fixes for QML surfaces
2018-05-01 12:39:46 -07:00
John Conklin II
c3e531dda1
Merge pull request #13062 from sethalves/fix-physics-crash-on-exit
...
fix physics related crash-on-exit
2018-05-01 11:04:50 -07:00
Stephen Birarda
24dc1c930e
Merge branch 'RC66.2' of github.com:highfidelity/hifi into 66-2-to-67
2018-05-01 10:54:35 -07:00
Seth Alves
f1e1c6a348
fix physics related crash-on-exit
2018-05-01 09:15:44 -07:00
David Rowe
2482da3c25
Miscellaneous JSDoc fixes noticed in passing
2018-05-01 21:55:45 +12:00
David Rowe
a1fc1c4810
Add JSDoc for Entity preload and unload signals
2018-05-01 21:55:14 +12:00
luiscuenca
50ca09b3b4
minor fixes
2018-04-30 16:26:04 -07:00
Stephen Birarda
ed47cd8458
add a missing unsafe_erase for local node ID map
2018-04-30 12:35:48 -07:00
luiscuenca
2de982a5a2
Added script types and better script reload
2018-04-30 12:04:35 -07:00
John Conklin II
bc7b0ca0a9
Merge pull request #13029 from birarda/bug/revert-12969-in-67
...
Fix missed revert of PR 12969 for RC67
2018-04-30 11:11:38 -07:00
MiladNazeri
a2e2b2cb8c
Merge pull request #13047 from ctrlaltdavid/21856-b
...
Fix JSDoc for Entities.findEntitiesByName
2018-04-30 11:00:35 -07:00
John Conklin II
ed39b4f63e
Merge pull request #13014 from druiz17/fix-localhost-port
...
hide default port from addresses, fix localhost scheme
2018-04-30 10:10:06 -07:00
Oren Hurvitz
69b97b423f
Added a missing 'break' in AnimExpression::evalUnaryMinus()
2018-04-30 15:42:45 +03:00
Oren Hurvitz
a226790295
Eliminated warnings in gcc
...
Note that the call to encodeNode() in FBXWriter.cpp can never be reached, so it's safe to remove it.
2018-04-30 15:05:27 +03:00
David Rowe
8d71d72258
Fix JSDoc for Entities.findEntitiesByName
2018-04-28 13:16:26 +12:00
Brad Davis
8e42bb8c87
Restore the stop functionality for a browser view when it's being destroyed
2018-04-27 17:35:38 -07:00
Ken Cooke
1e25d48941
Merge pull request #13044 from roxanneskelly/roxie-arm64-fixes
...
Two fixes for arm64 on linux
2018-04-27 17:15:03 -07:00
Roxanne Skelly
ac8b3e4f5e
Two fixes for arm64 on linux
...
1) size_t is not defined by default in gcc, so stddef.h needed to be added
to AudioDynamics.h to handle some size_t usage.
2) gcc defaults char to unsigned, where windows defaults to signed. OctalCode.cpp
was assuming signed
2018-04-27 23:21:54 +00:00
John Conklin II
37f4a2d3a8
Merge pull request #12986 from hyperlogic/bug-fix/debug-rendering-over-background
...
Debug Draw rendering now is visible on background skybox
2018-04-27 15:56:44 -07:00
Brad Davis
575520fe30
Ensure we actually delete the QML scenegraph!
2018-04-27 15:08:10 -07:00
John Conklin II
dd32ca33a5
Merge pull request #12957 from sethalves/quiet-logging
...
Quiet logging
2018-04-27 14:59:38 -07:00
John Conklin II
1f4a9b6bcc
Merge pull request #12950 from SimonWalton-HiFi/batch-compile-shaders2
...
Batch compile more shaders
2018-04-27 14:55:57 -07:00
Stephen Birarda
5324ea6d5d
Merge pull request #13038 from highfidelity/stable
...
Merge stable to RC66.2
2018-04-27 14:42:28 -07:00
John Conklin II
ddedfce8a3
Merge pull request #12932 from ZappoMan/fixBug349
...
fix bug 349
2018-04-27 12:48:17 -07:00
John Conklin II
73b175a1f2
Merge pull request #12934 from misslivirose/fix/import-whitespace
...
trim before importing from clipboard
2018-04-27 12:44:35 -07:00
Bradley Austin Davis
acb21cc96a
Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently"
2018-04-27 10:50:47 -07:00
Zach Fox
c163ae63b8
Allow gifting of Pending items; remove PoP verification rescheduling on Pending items
2018-04-27 10:28:59 -07:00
Zach Fox
0f36fb113d
Allow gifting of Pending items; remove PoP verification rescheduling on Pending items
2018-04-27 10:20:55 -07:00
Brad Davis
e892694bf5
Don't modify URL on web entity on QML shutdown, remove tablet related code from web entity
2018-04-27 08:13:35 -07:00
Brad Davis
1b612d373f
Explicitly delete QML context before releasing engine
2018-04-27 08:11:11 -07:00
Brad Davis
6640313256
Fix memory leak in QML surfaces
2018-04-27 08:10:22 -07:00
Brad Davis
4db83230ce
Fix bad virtual cast on qml surface destruction
2018-04-27 08:09:31 -07:00
Brad Davis
2662dc9b4e
Suppress tracing log spam when tracing is not active
2018-04-27 08:03:48 -07:00