Brad Hefta-Gaub
|
0e506fa663
|
Merge pull request #5608 from jherico/marge
Add fullscreen menu item to 2D display plugin
|
2015-08-20 11:02:34 -07:00 |
|
Stephen Birarda
|
aac15e52bb
|
add explicit cast to double for uptime
|
2015-08-20 10:19:34 -07:00 |
|
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 |
|
Stephen Birarda
|
74d6e5ba89
|
make sure LNL goes down before domain-server
|
2015-08-20 10:01:12 -07:00 |
|
ZappoMan
|
cd050b2e60
|
don't show hmd tools for direct mod HMDs
|
2015-08-20 09:53:58 -07:00 |
|
Ryan Huffman
|
bb15811f6b
|
Merge remote-tracking branch 'clement/protocol' into ordered-sending
|
2015-08-20 09:14:04 -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 |
|
Atlante45
|
f6854782a4
|
Debug/Lock cleanup
|
2015-08-20 14:57:35 +02:00 |
|
Atlante45
|
62c76d0332
|
registerListenerForTypes optimisations
|
2015-08-20 14:56:35 +02: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 |
|
Ryan Huffman
|
5884fcb17b
|
Merge branch 'ordered-sending' into atp-server
|
2015-08-19 12:23:31 -07:00 |
|
Ryan Huffman
|
ebb4db134d
|
Temporarily disable assert in ScriptCache
|
2015-08-19 12:18:01 -07:00 |
|
Ryan Huffman
|
330a6bb279
|
Update TextureCache to work with ResourceCache updates
|
2015-08-19 12:17:36 -07:00 |
|
Ryan Huffman
|
e1f8b6700c
|
Update GeometryCache to work with ResourceCache updates
|
2015-08-19 12:17:19 -07:00 |
|
Ryan Huffman
|
7305135125
|
Update ResourceManager
|
2015-08-19 12:16:34 -07:00 |
|
Ryan Huffman
|
4827d326f4
|
Update ResourceCache to allow multiple downloads on the same resource
|
2015-08-19 12:11:47 -07:00 |
|
Ryan Huffman
|
51d4cf84da
|
Fix AnimationReader to work with new ResourceCache updates
|
2015-08-19 12:10:47 -07:00 |
|
Ryan Huffman
|
a168a1058f
|
Update filename regex in AssetServer to allow extensions
|
2015-08-19 12:09:46 -07:00 |
|
Ryan Huffman
|
d18ce5066f
|
Fix error with Assignment::Type not being hashable
|
2015-08-19 11:55:06 -07:00 |
|
Ryan Huffman
|
121d3a77ad
|
Fix iterator usage in SendQueue
|
2015-08-19 11:27:31 -07:00 |
|
Seiji Emery
|
6b5fb60fcf
|
Merge remote-tracking branch 'highfidelity/master' into gputest
|
2015-08-19 11:24:15 -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 |
|
Ryan Huffman
|
fc29297d87
|
Update SendQueue::queuePacketList to use splice
|
2015-08-19 10:55:26 -07: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 |
|
Ryan Huffman
|
df51069305
|
Rename getAllData to getMessage
|
2015-08-19 10:39:19 -07:00 |
|