Stephen Birarda
cf67d22ec7
Merge pull request #5036 from venkatn93/master
...
Fixed snapshot bug. Snapshots now save and load ok
2015-06-03 18:57:29 -04:00
Niraj Venkat
29a15453ac
Visual studio tab issues fixed
2015-06-03 15:35:04 -07:00
Niraj Venkat
4db110a6e1
Final fixes. Snapshot should be good now
2015-06-03 15:09:45 -07:00
Niraj Venkat
92248d23e7
more indentation changes
2015-06-03 14:59:07 -07:00
Niraj Venkat
694272ffaa
"fixed" formatting issues and code cleanup
2015-06-03 14:48:25 -07:00
Niraj Venkat
57004c61c7
Fixed snapshot bug. Snapshots now save and load ok
2015-06-03 14:29:39 -07:00
David Rowe
878227ab8b
Increase address bar dialog size
...
Including font size, just for this dialog.
2015-06-02 16:33:09 -07:00
David Rowe
ec1cb72dd5
Rework QML font sizing to be more consistent across platforms
2015-06-02 14:49:33 -07:00
David Rowe
a8a3c677ad
Darken address bar hint text so that it's better visible on the DK2
2015-06-02 14:49:32 -07:00
Andrew Meadows
2702e07863
Merge pull request #5015 from sethalves/polyvox
...
PolyVox improvements -- depends on #5008
2015-06-02 14:34:49 -07:00
David Rowe
fb379f6c00
Fix crash when setting avatar body with Preferences dialog closed
2015-06-02 08:37:45 -07:00
Philip Rosedale
90dd730a25
Merge pull request #4940 from ctrlaltdavid/20544
...
CR for 20544 - Make eyelids follow iris as head tilts
2015-06-01 23:36:07 -07:00
Stephen Birarda
12bcbbf338
Merge pull request #5012 from ctrlaltdavid/20555
...
DO NOT MERGE - QA for #20555 - Re-style QML Address Bar
2015-06-01 17:08:00 -04:00
David Rowe
7d12482a49
Untabify
2015-06-01 13:54:14 -07:00
David Rowe
9c52c79fe1
Combine icon and input areas into a single SVG
2015-06-01 13:29:36 -07:00
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
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
Seth Alves
1a26421414
Merge branch 'master' of github.com:highfidelity/hifi into created-time-is-a-property
2015-05-29 13:04:45 -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
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
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
Seth Alves
065f19d527
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-28 10:31:44 -07:00
Seth Alves
a91a7942a4
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-28 06:59:39 -07:00
Brad Davis
e5bec42512
Fix mouse emulation picking and pointer positioning for the hydra
2015-05-27 23:36:00 -07:00
Andrew Meadows
4e073c77b3
Merge pull request #4978 from sethalves/fix-4973
...
recreate PR #4973 with some additional changes -- removed const keywo…
2015-05-27 21:11:28 -07:00
Seth Alves
4fa6f388b9
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 18:20:59 -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
Seth Alves
386b3301f4
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 14:46:37 -07:00
Seth Alves
bfa0e9c234
recreate PR #4973 with some additional changes -- removed const keyword from qinvokables for avatar getter methods such as getVelocity
2015-05-27 14:44:23 -07:00
Seth Alves
ba0467aafe
Revert "removed const keyword from Q_INVOKABLE for avatar getter methods such…"
2015-05-27 14:10:45 -07:00
Seth Alves
7f99f261c2
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 13:59:13 -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
Eric Levin
eb0f35e041
removed const keyword from qinvokables for avatar getter methods such as getVelocity
2015-05-27 11:44:37 -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
Seth Alves
c80f2970fd
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 07:37:51 -07:00
Stephen Birarda
9cb6ccaa46
thread safe timing of domain connection
2015-05-26 16:49:18 -07:00
Seth Alves
55028f6cb0
voxel data sent over wire and saved to json
2015-05-26 16:34:35 -07:00
Stephen Birarda
08affbfd0d
fix table size calculations
2015-05-26 16:14:12 -07:00
