Brad Davis
d92c62c742
Make android use the existing shared pointers
2018-09-12 15:04:36 -07:00
Brad Davis
700c6519bf
More PR comments
2018-09-12 15:04:36 -07:00
Brad Davis
37cf37e3e1
PR feedback
2018-09-12 15:04:36 -07:00
Brad Davis
cfff28ad0a
More shared pointer deduplication
2018-09-12 15:04:35 -07:00
Brad Davis
9a435cdca2
Reduce needless smart pointer duplication
2018-09-12 15:04:35 -07:00
Stephen Birarda
b1f44d2ad7
perform avatar entity cleanup in AvatarManager::handleRemovedAvatar
2018-09-12 12:30:15 -07:00
Stephen Birarda
1789d51d6e
Revert "cycle avatar entity IDs for new avatar mixer"
...
This reverts commit 20912349a4
2018-09-12 12:22:07 -07:00
Stephen Birarda
6d3e6a661f
Revert "XOR incoming trait instance IDs for other avatars"
...
This reverts commit 9b3d9dd0f3
2018-09-12 12:20:31 -07:00
Stephen Birarda
4b93f9f5cd
Revert "use different XORed instance ID for replicas"
...
This reverts commit a37a19da1e
2018-09-12 12:20:03 -07:00
John Conklin II
f67deb9f65
Merge pull request #13938 from wayne-chen/interstitalMerged
...
Interstitial Page with 404 Redirect
2018-09-12 08:39:52 -07:00
Sam Gateau
f79c92b4ff
Merge pull request #13974 from samcake/black-ter
...
Fix a missing std::chrono::duration_cast
2018-09-12 08:27:19 -07:00
Wayne Chen
20cab87a17
Merge branch 'interstitalMerged' of https://github.com/wayne-chen/hifi into interstitalMerged
2018-09-11 18:53:06 -07:00
Wayne Chen
a7321f950a
pushing requested changes - adding timeout refusal
2018-09-11 18:32:17 -07:00
Brad Hefta-Gaub
d319bea2ac
Merge pull request #13973 from hyperlogic/feature/indicate-loading-status-on-avatar-orb
...
Avatar loading orb now indicates loading status
2018-09-11 18:01:40 -07:00
Wayne Chen
cb0aa8055f
Merge pull request #13961 from wayne-chen/loginOnLaunch
...
Pop up login dialog on launch
2018-09-11 17:43:29 -07:00
Wayne Chen
63ad85215b
Merge branch 'master' into interstitalMerged
2018-09-11 17:17:33 -07:00
Wayne Chen
8bca1bc5fe
reverting, oversight
2018-09-11 17:09:21 -07:00
Wayne Chen
a85a7a6119
adding back goToLastAddress back
2018-09-11 17:07:49 -07:00
Stephen Birarda
2c056e5b22
Merge pull request #13912 from birarda/bug/agent-clear-avatars
...
handle agent avatar clear on avatar mixer disconnect
2018-09-11 16:34:15 -07:00
Wayne Chen
490cdc901e
Merge pull request #3 from danteruiz/interstitalMerged
...
making requested changes and fixing compile issue for jenkins
2018-09-11 16:30:13 -07:00
Wayne Chen
0f25756908
expose domain connection error to Window
2018-09-11 16:29:39 -07:00
sam gateau
8c7781a6d4
use the std::chrono duration the way it should be
2018-09-11 15:57:57 -07:00
Dante Ruiz
c97d646083
making requested changes and fixing compile issue for jenkins
2018-09-11 15:57:44 -07:00
Dante Ruiz
b665dbe13e
finished requested changes
2018-09-11 14:18:12 -07:00
Anthony Thibault
bc5d9a46a2
Avatar loading orb now indicates status
...
white - no url has been received yet for this avatar
purple - a url has been received for this avatar but it's content is still downloading/loading
blue - (only visible breifly) content has succesfully loaded
red - (only visible briefly) content has failed to download.
2018-09-11 13:12:46 -07:00
Dante Ruiz
735ff04fad
fixing merge conflicts
2018-09-11 12:10:19 -07:00
Dante Ruiz
5c9a88868d
first round of requested changes
2018-09-11 12:01:55 -07:00
sam gateau
77586933c8
Merge and fix the default _value of GLquery so it is 0, not broken
2018-09-11 11:43:14 -07:00
sam gateau
840c8c95fd
cleaning the code and comments
2018-09-11 09:34:42 -07:00
Wayne Chen
6bcf6eaae7
Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch
2018-09-11 09:13:41 -07:00
Sam Gateau
5e76a0c6d7
changing the cpu timer of the batch to std::chrono instead of using gl cpu time stamp
2018-09-10 22:55:12 -07:00
Wayne Chen
c194c236f1
adding inlines
2018-09-10 17:10:13 -07:00
Stephen Birarda
a50e55b83a
use more efficient iterate and clear for removal
2018-09-10 17:06:57 -07:00
Sam Gateau
47cea49f78
Merge pull request #13922 from samcake/black-bis
...
Optimize the vertex formats of meshes for less input buffer bindings
2018-09-10 16:58:40 -07:00
Wayne Chen
e5a87aa58c
removing unused variables
2018-09-10 16:56:13 -07:00
John Conklin II
ae547f8950
Merge pull request #13881 from jherico/feature/no_uniforms
...
Remove all uniforms from our shaders
2018-09-10 15:42:01 -07:00
Sam Gateau
082d47d20f
Set the correct assert in replacment of the unecessary if branch
2018-09-10 14:31:49 -07:00
John Conklin II
558f3dc7e5
Merge pull request #13964 from dback2/reloadScriptQThreadCrash
...
Destroy script thread on finish instead of on ScriptEngine destroyed
2018-09-10 14:11:37 -07:00
sam gateau
fed377dc4c
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-09-10 12:00:09 -07:00
Stephen Birarda
19a9fb00c6
Merge pull request #13967 from huffman/fix/jsdoc-note-for-send-fake-handshake
...
Add comment to Assets.sendFakeHandshake about excluding jsdoc
2018-09-10 11:47:30 -07:00
Wayne Chen
ff86e480ba
adding debug statement to check for window close
2018-09-10 11:36:45 -07:00
John Conklin II
3b0f37c6f7
Merge pull request #13885 from birarda/bug/recording-scripting-stuck
...
fix Agent teardown of recording and ScriptEngine(s)
2018-09-10 10:51:52 -07:00
Sam Gondelman
ae8eea32d6
Merge pull request #13960 from SamGondelman/profileUnpacking
...
Add detailed profile range for avatar unpacking
2018-09-10 10:04:08 -07:00
David Back
3601ade8ba
destroy thread from thread finished not scriptEngine destroyed
2018-09-07 18:36:36 -07:00
Sam Gateau
5140999445
Forcing all the meshes with 3 buffers aka the blendshape layout
2018-09-07 15:57:04 -07:00
John Conklin II
bafdd06c91
Merge pull request #13934 from SimonWalton-HiFi/assigned-port-check
...
Check that a requested listening port is able to be used
2018-09-07 15:48:12 -07:00
sam gateau
e8cfac2ab1
Merge branch 'black-bis' of github.com:samcake/hifi into black-bis
2018-09-07 15:35:27 -07:00
sam gateau
9350d6f36e
removing performance counters
2018-09-07 15:35:10 -07:00
Stephen Birarda
adac872a11
clear other avatars in agent on avatar mixer disconnect
2018-09-07 15:04:14 -07:00
John Conklin II
472675f9a8
Merge pull request #13956 from hyperlogic/feature/improve-anim-stats
...
Move animation stats into its own Menu
2018-09-07 14:51:46 -07:00
