Brad Davis
de268c47b3
Working on 0.6
2015-06-07 18:25:16 -07:00
Bradley Austin Davis
6a60da2a6c
Working on SDK 0.6
2015-06-07 17:58:33 -07:00
Brad Davis
119f37a178
Working on SDK 0.6
2015-06-07 14:34:40 -07:00
David Rowe
8c1ece8865
Fix #include for Unix
2015-06-07 13:57:02 -07:00
David Rowe
36312e7bb4
Remove circular login dialog variation
2015-06-07 13:57:01 -07:00
David Rowe
162395e7fe
Make login password and register links work
2015-06-07 13:56:56 -07:00
David Rowe
a2f262f659
Add basic username, password, login, and error functionality and styling
2015-06-07 13:56:54 -07:00
David Rowe
511832c273
New login dialog background with circular and rectangular variations
...
Developer menu item toggles between the two.
2015-06-07 13:56:53 -07:00
Bradley Austin Davis
b56fbd4744
Working on SDK 0.6
2015-06-07 13:56:06 -07:00
Brad Davis
f614268667
Moving windows to SDK 0.6
...
Working on SDK 0.6 for windows
Working on SDK 0.6 for windows
2015-06-07 01:40:44 -07:00
Niraj Venkat
827d8bd854
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-05 13:33:41 -07:00
Niraj Venkat
a3f19e9d4c
Fixing title bar update on teleport
2015-06-05 13:33:14 -07:00
Seth Alves
4e10c28b41
merge from upstream
2015-06-05 10:31:13 -07:00
Seth Alves
edb3622c85
Merge pull request #5037 from AndrewMeadows/inertia
...
collision groups for physical objects
2015-06-05 10:26:28 -07:00
Brad Davis
16f55c7557
Fix the skybox jiggle in the HMD
2015-06-05 09:52:56 -07:00
Seth Alves
9a67f35b59
Merge branch 'master' of github.com:highfidelity/hifi into actions
2015-06-04 19:02:46 -07:00
Eric Levin
5e15c14539
added sanitization for invalid line points data. Fixed bug where occasionally wrong view frustum would be sent to script"
2015-06-04 16:45:32 -07:00
Seth Alves
4414b67837
Merge branch 'master' of github.com:highfidelity/hifi into actions
2015-06-03 20:43:22 -07:00
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
Andrew Meadows
ec0b4a956a
move collision group consts to shared lib
2015-06-03 14:13:51 -07:00
Andrew Meadows
7b6cc59d30
basic support for collision groups
2015-06-03 11:40:48 -07:00
Seth Alves
a31a5a1554
main actions interface is in EntityItem. changes in actions are queued up and applied before simulation step
2015-06-02 19:40:20 -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
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
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
