Commit graph

30251 commits

Author SHA1 Message Date
Seth Alves
0ac885da80 fix when memory debugging message is printed 2015-08-20 10:17:13 -07:00
Seth Alves
c25082d86f use -fsanitize=address in all code rather than just the top-level links 2015-08-20 10:14:16 -07:00
Stephen Birarda
08c810baad Merge branch 'master' of https://github.com/highfidelity/hifi 2015-08-20 10:04:56 -07:00
ZappoMan
cd050b2e60 don't show hmd tools for direct mod HMDs 2015-08-20 09:53:58 -07:00
Andrew Meadows
48ff54300b Merge pull request #5607 from jherico/maggie
Make sure that items added via plugins can be removed as well
2015-08-20 08:02:08 -07:00
Leonardo Murillo
129761c002 making qtimer interval a const 2015-08-20 08:10:19 -06:00
Leonardo Murillo
2c23dab2e7 More specific logging 2015-08-20 08:03:37 -06:00
Leonardo Murillo
f87f3eb033 Typo 2015-08-20 08:02:45 -06:00
Leonardo Murillo
2b26f302fd Better handling of socket binding 2015-08-20 08:01:33 -06:00
Brad Davis
9faf452196 Make sure that items added via plugins can be removed as well 2015-08-20 00:32:25 -07:00
Brad Davis
002aea3333 Add fullscreen menu item to 2D display plugin 2015-08-20 00:30:44 -07:00
Brad Davis
ce781ba889 Merge pull request #5606 from ZappoMan/throttleIssue
fix throttled rendering for the 2D display plugin
2015-08-20 00:20:17 -07:00
ZappoMan
6a7f367e5f fix throttled rendering for the 2D display plugin 2015-08-19 21:11:48 -07:00
Stephen Birarda
b386a95d08 fix sort for node uptime 2015-08-19 18:31:42 -07:00
Stephen Birarda
2738f65c10 have domain-server report non-skewed uptime 2015-08-19 18:23:11 -07:00
Seth Alves
2056f588e3 if environment variable HIFI_MEMORY_DEBUGGING is defined when cmake is run, enable -fsanitize=address on linux 2015-08-19 18:03:16 -07:00
Philip Rosedale
c9bd1cc829 Merge pull request #5602 from ZappoMan/centerOrigin
fix create in negative space bug
2015-08-19 17:14:01 -07:00
ZappoMan
010a3d8220 fix create in negative space bug 2015-08-19 17:12:03 -07:00
Andrew Meadows
5a442bdb30 Merge pull request #5555 from ZappoMan/centerOrigin
Make domains 8x larger (2x in each dimension), with origin at center of buildable space
2015-08-19 15:59:04 -07:00
Seth Alves
9ab46d696d Merge pull request #5601 from birarda/master
fix for Packet read in AvatarHashMap
2015-08-19 15:31:23 -07:00
Stephen Birarda
c8fbb64bbf fix AvatarHashMap read due to COW 2015-08-19 14:36:16 -07:00
Stephen Birarda
6860f3d126 add readWithoutCopy for clarity in Packet read 2015-08-19 14:32:26 -07:00
Brad Hefta-Gaub
4696fc961a Merge pull request #5599 from cozza13/20659
CR for Job #20659 - change default.js
2015-08-19 13:50:49 -07:00
Stephen Birarda
42a7262707 Merge pull request #5565 from murillodigital/node-version
DO NOT MERGE - Node versioning
2015-08-19 13:32:48 -07:00
Chris Collins
846ca3b86b removed mouselook
removed mouselook
2015-08-19 12:58:26 -07:00
Chris Collins
9605294ea8 Removed HMDcontrol.js from default scripts
Removed HMDcontrol.js from default scripts. Will put back when
HMDcontrol is fixed
2015-08-19 12:55:52 -07:00
ZappoMan
92ae3e758c restore DEFAULT_FAR_CLIP to 16km 2015-08-19 12:28:07 -07:00
Thijs Wenker
fd7d186ffb Merge branch 'master' of https://github.com/worklist/hifi into 20638 2015-08-19 20:23:45 +02:00
ZappoMan
684ee3bdd0 Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin 2015-08-19 11:20:15 -07:00
Thijs Wenker
ecd368fac3 new style qt connectors 2015-08-19 20:00:06 +02:00
Seth Alves
537b690d60 Merge pull request #5566 from howard-stearns/recapitate
Get rid of separate head/body avatar
2015-08-19 10:46:05 -07:00
Thijs Wenker
07ae00f207 Close WebSocket properly after ScriptEngine finished running 2015-08-19 19:33:48 +02:00
Andrew Meadows
990dce6795 Merge pull request #5578 from sethalves/polyvox
Polyvox improvements
2015-08-19 10:31:13 -07:00
Brad Hefta-Gaub
f8bdfbb271 Merge pull request #5598 from howard-stearns/kill-render-assert
kill render assert
2015-08-19 10:30:25 -07:00
Howard Stearns
0a8c1846e9 This assert causes dev builds to fail when starting interface. 2015-08-19 10:24:31 -07:00
Brad Davis
9e54244101 Merge pull request #5597 from highfidelity/revert-5582-bart
Revert "Updating to the new version of the sixense library"
2015-08-19 09:45:15 -07:00
Brad Davis
aba7bebf6e Revert "Updating to the new version of the sixense library" 2015-08-19 09:44:51 -07:00
Thijs Wenker
9af7205672 Merge branch 'master' of https://github.com/worklist/hifi into 20638 2015-08-19 16:49:39 +02:00
Philip Rosedale
d9425100b6 Merge pull request #5595 from sethalves/fix-inviso-av
possible fix for invisible other's-avatar bug
2015-08-18 21:24:15 -07:00
Philip Rosedale
eef556eeb2 Merge pull request #5593 from thoys/20528
CR for Job #20528 - Tool window unavailable in Windows Client.
2015-08-18 21:23:14 -07:00
Brad Hefta-Gaub
759732f173 Merge pull request #5582 from jherico/bart
Updating to the new version of the sixense library
2015-08-18 20:05:25 -07:00
Brad Hefta-Gaub
024c2d2300 Merge pull request #5596 from sethalves/fix-enable-av-col-menu-item
make enable-avatar-collisions menu item work again
2015-08-18 20:04:28 -07:00
Seth Alves
940390ee46 make enable-avatar-collisions menu item work again 2015-08-18 19:31:05 -07:00
Brad Davis
7f09df1d0b Fixing external 2015-08-18 18:56:01 -07:00
Brad Davis
86e21c91ba Case issues again 2015-08-18 18:56:00 -07:00
Brad Davis
eba446e7f6 Updating to the new version of the sixense library 2015-08-18 18:55:59 -07:00
Thijs Wenker
7f8506acc0 fix. switchup. 2015-08-19 00:54:00 +02:00
Seth Alves
5fcbd37e43 possible fix for invisible other's-avatar bug 2015-08-18 15:45:17 -07:00
Thijs Wenker
1b6538cc59 fixes extra qualification errors Linux 2015-08-19 00:31:40 +02:00
Brad Hefta-Gaub
a00eb0ca5d Merge pull request #5592 from jherico/homer
Remove keyboard focus highlight on delete entity
2015-08-18 15:25:52 -07:00