amerhifi
8802eeadf6
Make CI android build signed, don't fail on quest build fails ( #18 )
...
merging build changes
2019-03-01 12:46:50 -08:00
amer cerkic
ad69611b7c
removing redef of the two functions in avatar.h
2019-03-01 11:08:00 -08:00
amer cerkic
6ebc57994b
Merge branch 'master' into quest-demo
2019-03-01 10:23:41 -08:00
amer cerkic
3e3176d3a4
Merge branch 'master' of https://github.com/highfidelity/hifi
2019-03-01 10:23:30 -08:00
Shannon Romano
33e061b09b
Merge pull request #15022 from danteruiz/fix-tablet-scaling
...
Case 21424: Tablet does not properly resize when scaling avatar.
2019-03-01 09:37:47 -08:00
Shannon Romano
1084e79a2e
Merge pull request #15019 from AndrewMeadows/fix-crash-after-avatar-upload
...
Case 21422: fix crash for nullptr deref when looking at recently uploaded avatar in inventory
2019-03-01 09:35:01 -08:00
Shannon Romano
d68f82eb7d
Merge pull request #15060 from AndrewMeadows/avoid-mem-leaked-entities
...
Case 21494: Avoid mem leaked entities
2019-03-01 09:34:20 -08:00
Shannon Romano
00ca3bc933
Merge pull request #15058 from SamGondelman/reload
...
Case 21490: Fix lasers and keyboard on reload
2019-03-01 09:31:56 -08:00
Shannon Romano
b5693b8364
Merge pull request #15063 from SamGondelman/chat
...
Case 21496: Fix chat.js textSize
2019-03-01 09:31:15 -08:00
Shannon Romano
650fb41681
Merge pull request #15053 from SamGondelman/i
...
Case 21486: Fix context overlay
2019-02-28 17:06:02 -08:00
SamGondelman
8d5a3debfa
fix chat.js textSize
2019-02-28 15:28:18 -08:00
Dante Ruiz
d33400f6ad
fix GCC compiler warning
2019-02-28 15:25:15 -08:00
Andrew Meadows
8a7853a701
remove crufty comment
2019-02-28 14:38:13 -08:00
Andrew Meadows
33d6e2ce3b
avoid mem-leaked entities when clearing tree
2019-02-28 14:21:35 -08:00
Andrew Meadows
ed9ebf84c9
remove unuseful log entry
2019-02-28 14:21:14 -08:00
Andrew Meadows
7d9efe4c09
avoid mem-leak for serverless domains
2019-02-28 14:20:11 -08:00
amerhifi
35dc13e06a
Merge branch 'master' into quest-demo
2019-02-28 14:06:47 -08:00
SamGondelman
15064f0097
fix lasers and keyboard on reload
2019-02-28 14:04:22 -08:00
danteruiz
f715dbe243
fix tablet scaling
2019-02-28 13:32:12 -08:00
amer cerkic
cda9bce293
Merge branch 'master' of https://github.com/highfidelity/hifi
2019-02-28 12:36:00 -08:00
Shannon Romano
0f0ed0fbc4
Merge pull request #15007 from Atlante45/fix/kick-bug-master
...
Case 21402: Don't send a KillAvatar packet on kick
2019-02-28 12:26:30 -08:00
SamGondelman
a8e6d01279
fix context overlay
2019-02-28 11:33:09 -08:00
amer cerkic
faedc61c37
removing quest-demo specific changes
2019-02-28 10:54:30 -08:00
amer cerkic
36cd26b190
Merge branch 'master' of https://github.com/highfidelity/hifi
2019-02-28 10:18:04 -08:00
Sam Gateau
22b18c0c3d
Merge pull request #15047 from amerhifi/quest-demo
...
case 21477: Execute command line args for Quest testing, profiling, etc
2019-02-28 09:44:45 -08:00
Anthony Thibault
72f198fe00
Merge pull request #14904 from hyperlogic/feature/preserve-default-scale
...
Case 20943: Animations should preserve avatar joint scale
2019-02-27 16:49:27 -08:00
amer cerkic
95628dfc11
removing unused imports
2019-02-27 15:36:49 -08:00
amer cerkic
a425becc8a
clean up of debugging
2019-02-27 15:35:33 -08:00
amer cerkic
29ec5486f6
manual pushing args to the app. Removed some debugging printouts
2019-02-27 15:31:23 -08:00
Shannon Romano
1a83ab2dab
Merge pull request #15038 from danteruiz/fix-login-screen
...
Case 21451: HMD Login Encouragement Screen is not Usable
2019-02-27 14:41:41 -08:00
Anthony Thibault
b5f5900633
Replace animation scale with scale from avatar default pose
...
This allows avatars to have scale on their joints without being clobbered by animations.
Renamed variables for easier maintenance.
Also small optimization when no ikNode is present.
2019-02-27 14:40:08 -08:00
amer cerkic
8fff3476ec
Merge branch 'quest-demo' of https://github.com/highfidelity/hifi into quest-demo
2019-02-27 11:45:49 -08:00
amer cerkic
92cfa49bfb
adding and testing command line parameter passing to application
2019-02-27 11:42:22 -08:00
Shannon Romano
c9edf86558
Merge pull request #15040 from SamGondelman/web
...
Case 21453: Fix web interaction and debug print filling logs
2019-02-27 11:19:20 -08:00
SamGondelman
bf9e5b9550
comment out another log
2019-02-27 10:25:34 -08:00
danteruiz
2fd94c6bbc
fixing login dialog
2019-02-27 10:08:38 -08:00
Sam Gondelman
fd46296e8c
Merge pull request #15037 from amerhifi/quest-demo
...
case 21447: fixed quest debug crash when a case of _widths = 0 for polyline
2019-02-26 16:42:01 -08:00
SamGondelman
4d591e0624
fix web interaction and debug print filling logs
2019-02-26 16:30:31 -08:00
John Conklin II
2449693d8b
Merge pull request #15006 from Atlante45/fix/shared-connection-master
...
Case 21407: Delete old nodes with identical socket
2019-02-26 16:24:03 -08:00
amer cerkic
19d584f0af
added Sams suggestions to the logic
2019-02-26 15:28:28 -08:00
amer cerkic
f5852139f7
fixing comment since the original check was correct
2019-02-26 15:05:58 -08:00
amer cerkic
5a7c8c3126
removed debugg helpers
2019-02-26 14:53:44 -08:00
amer cerkic
4c6bea48b2
fixed a case where _widths = 0 and widths-1 is not valid.
2019-02-26 14:48:34 -08:00
Sam Gondelman
f1541c3df4
Merge pull request #15023 from SamGondelman/web
...
Case 21171: Web entity thread safety and fixes
2019-02-26 11:37:46 -08:00
Sam Gateau
009bc19c5d
Merge pull request #15020 from amerhifi/quest-demo
...
Adding market place back to the default scripts
2019-02-26 11:05:36 -08:00
Shannon Romano
92168f60c6
Merge pull request #14993 from SamGondelman/untexture
...
Case 21071: Handle models with no materials
2019-02-26 10:07:37 -08:00
amer cerkic
acc78f2f42
Merge branch 'quest-demo' of https://github.com/highfidelity/hifi into quest-demo
2019-02-26 09:54:32 -08:00
Sam Gateau
f7e57ea56f
Merge pull request #14990 from jherico/quest/build
...
Case 20979: Build quest demo apk on Jenkins
2019-02-26 09:11:30 -08:00
Shannon Romano
2aa622b855
Merge pull request #15014 from sethalves/fix-grab-earthquake
...
case 21411: don't allow others' grabs to move locked or ungrabbable things
2019-02-26 09:03:44 -08:00
SamGondelman
94a82b8304
Merge remote-tracking branch 'upstream/master' into web
2019-02-25 17:23:58 -08:00
