samcake
|
3d607f406f
|
revert change to the slf file
|
2015-10-09 17:40:36 -07:00 |
|
samcake
|
297c3c9ed0
|
Fixing json issues
|
2015-10-09 17:37:51 -07:00 |
|
samcake
|
502cb90e02
|
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
|
2015-10-09 17:32:14 -07:00 |
|
samcake
|
f80e59e6b9
|
Merge branch 'controllers' of https://github.com/samcake/hifi into controllers
|
2015-10-09 17:32:00 -07:00 |
|
Brad Davis
|
78624679ed
|
Adding more parsing functions
|
2015-10-09 17:30:46 -07:00 |
|
samcake
|
c02d33c17c
|
Adding example mapping files
|
2015-10-09 17:27:50 -07:00 |
|
samcake
|
01a3539a2a
|
Merge branch 'controllers' of https://github.com/samcake/hifi into controllers
|
2015-10-09 17:25:45 -07:00 |
|
Brad Davis
|
c3775623aa
|
Splitting files, adding test skeleton
|
2015-10-09 17:23:52 -07:00 |
|
samcake
|
0587c23b67
|
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
|
2015-10-09 16:22:24 -07:00 |
|
Brad Davis
|
184e9a2209
|
Prototyping controllers
|
2015-10-09 16:20:55 -07:00 |
|
samcake
|
f0af4f1775
|
try debuging the sh orientation on mac
|
2015-10-09 16:08:35 -07:00 |
|
samcake
|
eb648e9b09
|
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
|
2015-10-09 16:04:47 -07:00 |
|
Brad Davis
|
1dfafec5af
|
Prototyping controller refactoring
|
2015-10-09 15:51:02 -07:00 |
|
Brad Hefta-Gaub
|
614a47c90d
|
Merge pull request #6044 from Atlante45/json_asset
Fix warnings
|
2015-10-09 15:46:59 -07:00 |
|
James B. Pollack
|
139c396879
|
Merge pull request #6045 from imgntn/fix_reset
[Script] Fix Master Reset Grabbability Regressions
|
2015-10-09 15:38:11 -07:00 |
|
Howard Stearns
|
ce82ba87d2
|
Merge pull request #6011 from hyperlogic/tony/hmd-rest-detection
When HMD is at rest, re-center the body under the avatar.
|
2015-10-09 15:20:07 -07:00 |
|
James B. Pollack
|
4661b49e3d
|
fix regressions introduced by deciding not to call setEntityCustomData
|
2015-10-09 14:57:24 -07:00 |
|
Stephen Birarda
|
b84109a781
|
Merge pull request #6040 from huffman/fix-null-node
Fix case where we deref a null pointer in OctreeInboundPacketProcessor
|
2015-10-09 14:57:16 -07:00 |
|
James B. Pollack
|
dcb5f2369d
|
Merge remote-tracking branch 'upstream/master'
|
2015-10-09 14:54:13 -07:00 |
|
Anthony J. Thibault
|
0c489e3afd
|
MyAvatar: Rename new instance variable after merge.
|
2015-10-09 14:46:05 -07:00 |
|
Anthony J. Thibault
|
b5ba621f78
|
Merge branch 'master' into tony/hmd-rest-detection
|
2015-10-09 14:36:18 -07:00 |
|
Anthony Thibault
|
4862e78fce
|
Merge pull request #6012 from howard-stearns/align-body-to-head-on-reset
Align body to head on reset
|
2015-10-09 14:34:16 -07:00 |
|
samcake
|
4e72d945b6
|
try debuging the sh orientation on mac
|
2015-10-09 14:00:35 -07:00 |
|
Clément Brisset
|
a5f0b75e25
|
Merge pull request #6043 from huffman/fix-uninitialized-arr
Fix uninitialized pointer in AssetResourceRequest
|
2015-10-09 13:36:58 -07:00 |
|
Clément Brisset
|
aa221741e5
|
Merge pull request #6041 from birarda/packet-corruption
fix for re-send timeout in SendQueue
|
2015-10-09 13:33:34 -07:00 |
|
Atlante45
|
cba8b0962d
|
Fix warnings
|
2015-10-09 13:29:59 -07:00 |
|
Brad Hefta-Gaub
|
1fb9d44ae0
|
Merge pull request #6042 from ctrlaltdavid/fix-particle-emitting
Fix not stopping emitting particles when set isEmitting false
|
2015-10-09 13:16:15 -07:00 |
|
Ryan Huffman
|
c02df56ceb
|
Fix uninitialized pointer in AssetResourceRequest
|
2015-10-09 13:15:13 -07:00 |
|
Howard Stearns
|
700835a6d1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into align-body-to-head-on-reset
|
2015-10-09 13:13:22 -07:00 |
|
David Rowe
|
09e5b30c16
|
Only emit particles if isEmitting is true
|
2015-10-09 11:21:59 -07:00 |
|
James B. Pollack
|
9141ba9335
|
Merge remote-tracking branch 'upstream/master'
|
2015-10-09 10:56:06 -07:00 |
|
James B. Pollack
|
51fc43ea4c
|
Merge pull request #6035 from ericrius1/targetIntoEntitySwitch
Added targets to entity switch reset
|
2015-10-09 10:49:42 -07:00 |
|
James B. Pollack
|
3e2b32530a
|
Update pingPongGun.js
Gun force shouldn't be so low.
|
2015-10-09 10:47:20 -07:00 |
|
James B. Pollack
|
987f8ad8ad
|
Merge remote-tracking branch 'upstream/master'
|
2015-10-09 10:40:56 -07:00 |
|
James B. Pollack
|
f2283ab9f2
|
Update masterReset.js
The gate shouldn't be grabbable
|
2015-10-09 10:39:03 -07:00 |
|
James B. Pollack
|
b41398be30
|
Update hiddenEntityReset.js
Basketball rack should be grabbable;We are removing back gate.
|
2015-10-09 10:36:04 -07:00 |
|
James B. Pollack
|
b06fd3876b
|
Update masterReset.js
The basketball rack should not be grabbable; this got changed in the last commit. Also we're removing the back gate.
|
2015-10-09 10:33:47 -07:00 |
|
Stephen Birarda
|
58f9830a94
|
fix for re-send timeout in SendQueue
|
2015-10-09 10:04:35 -07:00 |
|
Ryan Huffman
|
36aaffce43
|
Revert "Fix _packets not being cleaned up in ReceivedPacketProcessor"
This reverts commit 4dddb508a8.
|
2015-10-09 10:01:53 -07:00 |
|
Ryan Huffman
|
21e9d30bbe
|
Move qdeclare/qregister calls to their respective class header
|
2015-10-09 09:58:32 -07:00 |
|
Ryan Huffman
|
4dddb508a8
|
Fix _packets not being cleaned up in ReceivedPacketProcessor
|
2015-10-09 09:21:36 -07:00 |
|
Ryan Huffman
|
f1babb7fa0
|
Fix bug in OctreeInboundPacketProcessor where node can be null
|
2015-10-09 09:21:36 -07:00 |
|
Brad Hefta-Gaub
|
e2e086ef55
|
Merge pull request #6033 from samcake/hobbes
FIxing the backgroung leaking in the rear view mirror and moving from Float32 to 24 bits Depth buffer
|
2015-10-09 08:36:52 -07:00 |
|
Eric Levin
|
2b34c5a917
|
got rid of wasteful network calls
|
2015-10-09 08:26:00 -07:00 |
|
Howard Stearns
|
652376db8a
|
Kill the stuff we can't do yet.
|
2015-10-08 21:44:45 -07:00 |
|
Brad Hefta-Gaub
|
26b83d0f36
|
Merge pull request #6037 from sethalves/dont-send-righthandthumb3
fix bug in AvatarData::toByteArray related code
|
2015-10-08 20:26:22 -07:00 |
|
Clément Brisset
|
7caf8755d1
|
Merge pull request #6039 from birarda/packet-corruption
hold the sent packets lock while re-sending a packet
|
2015-10-08 19:57:08 -07:00 |
|
Stephen Birarda
|
8985427516
|
maintain sent packets lock while re-sending packet
|
2015-10-08 19:47:15 -07:00 |
|
Seth Alves
|
14ad1ed6be
|
fix bug in AvatarData::toByteArray related code. this was causing a few joint translations that hadn't changed to be sent
|
2015-10-08 18:37:09 -07:00 |
|
Clément Brisset
|
6d694b877d
|
Merge pull request #6036 from birarda/packet-corruption
fix for registration of meta types in Socket
|
2015-10-08 18:29:03 -07:00 |
|