Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 14:40:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
25945 commits 25 branches 0 tags 1.1 GiB
Commit graph

25945 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Seth Alves
9f4fff3588 don't need convertScriptValue(QScriptEngine* e, QDateTime v) 2015-05-29 09:33:29 -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
Seth Alves
0cf9afd8ec attempt to save _created as an iso date in utc 2015-05-28 21:21:57 -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
Seth Alves
6b8b930839 Merge branch 'master' of github.com:highfidelity/hifi into created-time-is-a-property 2015-05-28 16:16:13 -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
Stephen Birarda
9d2e1773a0 fix memory issues for immediate ice pings 2015-05-28 15:31:21 -07:00
Leonardo Murillo
f8cd670463 Merge pull request #4993 from sethalves/fix-polyvox-in-assignment 
libraries/entities doesn't need polyvox, only libraries/entities-rend…
 2015-05-28 15:52:47 -06:00
Stephen Birarda
da0c9fbc31 fix send of existing peer to querier 2015-05-28 14:37:16 -07:00
Eric Levin
4d4a90e9ce removed render debugging 2015-05-28 14:30:34 -07:00
Seth Alves
94edb72b47 oops 2015-05-28 14:30:06 -07:00
Seth Alves
131827a82b libraries/entities doesn't need polyvox, only libraries/entities-renderer 2015-05-28 14:27:49 -07:00
Stephen Birarda
e096cbe040 have ice-server immediately send peer to DS 2015-05-28 14:25:18 -07:00
Andrew Meadows
7be16da1a8 compute correct time-of-flight for extrapolation 2015-05-28 14:24:39 -07:00
Eric Levin
2d66696675 line working from array of points 2015-05-28 14:18:57 -07:00
Howard Stearns
e7a48af56d Merge branch 'master' of https://github.com/highfidelity/hifi into preload-collision-sounds 2015-05-28 14:15:51 -07:00
Howard Stearns
6b3c51c5b7 Merge pull request #4990 from AndrewMeadows/isentropic 
fix crash when creating a box with edit.js
 2015-05-28 14:14:45 -07:00
Stephen Birarda
531ef1fa1c change ice-server heartbeat behaviour 2015-05-28 14:05:43 -07:00
Howard Stearns
243ffbc74b Merge branch 'master' of https://github.com/highfidelity/hifi into preload-collision-sounds 2015-05-28 13:53:59 -07:00
Howard Stearns
0f30ec2ccc Undo the merge with the broken master checking. What could go wrong? 2015-05-28 13:48:27 -07:00
Stephen Birarda
eb6b80133b immediately ping the ICE DS every 25ms 2015-05-28 13:17:48 -07:00
Howard Stearns
810c766f77 When an entity is added or changed with a collisionSoundURL, cache it so that it is ready to play on the first hit. 2015-05-28 12:50:02 -07:00
Andrew Meadows
0c6de897f5 replace tab with spaces 2015-05-28 12:26:29 -07:00
Andrew Meadows
b90d35c0c0 restore code to fix box entites not rendering 
boxes wouldn't render when in an otherwise empty domain
 2015-05-28 12:22:17 -07:00
Andrew Meadows
b7e3461e1a restore _created magic 2015-05-28 12:21:38 -07:00
Seth Alves
591f4d3a2a Merge branch 'master' of github.com:highfidelity/hifi into created-time-is-a-property 2015-05-28 11:27:35 -07:00
Eric Levin
8886e93d5f changed qVector to qVectorVec3 2015-05-28 11:26:41 -07:00
Stephen Birarda
81c23e9ca0 output if pinged node cannot be reached 2015-05-28 11:22:27 -07:00
Seth Alves
06ffcbf24d Merge pull request #4981 from ericrius1/blockWorld 
tiles and block no longer delete on script end, now user can delete a…
 2015-05-28 11:09:14 -07:00
Stephen Birarda
cee058c4ce handle immediate add packets in NodeList 2015-05-28 11:02:45 -07:00
Seth Alves
92817d9302 created-time is a property so it can be persisted to and retrieved from json saves 2015-05-28 10:59:27 -07:00
Stephen Birarda
5c75863af4 immediately send add packet from DS for new node 2015-05-28 10:45:03 -07:00
Eric Levin
72af4e4e67 latest pointer 2015-05-28 10:44:44 -07:00
Seth Alves
d32ae19ac7 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-28 10:44:05 -07:00
Andrew Meadows
2a4cd468e4 Merge pull request #4979 from sethalves/polyvox 
initial pass at Polyvox Entity Type
 2015-05-28 10:43:50 -07:00
Seth Alves
065f19d527 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-28 10:31:44 -07:00
Seth Alves
ab86b1d90a code review 2015-05-28 10:29:23 -07:00