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
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
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
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
Howard Stearns
0f30ec2ccc
Undo the merge with the broken master checking. What could go wrong?
2015-05-28 13:48:27 -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
Brad Hefta-Gaub
5da3a9440e
Merge pull request #4964 from howard-stearns/remove-global-collision-and-update-examples
...
[REQUIRES #4962 ] Remove global collision and update examples
2015-05-27 16:09:14 -07:00
Stephen Birarda
734798a365
fix move of connection steps to LNL
2015-05-27 15:50:31 -07:00
David Rowe
a2272d3f42
Fix Windows C4351 build warning
...
VS2013 warns about default initialization of arrays because it behaved
differently in previous versions. Default initialization is what we expect
now that we're using VS2013 so we can disable this warning globally.
2015-05-27 11:49:00 -07:00
Howard Stearns
4b4bf9fd90
Merge branch 'master' of https://github.com/highfidelity/hifi into remove-global-collision-and-update-examples
2015-05-27 09:29:06 -07:00
Stephen Birarda
9cb6ccaa46
thread safe timing of domain connection
2015-05-26 16:49:18 -07:00
Stephen Birarda
08affbfd0d
fix table size calculations
2015-05-26 16:14:12 -07:00
Stephen Birarda
5b5518077d
fix headers and stats for domain connection timing
2015-05-26 15:51:00 -07:00
Stephen Birarda
61029fd0b1
add ability to display domain connection times
2015-05-26 15:22:25 -07:00
Stephen Birarda
626f22191c
add a QAbstractTableModel for domain connection steps
2015-05-26 14:17:02 -07:00
Andrew Meadows
16e5710325
Merge pull request #4954 from ZappoMan/entitysmartpointers
...
EnitityItem smart pointers
2015-05-26 14:05:03 -07:00
Howard Stearns
3c718af43f
Merge branch 'master' of https://github.com/highfidelity/hifi into remove-global-collision-and-update-examples
2015-05-26 13:26:02 -07:00
Stephen Birarda
f28ade1075
log connection times for eventual stats display
2015-05-26 10:37:44 -07:00
ZappoMan
c92e7bed87
andrews CR feedback
2015-05-26 09:44:02 -07:00
Howard Stearns
cbf4e09a10
Remove global collision event.
2015-05-25 16:10:50 -07:00
ZappoMan
8b78fc4190
EnitityItem smart pointers
2015-05-22 17:57:50 -07:00
Stephen Birarda
69f1cd80e6
immediately send ICE heartbeat once data present
2015-05-22 16:29:01 -07:00
Andrew Meadows
461d08c0a9
merge upstream/master into andrew/bispinor
2015-05-22 11:35:02 -07:00
Andrew Meadows
0431e8da36
put avatar body in right spot, and give it mass
2015-05-22 11:08:56 -07:00
Brad Hefta-Gaub
da8f99508c
Merge pull request #4871 from huffman/console-error
...
Add error handling to JSConsole
2015-05-22 10:57:18 -07:00
Atlante45
c6ce5e7680
PerformanceTimer deactivated when not in use
2015-05-22 18:54:40 +02:00
Andrew Meadows
01cc629224
fix crashes during init and shutdown
2015-05-22 09:20:08 -07:00
David Rowe
a0c3c974a9
Throttle DDE face acquisition attempts in order to reduce CPU usage
2015-05-21 19:44:38 -07:00
Andrew Meadows
ac8cac9783
avatars use DYNAMIC motion
2015-05-21 16:37:10 -07:00
Andrew Meadows
2e3973dfdd
impl AvatarMotionState::set/getWorldTransform()
2015-05-21 15:34:30 -07:00
Andrew Meadows
67f5d0773d
some list management of AvatarMotionStates
2015-05-21 14:40:47 -07:00
Seth Alves
38edc27cbb
Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux
2015-05-20 18:24:40 -07:00
samcake
496898273c
Merge pull request #4846 from jherico/dk1
...
Second attempt at fixing the HMD eye projections, without breaking the camera this time.
2015-05-20 17:02:28 -07:00
Seth Alves
782402b4c8
Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux
2015-05-20 14:53:05 -07:00
Brad Hefta-Gaub
79023763ef
Merge pull request #4869 from ctrlaltdavid/20543
...
CR for #20543 - Option to auto-mute mic if step away from PC when face tracking is enabled
2015-05-20 14:47:31 -07:00
Seth Alves
124ff68cee
make EntityItemID a subclass of QUuid
2015-05-20 14:22:08 -07:00
Howard Stearns
c5b8dd51d8
Fix https://app.asana.com/0/32622044445063/34195351184789
...
Handle collision events when we do other updates (and their entity scripts) rather than when we do the physic updates while the tree is locked.
Given that, remove the check that kept sound from playing (or scripts from running) when we would have deadlocked, because now we don't.
2015-05-20 11:07:03 -07:00
Seth Alves
a769cfdaf2
client decides on new entity-ids, keep EntityItemID class
2015-05-20 10:42:19 -07:00
Brad Davis
827d7f6221
Merge branch 'master' into dk1
2015-05-20 09:41:20 -07:00
Andrew Meadows
2f4162f447
cleanup of AvatarManger API
2015-05-19 16:53:30 -07:00
Seth Alves
f9d46b0cb5
interface decides on entityIDs rather than bouncing a temporary id through the entity server
2015-05-19 14:25:23 -07:00
Andrew Meadows
f86c419988
stubbery for collidable avatars
2015-05-19 14:15:26 -07:00
Sam Cake
580339e99f
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-05-15 17:24:59 -07:00
Sam Cake
e9ff06df24
FIx the issue where the view frustum used in the skybox wasn;t in sync with the true camera, except if shadows is on, THe one call missing is now always executed
2015-05-15 17:22:29 -07:00
Philip Rosedale
36b396b9ef
Merge pull request #4881 from ctrlaltdavid/fix-binary-eyelid
...
Fix visibility of binary eyelid control menu item
2015-05-15 17:19:15 -07:00