Commit graph

30113 commits

Author SHA1 Message Date
Seth Alves
c25082d86f use -fsanitize=address in all code rather than just the top-level links 2015-08-20 10:14:16 -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 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 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 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 from cozza13/20659
CR for Job  - change default.js
2015-08-19 13:50:49 -07:00
Stephen Birarda
42a7262707 Merge pull request 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
ZappoMan
684ee3bdd0 Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin 2015-08-19 11:20:15 -07:00
Seth Alves
537b690d60 Merge pull request from howard-stearns/recapitate
Get rid of separate head/body avatar
2015-08-19 10:46:05 -07:00
Andrew Meadows
990dce6795 Merge pull request from sethalves/polyvox
Polyvox improvements
2015-08-19 10:31:13 -07:00
Brad Hefta-Gaub
f8bdfbb271 Merge pull request 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 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
Philip Rosedale
d9425100b6 Merge pull request 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 from thoys/20528
CR for Job  - Tool window unavailable in Windows Client.
2015-08-18 21:23:14 -07:00
Brad Hefta-Gaub
759732f173 Merge pull request 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 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
Seth Alves
5fcbd37e43 possible fix for invisible other's-avatar bug 2015-08-18 15:45:17 -07:00
Brad Hefta-Gaub
a00eb0ca5d Merge pull request from jherico/homer
Remove keyboard focus highlight on delete entity
2015-08-18 15:25:52 -07:00
Brad Davis
944734fed2 Remove focus highlight on delete entity 2015-08-18 13:59:39 -07:00
Brad Hefta-Gaub
5c1364ca2a Merge pull request from ctrlaltdavid/20649
Add further temporary debug for tracking down invalid scale value assert
2015-08-18 13:31:23 -07:00
Seth Alves
2dc2757eca code review 2015-08-18 13:03:54 -07:00
Brad Hefta-Gaub
984ecb7b1f Merge pull request from ctrlaltdavid/20656
QA for 20656 - Fix edit toolbar moving to top left of screen
2015-08-18 12:44:25 -07:00
David Rowe
f6815c215a Fix edit toolbar moving to top left of screen 2015-08-18 10:59:49 -07:00
Andrew Meadows
52f212b94c Merge pull request from sethalves/always-persist-entities-as-json
always persist entities as gzipped json
2015-08-18 10:34:26 -07:00
David Rowe
00aa336a2b Add further temporary debug for tracking down invalid scale value assert 2015-08-18 10:01:00 -07:00
Andrew Meadows
9ee49c3e1e Merge pull request from sethalves/quiet-compiler
Quiet compiler
2015-08-18 09:54:29 -07:00
Philip Rosedale
cebc4e4608 Merge pull request from sethalves/simulations-per-second-readout
Simulations per second readout
2015-08-18 09:26:53 -07:00
Thijs Wenker
44399da41c Removed the minimize button from the tool window. Close it to hide it. Fixes bug where ToolWindow hides forever. 2015-08-18 14:54:21 +02:00
Seth Alves
e29bb9183b minimize diff 2015-08-18 02:08:21 -07:00
Seth Alves
8435550fe9 only update simRate once per second 2015-08-18 02:05:50 -07:00
Seth Alves
551f0aaba3 show how many times per second Application::idle is called 2015-08-18 01:41:17 -07:00
Brad Hefta-Gaub
51f0ab3d7c Merge pull request from jherico/homer
Fix crash on mouse click
2015-08-18 00:58:06 -07:00
Brad Davis
3cbbb5fb79 Fix crash on mouse click 2015-08-18 00:05:02 -07:00
ZappoMan
5715042102 Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin 2015-08-17 21:53:45 -07:00
Brad Hefta-Gaub
8944fe5388 Merge pull request from jherico/homer
Add highlighting of keyboard focused items
2015-08-17 17:40:47 -07:00
Brad Davis
cb5f80bf78 Add highlighting of keyboard focused items 2015-08-17 17:11:26 -07:00
Brad Davis
5d65937120 Merge pull request from ZappoMan/clickToFocusWebEntity
make web entity focus click based
2015-08-17 16:57:39 -07:00
Philip Rosedale
01108bdf6b Merge pull request from howard-stearns/sync-eyes-and-vectors
Synchronize eye joint and debugging vectors
2015-08-17 16:56:01 -07:00