ZappoMan
|
758df4f58b
|
silence some unused variable warnings and move some debug code to only execute in debug mode
|
2014-06-02 10:43:50 -07:00 |
|
wangyix
|
4c4ff45f31
|
removed duplicate function bodies
|
2014-05-29 14:31:40 -07:00 |
|
wangyix
|
d8b0b03e59
|
removed _sequenceNumber from OctreeSendThread
inlined getSequenceNumber and incrementSequenceNumber
|
2014-05-29 13:39:57 -07:00 |
|
wangyix
|
f82be105e8
|
moved _sequenceNumber back to OctreeQueryNode
|
2014-05-29 12:54:34 -07:00 |
|
wangyix
|
fe1a0e4565
|
removed debug stuff i missed
|
2014-05-29 11:27:14 -07:00 |
|
wangyix
|
c87c474877
|
removed debug info, cleaned code for pull req
|
2014-05-29 10:39:40 -07:00 |
|
wangyix
|
5d4b0df108
|
added flag,seq,st to EnvironmentData, untested
removed/commented out debug prints
|
2014-05-28 17:41:38 -07:00 |
|
wangyix
|
c799077379
|
added flag,seq,ts to ParticleErase and ModelErase
... this fixes unreasonable flight-time issue
|
2014-05-28 17:20:10 -07:00 |
|
wangyix
|
f361b9a8a7
|
removed updatePacketTimestamp()
..from OctreeQueryNode
|
2014-05-27 18:04:53 -07:00 |
|
wangyix
|
e89d33dc60
|
added if to not track ParticleErase packets
|
2014-05-27 18:02:49 -07:00 |
|
Stephen Birarda
|
f4292fd29c
|
handle serving of scripts at temp unique UUIDs
|
2014-05-23 12:33:39 -07:00 |
|
wangyix
|
fe5fabdd61
|
removed old code that was commented out
changed tabs to spaces
|
2014-05-23 11:17:59 -07:00 |
|
wangyix
|
87d927d447
|
moved _sequenceNumber back to OctreeQueryNode
instead added incrementSequenceNumber() to OctreeQueryNode for
sendthread to use
|
2014-05-23 10:09:46 -07:00 |
|
wangyix
|
645002493f
|
Merge remote-tracking branch 'upstream/master'
|
2014-05-23 09:48:05 -07:00 |
|
wangyix
|
2dd78b36db
|
moved _sequenceNumber to OctreeSendThread
|
2014-05-23 09:47:08 -07:00 |
|
Stephen Birarda
|
f351399d08
|
put back ssize_t definition
|
2014-05-20 16:16:24 -07:00 |
|
Stephen Birarda
|
97b67e83c5
|
remove more gnutls includes
|
2014-05-20 16:16:23 -07:00 |
|
Stephen Birarda
|
f1581ef823
|
remove dependency on GnuTLS for later replacement with OpenSSL
|
2014-05-20 16:16:22 -07:00 |
|
Stephen Birarda
|
9dde480bb2
|
don't look for GnuTLS from cmake
|
2014-05-20 16:16:22 -07:00 |
|
Stephen Birarda
|
8a1fdf3486
|
pass wallet UUID from AC to DS, cleanup noisy timer
|
2014-05-20 14:38:51 -07:00 |
|
Stephen Birarda
|
a9c2e3fe71
|
put back ssize_t definition
|
2014-05-20 11:56:06 -07:00 |
|
Stephen Birarda
|
2ef822d19d
|
remove more gnutls includes
|
2014-05-20 11:26:22 -07:00 |
|
Stephen Birarda
|
e3dd6509d8
|
remove dependency on GnuTLS for later replacement with OpenSSL
|
2014-05-20 10:47:11 -07:00 |
|
Stephen Birarda
|
0e7615391c
|
don't look for GnuTLS from cmake
|
2014-05-20 10:35:04 -07:00 |
|
ZappoMan
|
fa20e8ff95
|
fix the agent support for scripting models
|
2014-05-14 13:17:10 -07:00 |
|
ZappoMan
|
106c8bffd8
|
first cut at animations in models
|
2014-05-09 16:08:06 -07:00 |
|
Philip Rosedale
|
4e1eaf8337
|
Merge pull request #2809 from Atlante45/mute_env
Mute environment
|
2014-05-07 16:18:23 -07:00 |
|
Stephen Birarda
|
5e9036b3fe
|
tweak audio constants to be less agressive on cutoff
|
2014-05-07 15:37:41 -07:00 |
|
Atlante45
|
fd1f6befff
|
CR
|
2014-05-07 15:19:32 -07:00 |
|
Atlante45
|
40ed72989c
|
mute environment packet
|
2014-05-07 12:57:11 -07:00 |
|
Stephen Birarda
|
befe75a04c
|
fix broken audio-mixer stats
|
2014-05-05 14:03:14 -07:00 |
|
Stephen Birarda
|
aa2931d9bb
|
resolve conflicts on merge with upstream/master
|
2014-05-02 10:39:17 -07:00 |
|
ZappoMan
|
715e6b8e60
|
debugging model editing
|
2014-05-02 09:10:30 -07:00 |
|
Stephen Birarda
|
2f0e311a99
|
return OAuth URL to interface clients when OAuth enabled
|
2014-05-01 10:19:05 -07:00 |
|
ZappoMan
|
0182a6d895
|
models working end to end
|
2014-04-30 11:12:49 -07:00 |
|
ZappoMan
|
f993f984c9
|
first cut at modelserver
|
2014-04-30 09:26:14 -07:00 |
|
ZappoMan
|
aac42058ac
|
first cut at modelserver
|
2014-04-30 09:25:52 -07:00 |
|
Atlante45
|
8b4a910040
|
Fix timestamp timer not fired
|
2014-04-25 12:19:18 -07:00 |
|
Atlante45
|
ae566c55f6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday
|
2014-04-23 10:38:29 -07:00 |
|
Atlante45
|
3eeb3a539d
|
Fixed lack of resolution in usecTimestampNow()
|
2014-04-22 11:48:43 -07:00 |
|
AndrewMeadows
|
94fabf7875
|
Merge pull request #2709 from ZappoMan/shared_and_weak_pointers
Voxel/Particle Server Performance Improvements
|
2014-04-22 10:28:39 -07:00 |
|
Atlante45
|
ddf14b0842
|
Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday
|
2014-04-22 10:22:30 -07:00 |
|
ZappoMan
|
60b8ab0de5
|
CR feedback
|
2014-04-21 17:45:38 -07:00 |
|
Atlante45
|
fd20686f0f
|
Removed Systime.h includes
|
2014-04-21 17:23:06 -07:00 |
|
ZappoMan
|
a64d3ffc32
|
more cleanup
|
2014-04-21 16:38:45 -07:00 |
|
ZappoMan
|
7d18dbdfb8
|
more cleanup
|
2014-04-21 16:35:42 -07:00 |
|
Atlante45
|
cfc778d10c
|
Fix regexp fail
|
2014-04-21 16:32:17 -07:00 |
|
ZappoMan
|
e55c488964
|
clean up some old debugging
|
2014-04-21 16:17:59 -07:00 |
|
Atlante45
|
681aab5bf0
|
Remove printf and replace them by qDebug()
|
2014-04-21 16:17:45 -07:00 |
|
ZappoMan
|
003e3ae507
|
properly unhook delete notifications
|
2014-04-21 16:01:37 -07:00 |
|