Eric Levin
83bf4241e4
resolved merge conflicts... but now lines not flying across clients
2015-06-01 15:16:08 -07:00
Eric Levin
5cce4edec8
fix merge conflicts attemp 1
2015-06-01 11:18:33 -07:00
Eric Levin
b6b5078048
removed unneeded append methods from OctreePacketData
2015-06-01 11:11:08 -07:00
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
samcake
b676036895
Merge pull request #5007 from SamGondelman/master
...
Fixed avatar billboards not displaying
2015-06-01 10:54:19 -07:00
Eric Levin
7b08537574
code standards fixes
2015-06-01 09:51:24 -07:00
Philip Rosedale
6290f8c992
Merge pull request #5013 from ericrius1/grab
...
removed sounds from grab script
2015-06-01 09:39:04 -07:00
Eric Levin
45331e5a0e
removed sounds from grab script
2015-06-01 09:37:54 -07:00
Philip Rosedale
63ae711015
Merge pull request #5005 from howard-stearns/sound-parameter-tweaks
...
Sound parameter tweaks
2015-06-01 09:37:36 -07:00
Eric Levin
8a191a661d
adding flag for points changed
2015-06-01 09:35:32 -07:00
Eric Levin
9ca5310c21
cleaned up another qDebugging line
2015-05-31 15:33:51 -07:00
Eric Levin
9641b11086
array of points takes absolute positions now, so script writer has an easier time
2015-05-31 14:59:09 -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
Philip Rosedale
396a20c72d
Merge pull request #5006 from ericrius1/brownianFun
...
added brownianFun script to apply random forces to balls in a pen
2015-05-30 15:25:38 -07:00
Eric Levin
cb72b620cf
printing bytes out correctly
2015-05-29 19:42:07 -07:00
Eric Levin
8dda86f80d
added brownianFun script to apply random forces to balls in a pen
2015-05-29 17:02:51 -07:00
Eric Levin
7d5dd278a1
adding unpacking
2015-05-29 16:54:40 -07:00
Sam Gondelman
c19115a485
actually fixed billboard
2015-05-29 16:53:01 -07:00
Sam Gondelman
4c83c6918d
fixed avatar billboards not displaying
2015-05-29 16:44:16 -07:00
Howard Stearns
9c56f6270e
Remove debug print.
2015-05-29 16:21:57 -07:00
Howard Stearns
6e2378e676
Sound parameter tweaks.
2015-05-29 16:19:41 -07:00
Philip Rosedale
11844463d1
Merge pull request #4915 from AndrewMeadows/isothermal
...
DO NOT MERGE grabHockey.js script can safely manipulate misc objects again
2015-05-29 16:07:32 -07:00
Philip Rosedale
6b9f6ff7bb
Merge pull request #4994 from AndrewMeadows/isentropic
...
compute correct deltaTime for extrapolation of moving entity and other fixes
2015-05-29 16:07:10 -07:00
Stephen Birarda
e7ce8706a3
Merge pull request #5004 from birarda/domain-dtls
...
fix debug for failed ping to DS
2015-05-29 16:21:41 -04:00
Stephen Birarda
33fde7c66d
remove extra debug
2015-05-29 13:21:24 -07:00
Brad Hefta-Gaub
7d1cd70e89
Merge pull request #4969 from jherico/plugins_pt3
...
Working towards display plugins
2015-05-29 13:19:18 -07:00
Brad Davis
77b45e2b4a
Adding missing files
2015-05-29 12:59:55 -07:00
Brad Davis
f98305dd55
CR comments
2015-05-29 12:45:03 -07:00
Stephen Birarda
2207bfaf40
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-dtls
2015-05-29 12:06:12 -07:00
Stephen Birarda
e253687dcd
fix fail case for DS pings
2015-05-29 12:06:07 -07:00
Andrew Meadows
8177512432
send all TerseUpdate properties when one changes
2015-05-29 11:35:50 -07:00
Seth Alves
b0f6826d17
Merge pull request #4995 from birarda/domain-dtls
...
speed up initial connection to domains
2015-05-29 10:50:01 -07:00
Andrew Meadows
64eba660ad
Merge pull request #5001 from howard-stearns/entity-collision-end
...
get end collision events in entity collision handler
2015-05-29 10:40:50 -07:00
Howard Stearns
8e245ec4c2
getCollisionEvents has a side-effect on state (removing END events from further consideration), so it must be called once per step.
...
Otherwise entities never get to see end events.
Also, entity collision processing should only be done when there are outgoing changes (just like for avatar).
2015-05-29 09:59:21 -07:00
Andrew Meadows
f049dc37fc
Merge pull request #4992 from howard-stearns/preload-collision-sounds
...
Preload collision sounds
2015-05-29 09:51:41 -07:00
Stephen Birarda
e91ee7e7e3
only send add packet for nodes in interest set
2015-05-29 09:49:54 -07:00
Eric Levin
f573645291
line entity width translating
2015-05-29 09:24:00 -07:00
Brad Davis
8bad80324f
Merge branch 'master' into plugins_pt3
2015-05-29 09:05:01 -07:00
Stephen Birarda
5749fefcd5
have show DS connect refresh existing dialog
2015-05-28 17:07:57 -07:00
Stephen Birarda
7f86ca3f10
refresh the network dialog if it is already up
2015-05-28 17:07:20 -07:00
Stephen Birarda
cb7b23f346
install DS message handler in DomainServer
2015-05-28 17:04:15 -07:00
Stephen Birarda
046828ee5d
make the LNL the parent of any Nodes it adds
2015-05-28 16:58:58 -07:00
Stephen Birarda
29d3ca85d9
cleanup debug logs for DS/node ping punch
2015-05-28 16:53:13 -07:00
Stephen Birarda
265e0f3da6
remove NetworkPeer dtor debug, fix ICE socket
2015-05-28 16:44:34 -07:00
Andrew Meadows
ac0609ea92
also render bbox when debugging simulator owner
2015-05-28 16:29:43 -07:00
Stephen Birarda
493a9da43e
make sure DS log handler is cleaned up
2015-05-28 16:23:14 -07:00
Eric Levin
3627f03c0d
drawing lines relative to position
2015-05-28 16:00:24 -07:00
Eric Levin
533148f26d
line being sent as array
2015-05-28 15:48:31 -07:00