Eric Levin
|
93c3f90c95
|
clened up read and write of qVec- no longer converting between qVector and qByteArray
|
2015-06-01 11:08:48 -07:00 |
|
Eric Levin
|
115bf3dd25
|
cleaned up logging and testing code.
|
2015-05-31 14:52:44 -07:00 |
|
Eric Levin
|
27b59b5f72
|
fixed bug in qvec unpacking code
|
2015-05-31 14:46:20 -07:00 |
|
Eric Levin
|
5e22af8643
|
points and line width persistent accross clients
|
2015-05-31 14:21:28 -07:00 |
|
Eric Levin
|
cb72b620cf
|
printing bytes out correctly
|
2015-05-29 19:42:07 -07:00 |
|
Eric Levin
|
7d5dd278a1
|
adding unpacking
|
2015-05-29 16:54:40 -07:00 |
|
Eric Levin
|
72af4e4e67
|
latest pointer
|
2015-05-28 10:44:44 -07:00 |
|
Eric Levin
|
8edc883e4d
|
adding serialization for Qvector
|
2015-05-27 13:47:47 -07:00 |
|
Atlante45
|
9e121aa387
|
Fix incorrect scale constants
|
2015-05-23 20:13:14 +02:00 |
|
Brad Davis
|
c94b8b6e30
|
Merge branch 'master' into dk1
Conflicts:
interface/src/devices/OculusManager.cpp
interface/src/devices/TV3DManager.cpp
|
2015-05-13 21:25:56 -07:00 |
|
ZappoMan
|
67df6e3c62
|
make READ_ENTITY_PROPERTY_TO_PROPERTIES() type safe
|
2015-05-12 16:24:16 -07:00 |
|
ZappoMan
|
98474376de
|
consolidate READ_ENTITY_PROPERTY() macros into single typesafe version
|
2015-05-12 15:59:45 -07:00 |
|
Brad Davis
|
41d587bd2e
|
Revert "Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff""
This reverts commit 6e8c067bcb .
Conflicts:
interface/src/Camera.h
|
2015-05-12 14:47:44 -07:00 |
|
samcake
|
6e8c067bcb
|
Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff"
|
2015-05-12 14:34:43 -07:00 |
|
ZappoMan
|
83d212861d
|
make APPEND_ENTITY_PROPERTY type safe
|
2015-05-12 11:41:04 -07:00 |
|
Brad Davis
|
666caf0d59
|
Working on fixing DK1 and santizing the transform stuff
|
2015-05-12 00:44:30 -07:00 |
|
Seth Alves
|
ddb907ae5f
|
inline setMaxQueryPacketsPerSecond
|
2015-05-11 12:15:52 -07:00 |
|
Seth Alves
|
635f49258d
|
formatting
|
2015-05-11 12:04:31 -07:00 |
|
Seth Alves
|
de9e74a725
|
put max-octree-pps in Application rather than in the Octree
|
2015-05-11 12:01:13 -07:00 |
|
Seth Alves
|
83748096ef
|
max pps for an octree-query is a per-query thing, not an application-wide thing. move the settings-related max-octree-pps stuff into the entity tree
|
2015-05-11 11:37:53 -07:00 |
|
Stephen Birarda
|
305835ea79
|
Merge branch 'master' of https://github.com/highfidelity/hifi into sequence-numbers
|
2015-05-07 15:38:35 -07:00 |
|
Atlante45
|
00571dad00
|
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
|
2015-05-07 10:13:59 +02:00 |
|
Sam Gateau
|
bba7dcfe5f
|
Try to fix the transform stack issue in 1st person
|
2015-05-06 23:32:02 -07:00 |
|
Sam Gateau
|
dc81a3ecc2
|
Cube texture are working with the GL backend, useing it in SKybox successfullly
|
2015-05-06 09:53:36 -07:00 |
|
Stephen Birarda
|
6b3cf1ba4a
|
remove dependency of PacketHeaders on NodeList
|
2015-05-05 12:19:42 -07:00 |
|
Atlante45
|
aa10dc3991
|
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
|
2015-05-05 15:04:11 +02:00 |
|
Stephen Birarda
|
6cff75f7c1
|
resolve conflicts on merge with upstream/master
|
2015-05-04 10:05:44 -07:00 |
|
Atlante45
|
12fcb35717
|
Made RenderArgs a default ctor
|
2015-05-04 17:22:46 +02:00 |
|
Atlante45
|
fc1519c078
|
Quiet compiler
|
2015-05-04 16:49:33 +02:00 |
|
Stephen Birarda
|
edade7baba
|
resolve conflicts on merge with upstream master
|
2015-05-01 16:24:16 -07:00 |
|
Stephen Birarda
|
94739cf8d3
|
move number constants out of SharedUtil to NumericalConstants
|
2015-05-01 10:26:53 -07:00 |
|
Seth Alves
|
a0ad7a22a6
|
Merge branch 'master' of github.com:highfidelity/hifi into json-skip-default-values
|
2015-04-30 11:28:33 -07:00 |
|
Seth Alves
|
f75b599288
|
don't save default values in json file
|
2015-04-30 11:28:27 -07:00 |
|
Seth Alves
|
d2cd4fc405
|
types 0 and 1 exit cleanly, type 6 crashes
|
2015-04-29 11:56:45 -07:00 |
|
ZappoMan
|
512a109023
|
add call to perror() to get OS level error details on failed backups
|
2015-04-28 13:48:51 -07:00 |
|
ZappoMan
|
1ef58139a4
|
fix bug in parsing root element data
|
2015-04-27 15:07:32 -07:00 |
|
Seth Alves
|
2cdbe8bf7b
|
merge from upstream
|
2015-04-27 09:57:36 -07:00 |
|
Seth Alves
|
e007617112
|
hook up menu-items to control debug rendering of collision hulls and owned simulations
|
2015-04-27 09:56:24 -07:00 |
|
Seth Alves
|
0fb1a83e3b
|
quiet compiler, remove some trailing control-Ms
|
2015-04-25 09:20:00 -07:00 |
|
Seth Alves
|
c69aaa806b
|
if a uuid is null, don't send a uuid of all zeros
|
2015-04-17 09:55:49 -07:00 |
|
Seth Alves
|
f48f9caea4
|
cut back on debuging prints
|
2015-04-16 16:18:13 -07:00 |
|
Seth Alves
|
3b2a15f76a
|
more debugging
|
2015-04-16 15:52:48 -07:00 |
|
Seth Alves
|
d7059d8f2d
|
add code for uuids in wire protocol. some debugging prints
|
2015-04-16 14:46:38 -07:00 |
|
David Rowe
|
76d6c6cac5
|
Delete char* items properly
|
2015-04-08 20:03:42 -07:00 |
|
Seth Alves
|
ef5dffecf6
|
fix filenames in comments
|
2015-04-07 10:03:14 -07:00 |
|
Seth Alves
|
9014397167
|
try again without macro
|
2015-04-07 09:59:04 -07:00 |
|
Seth Alves
|
3efcc3684e
|
split out octree logging
|
2015-04-06 17:05:09 -07:00 |
|
Seth Alves
|
91861e9e5a
|
split out octree logging
|
2015-04-06 17:04:49 -07:00 |
|
ZappoMan
|
84940d8e43
|
fix SVO import
|
2015-04-02 14:13:19 -07:00 |
|
ZappoMan
|
69f261ae94
|
tweaks to the LOD Tools UI
|
2015-03-23 16:44:19 -07:00 |
|