Commit graph

25842 commits

Author SHA1 Message Date
David Rowe
b166e24ff5 Fix initial fade-in 2015-06-01 11:06:33 -07:00
David Rowe
9a8bb67f37 Tidy address bar dialog code 2015-06-01 09:01:11 -07:00
David Rowe
e41b4c1b7b Add new address bar dialog error message
Implemented as a new simple InformationDialog so that can try it out
without reworking MessageDialog immediately for all QML UI.
2015-06-01 09:01:11 -07:00
David Rowe
05e251eba4 Add icon to address bar dialog 2015-06-01 09:01:10 -07:00
David Rowe
881941b64d Restyle address bar dialog
Made the dialog a stand-alone QML file that doesn't inherit from other
dialog QML files so that don't need to rework all dialogs right now.
2015-06-01 09:01:09 -07:00
David Rowe
a43593c3b2 Dialog opacity transition tidying 2015-06-01 09:01:08 -07:00
David Rowe
2a931119bd Replace expand/collapse dialog animation with fade in/out 2015-06-01 09:01:08 -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
8dda86f80d added brownianFun script to apply random forces to balls in a pen 2015-05-29 17:02:51 -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
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
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
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
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