Stephen Birarda
d5b1bee13c
resolve conflicts on merge with upstream master
2014-08-08 13:48:32 -07:00
Stephen Birarda
0378fb3049
break glm helpers out of SharedUtil
2014-08-08 13:17:53 -07:00
ZappoMan
84f3ede32f
small change to force rebuild
2014-08-07 15:09:24 -07:00
Atlante45
d9dde06c14
Various tweaks to referentials
2014-08-04 14:59:15 -07:00
wangyix
cb5a9bf668
moved some const defs to avoid redefinition
2014-07-14 10:43:02 -07:00
wangyix
82e9aa8bb7
made stats easier to read; reverted injected stream deletion conditions
2014-07-11 16:08:15 -07:00
Andrzej Kapolka
de0c45a919
Spanner mutation in test.
2014-06-20 18:09:51 -07:00
Stephen Birarda
8e9defad3e
send an updated address to data-server with domain (when changed)
2014-05-15 12:18:24 -07:00
Andrew Meadows
49dedb72c9
remove FingerData class and related cleanup
2014-05-12 11:09:12 -07:00
Atlante45
8b4a910040
Fix timestamp timer not fired
2014-04-25 12:19:18 -07:00
Atlante45
3eeb3a539d
Fixed lack of resolution in usecTimestampNow()
2014-04-22 11:48:43 -07:00
Atlante45
fd20686f0f
Removed Systime.h includes
2014-04-21 17:23:06 -07:00
Atlante45
f7f30e118c
More gettimeofday cleanup
2014-04-21 15:17:11 -07:00
Andrzej Kapolka
21fa833f19
Merge branch 'master' of https://github.com/highfidelity/hifi into animate
...
Conflicts:
interface/src/Application.cpp
libraries/shared/src/SharedUtil.cpp
libraries/shared/src/SharedUtil.h
2014-04-17 10:58:34 -07:00
ZappoMan
bdf39186de
Merge branch 'master' of https://github.com/worklist/hifi into moonshot
2014-04-15 21:04:15 -07:00
ZappoMan
60c6b27ab2
cleanup code a bit, add support for diffusions even with no ray intersection
2014-04-15 11:38:11 -07:00
Andrzej Kapolka
a2dc58f7f9
Moved FBX code to its own library so that we can use it for bots.
2014-04-14 17:15:58 -07:00
ZappoMan
7a993939bf
Merge branch 'master' of https://github.com/worklist/hifi into moonshot
...
Conflicts:
interface/interface_en.ts
interface/src/Application.cpp
interface/src/Application.h
interface/src/Menu.h
libraries/shared/src/SharedUtil.h
2014-04-14 09:43:29 -07:00
ZappoMan
a37921c1d5
move isNaN() to shared utils
2014-04-13 19:09:07 -07:00
Stephen Birarda
d5d52f804f
add a networking library and link from appropriate targets
2014-04-10 09:32:17 -07:00
Stephen Birarda
1c861fbecb
resolve conflicts on merge with upstream master
2014-04-09 15:36:15 -07:00
Stephen Birarda
ae4b8348a2
fix header include guards via regex
2014-04-09 12:03:17 -07:00
Stephen Birarda
6a51df9e38
initial regex replacement of headers
2014-04-08 17:30:36 -07:00
Stephen Birarda
e1cae6d295
initial handshaking for DTLS sessions between DS and clients
2014-04-02 17:29:14 -07:00
Stephen Birarda
7190ce9a88
remove loadRandomIdentifier for STUN requests, use UUID
2014-03-25 14:33:53 -07:00
Andrew Meadows
a045a87cca
Remove arm stretching, add sixense calibration
2014-03-14 11:11:00 -07:00
Andrew Meadows
aa8c2fc8cb
use radians instead of degrees (almost) everywhere
2014-03-11 17:26:58 -07:00
Stephen Birarda
403f91c988
update resource references to use Qt resource system
2014-03-06 10:41:11 -08:00
Philip Rosedale
0a1e840d10
Bot.js NPCs wander around and make sounds
2014-02-26 13:50:04 -08:00
Andrzej Kapolka
d3b005112e
Changes from Philip's code review.
2014-02-07 10:03:23 -08:00
ZappoMan
ed0a2a5a18
Merge branch 'master' of https://github.com/worklist/hifi into scripting_work
...
Conflicts:
libraries/shared/src/SharedUtil.cpp
libraries/shared/src/SharedUtil.h
libraries/voxels/src/VoxelEditPacketSender.cpp
2014-01-29 19:49:36 -08:00
ZappoMan
08b06cc59c
support for global collision callbacks in JS
2014-01-29 17:52:17 -08:00
Stephen Birarda
33edcea5fb
resolve conflicts on merge with upstream master
2014-01-29 12:23:06 -08:00
ZappoMan
98cdc656c4
more scripting support, including adding a Quat helper class that makes JS quat math easier
2014-01-29 00:56:08 -08:00
Stephen Birarda
cda06d1cb3
replace uint64_t with quint64 for Qt friendlyness
2014-01-28 12:35:42 -08:00
ZappoMan
427abd4509
add model properties to particles
2014-01-28 11:18:37 -08:00
Stephen Birarda
4103cc1cde
packet header changes and beginning of conversion to QByteArray
2014-01-28 10:36:08 -08:00
Brad Hefta-Gaub
ff6e9c0416
added back unistd.h for non-windows
2014-01-15 14:59:14 -08:00
Brad Hefta-Gaub
170dbe6e85
Merge branch 'master' of git://github.com/worklist/hifi into windows_build
...
Conflicts:
assignment-client/src/audio/AudioMixer.cpp
domain-server/src/DomainServer.cpp
interface/src/Audio.cpp
interface/src/DataServerClient.cpp
interface/src/Oscilloscope.cpp
interface/src/PairingHandler.cpp
interface/src/Util.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/devices/Faceshift.cpp
interface/src/devices/SerialInterface.cpp
interface/src/renderer/FBXReader.cpp
libraries/avatars/src/AvatarData.h
libraries/octree-server/src/OctreeServer.cpp
libraries/octree-server/src/OctreeServer.h
libraries/octree/src/ViewFrustum.cpp
libraries/shared/src/Logging.cpp
libraries/shared/src/Node.cpp
libraries/shared/src/Node.h
libraries/shared/src/NodeList.cpp
libraries/shared/src/NodeList.h
libraries/shared/src/PerfStat.cpp
libraries/shared/src/SharedUtil.cpp
libraries/voxels/src/VoxelTree.cpp
voxel-edit/src/main.cpp
2014-01-15 10:20:21 -08:00
Stephen Birarda
987c639e36
initial newline removal from all QDebug calls
2014-01-14 13:09:22 -08:00
Brad Hefta-Gaub
55babbf7b6
windows type mismatch warning fixes
2014-01-13 00:30:23 -08:00
Brad Hefta-Gaub
f6d775e3e1
remove timeval and unistd.h
2014-01-10 17:27:23 -08:00
ZappoMan
bfbaf265dd
first cut at added clockSkew support to nodes and PING/PING_REPLY
2013-12-19 13:14:14 -08:00
ZappoMan
5b36953e81
cleanup clockSkew debug options and remove some chatty logs
2013-12-18 19:33:52 -08:00
ZappoMan
6b0d7c30f0
added debugging option for forced clock skew
2013-12-18 16:58:49 -08:00
ZappoMan
aaf4ff7dfc
added lifetime to particles
2013-12-13 14:30:29 -08:00
ZappoMan
7a828794be
more work with particles added javascript support to particle update
2013-12-10 11:27:18 -08:00
ZappoMan
2cb46c3447
added DEADBEEF support to debug class
2013-12-04 10:37:10 -08:00
ZappoMan
9faef65ccc
first cut at splitting out octree base classes
2013-12-03 17:32:02 -08:00
ZappoMan
17f5530893
fixed wasted bitmasks bug where we would include colors and extra layers
2013-11-25 01:42:19 -08:00
ZappoMan
cd1d3765a9
cleaned up const semantics and DRYed up appendBitMask
2013-11-23 16:28:21 -08:00
ZappoMan
0f66f4c1bd
Revert "cleaned up some comments and code"
...
This reverts commit 99c427c97d
.
2013-11-23 16:19:57 -08:00
ZappoMan
99c427c97d
cleaned up some comments and code
2013-11-23 16:18:18 -08:00
ZappoMan
015adeedcb
first cut at splitting out PACKET_TYPE_VOXEL_QUERY from PACKET_TYPE_HEAD_DATA
2013-10-24 13:22:31 -07:00
ZappoMan
1e5ce8a7e5
first cut at really getting _children UNION to work
2013-10-16 12:54:37 -07:00
Stephen Birarda
d412e0611d
Merge branch 'master' of github.com:worklist/hifi into assignment
2013-09-06 11:04:18 -07:00
Stephen Birarda
d8611e408e
clear stale assignments from queue, fix CPU usage in client
2013-09-06 10:59:20 -07:00
atlante45
b03482ead5
Some more memory leaks and codes formatting
2013-09-03 17:16:06 -07:00
ZappoMan
0f7ea55e82
make animation-server work with jurisdictions
2013-08-20 11:08:20 -07:00
Stephen Birarda
f8e7e1de66
modifications to hook shared classes to iOS
2013-07-24 13:05:02 -07:00
Stephen Birarda
5708188180
fixes for new message handler for qt5
2013-07-24 12:22:02 -07:00
Stephen Birarda
fa155adc8c
register the shared message handler to fix voxel-server output
2013-07-16 15:50:37 -07:00
Stephen Birarda
211204e878
Merge remote-tracking branch 'upstream/master' into timestamps
2013-07-11 09:23:16 -07:00
Stephen Birarda
ca8f25955a
switch usec timestamps to uint64_t
2013-07-10 11:46:48 -07:00
ZappoMan
015ff85cea
good progress on merging polygons
2013-07-01 21:39:56 -07:00
Stephen Birarda
c48cc3c3a6
add copyright to SharedUtil
2013-06-18 17:39:32 -07:00
Stephen Birarda
a141e3dc5d
resolve conflicts on merge with upstream master
2013-06-13 16:31:40 -06:00
Andrzej Kapolka
db729a04aa
Converted double timestamps to long long (64 bit integers), fixed bug with
...
updating agent timestamps.
2013-06-13 11:11:59 -07:00
Stephen Birarda
7d1bcf07ef
add a Logstash class to prepare for sending stats over UDP
2013-06-11 17:09:39 -07:00
ZappoMan
026fb5b344
Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization
2013-06-04 09:34:37 -07:00
ZappoMan
510dfc7353
Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization
2013-06-03 21:43:38 -07:00
ZappoMan
0b7f4b21f4
Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels
2013-06-03 16:42:27 -07:00
ZappoMan
7dd217b318
more work on copy and paste
2013-06-03 10:57:18 -07:00
Andrzej Kapolka
98759c3ba1
Include <unistd.h> to address a build error experienced by Clement.
2013-05-31 10:27:25 -07:00
ZappoMan
04f4e499e1
Optimize wire-format for AvatarData
...
- moved HandState into semi-nibble in bitItems
- moved KeyState into semi-nibble in bitItems
- moved AudioLoudness into scaled float stored as byte
- overall savings - 5 bytes
2013-05-27 14:18:10 -07:00
ZappoMan
5d1ba857c5
Optimize View Frustum wire format.
...
- Changed View frstum orientaton to be a quaternion
- Implemented packing formats for Orientation Quats, Ratios, and Clipping values
- Changed wire format for View Frustum details to be more efficient 28 bytes vs 64 bytes
2013-05-27 14:17:34 -07:00
Andrzej Kapolka
629c7b0146
Send all environment data in the same packet and only send it about once a
...
second.
2013-05-22 17:09:35 -07:00
ZappoMan
7c9be4b9f5
cleanup code
2013-05-21 11:42:13 -07:00
ZappoMan
321d1952d6
first cut at exists bits
2013-05-20 12:56:59 -07:00
Stephen Birarda
b7b39c2a6e
have addOrUpdateAgent return a pointer to the agent instead of a bool
2013-05-17 14:03:15 -07:00
ZappoMan
2c1518144a
added setAtBit() utility
2013-05-14 11:09:53 -07:00
ZappoMan
9a9656708c
CR cleanup
2013-05-08 10:03:05 -07:00
ZappoMan
6d378281a8
cr cleaup - third times a charm?
2013-04-30 10:24:13 -07:00
ZappoMan
bf3b014743
code review cleanup
2013-04-30 10:16:04 -07:00
ZappoMan
bbdf97ccc4
added some helper functions for debugging and for improved voxel protocol
...
- added outputBufferBits() which will output an entire buffer as debug bits/bytes
- tweak to outputBits() to allow caller to ask for NewLine or not
- added insertIntoSortedArrays() which keeps a set of arrays sorted by a key
2013-04-24 22:50:40 -07:00
Stephen Birarda
e9592c45c7
fix reference to resources directory on OS X
2013-04-17 11:56:32 -07:00
Jeffrey Ventrella
e825764304
added instrumentation to Orientation class to test for normalized and orthogonal vectors
2013-04-16 19:53:48 -07:00
Stephen Birarda
861c8e76ee
grab jeffrey's changes to Util consts
2013-04-15 18:35:46 -07:00
Stephen Birarda
a4011934c6
move Orientation class to avatars library, constants to SharedUtil
2013-04-15 15:39:23 -07:00
ZappoMan
cf6b8fe72f
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
2013-04-12 13:37:34 -07:00
Stephen Birarda
67efc12e59
move shared to libraries, DRY library macro, rename libs
2013-04-12 12:38:34 -07:00