Andrew Meadows
|
f8e2cf8064
|
cleanup vhacd-util logging and variable names
|
2016-05-25 19:31:21 -07:00 |
|
Brad Hefta-Gaub
|
485c8aceac
|
Merge pull request #7942 from sethalves/fix-edit-js-restart
fix a race that keeps some scripts from restarting
|
2016-05-25 17:22:17 -07:00 |
|
Brad Hefta-Gaub
|
f2acc82899
|
Merge pull request #7971 from birarda/session-id-with-place-request
optionally include the metaverse session ID as HTTP header when sending usage data
|
2016-05-25 17:14:27 -07:00 |
|
Brad Hefta-Gaub
|
06cb625d09
|
Merge pull request #7959 from hyperlogic/tony/improved-avatar-mixer-precision
Improved Avatar Mixer Rotation Precision
|
2016-05-25 17:14:12 -07:00 |
|
Brad Hefta-Gaub
|
7131920312
|
Merge pull request #7966 from ctrlaltdavid/20932
make file dialog resizable and movable
|
2016-05-25 17:13:55 -07:00 |
|
Brad Hefta-Gaub
|
0a96b144e3
|
Merge pull request #7970 from birarda/api-recheck-on-fail
clear AddressManager previous lookup on 404
|
2016-05-25 17:13:44 -07:00 |
|
samcake
|
b76cda3c89
|
Merge pull request #7945 from Geenz/20901
20901: Add Range Based Light Attenuation
|
2016-05-25 16:39:01 -07:00 |
|
Seth Alves
|
3184304179
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-js-restart
|
2016-05-25 14:14:09 -07:00 |
|
Seth Alves
|
cb40cfbead
|
Merge pull request #7972 from jherico/entity_shape_protocol_fix
Fix broken protocol for shapes
|
2016-05-25 14:13:15 -07:00 |
|
Seth Alves
|
7d4462ba81
|
Merge branch 'entity_shape_protocol_fix' of github.com:jherico/hifi into fix-edit-js-restart
|
2016-05-25 13:54:33 -07:00 |
|
Brad Davis
|
b16e701ea3
|
Fix broken protocol for shapes
|
2016-05-25 13:53:28 -07:00 |
|
Seth Alves
|
49769f7d29
|
trying again -- frantic clicking on reload no longer appears to wedge things
|
2016-05-25 13:39:13 -07:00 |
|
Seth Alves
|
75329c812c
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-js-restart
|
2016-05-25 13:06:24 -07:00 |
|
Stephen Birarda
|
66bdbf910d
|
optionally include the metaverse session ID as an http header
|
2016-05-25 11:55:04 -07:00 |
|
Seth Alves
|
b0ce65ec01
|
trying to mimic previous behavior more closely
|
2016-05-25 11:42:06 -07:00 |
|
Stephen Birarda
|
3137cd64e1
|
clear AddressManager previous lookup on 404
|
2016-05-25 11:40:17 -07:00 |
|
Seth Alves
|
36ce6491dd
|
Merge pull request #7969 from jherico/entity_shape_collision_fix
Fix primitive shape collisions
|
2016-05-25 11:39:18 -07:00 |
|
Brad Davis
|
8f3918b5ba
|
Fix primitive shape collisions
|
2016-05-25 11:21:05 -07:00 |
|
Seth Alves
|
04bd27ea55
|
Merge branch 'fix-edit-js-restart' of github.com:sethalves/hifi into fix-edit-js-restart
|
2016-05-25 10:41:03 -07:00 |
|
Seth Alves
|
ef709c09d0
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-js-restart
|
2016-05-25 09:46:30 -07:00 |
|
Seth Alves
|
cd6b9a8a5f
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-js-restart
|
2016-05-25 09:46:12 -07:00 |
|
David Rowe
|
9ec6b77460
|
Make file browser dialog movable
|
2016-05-25 13:49:01 +12:00 |
|
Anthony J. Thibault
|
ea8ba7e2d1
|
Fixes based on code review feedback.
* Use isNaN instead of glm::isnan
* prefer abort() over writing to a nullptr, in release assert.
* warn if packet size does not match expectations
|
2016-05-24 18:12:40 -07:00 |
|
David Rowe
|
1c4eed640f
|
Fix up file browser resize handle and outlining
|
2016-05-25 13:10:26 +12:00 |
|
David Rowe
|
66a90cc3f8
|
Make file browser dialog resizable
|
2016-05-25 11:31:39 +12:00 |
|
David Rowe
|
b9aa667c55
|
Fix QML test environment
|
2016-05-25 10:37:30 +12:00 |
|
Brad Hefta-Gaub
|
b8b39b962d
|
Merge pull request #7868 from jherico/entity_shape
Add a generic shape primitive
|
2016-05-24 08:40:58 -07:00 |
|
Brad Hefta-Gaub
|
49ded9c4df
|
Merge pull request #7873 from ctrlaltdavid/20917
restyle file browser
|
2016-05-24 08:40:38 -07:00 |
|
Brad Hefta-Gaub
|
f16a3ce6bb
|
Merge pull request #7962 from zzmp/fix/throttle
fix throttling when Interface is not in focus
|
2016-05-24 08:25:38 -07:00 |
|
Seth Alves
|
0bd6702fce
|
Merge pull request #7963 from ctrlaltdavid/flying-and-ghosting
tidy zone flying and ghosting entities editor options
|
2016-05-24 07:18:30 -07:00 |
|
David Rowe
|
3391430f0a
|
Tidy zone flying and ghosting entities editor options
Move options to top of section from under "skybox" subsection
Fix capitalization of labels
|
2016-05-24 20:28:49 +12:00 |
|
Brad Hefta-Gaub
|
bfb3f2cdfe
|
Merge pull request #7955 from sethalves/quiet-compiler
quiet gcc 5 warnings
|
2016-05-23 19:44:21 -07:00 |
|
Zach Pomerantz
|
7dabce9cff
|
Check throttle before idling/painting
|
2016-05-23 19:04:35 -07:00 |
|
David Rowe
|
504516b627
|
Merge branch 'master' into 20917
|
2016-05-24 08:03:54 +12:00 |
|
David Rowe
|
099a675a18
|
Remove extra logging
|
2016-05-24 08:03:29 +12:00 |
|
Anthony J. Thibault
|
4342a07108
|
Updated AvatarDataPacket section with sequence number info.
|
2016-05-23 11:11:37 -07:00 |
|
Clément Brisset
|
a8b359dd60
|
Merge pull request #7943 from birarda/api-recheck-on-fail
refresh connection info for place/domain while not connected
|
2016-05-23 10:57:58 -07:00 |
|
Anthony J. Thibault
|
9aad38b2c2
|
merge fix
|
2016-05-23 10:39:39 -07:00 |
|
Anthony J. Thibault
|
a1c32f8c44
|
Merge branch 'master' into tony/improved-avatar-mixer-precision
|
2016-05-23 10:24:52 -07:00 |
|
Anthony J. Thibault
|
5fe01acaa8
|
Added more comments to AvatarDataPacket section.
|
2016-05-23 10:03:13 -07:00 |
|
Seth Alves
|
00336f4860
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-js-restart
|
2016-05-23 09:58:20 -07:00 |
|
Brad Hefta-Gaub
|
f69c0ce5e5
|
Merge pull request #7957 from jherico/procedural_skybox_fix
fix broken procedural skybox when leaving and re-entering
|
2016-05-23 09:29:31 -07:00 |
|
Brad Hefta-Gaub
|
72dc24178f
|
Merge pull request #7958 from jherico/keystick_fix
fix keys getting stuck
|
2016-05-23 08:19:43 -07:00 |
|
Geenz
|
bd6f6d2eef
|
Typo.
Not quite sure how this got here.
|
2016-05-23 09:53:22 -04:00 |
|
Brad Davis
|
1f2f9da019
|
fix keys getting stuck
|
2016-05-22 23:34:45 -07:00 |
|
Brad Davis
|
11de8a52b2
|
fix broken procedural skybox when leaving and re-entering
|
2016-05-22 22:52:56 -07:00 |
|
Brad Davis
|
2c703e963c
|
More shapes
|
2016-05-22 19:48:59 -07:00 |
|
Geenz
|
ff3fca3dc3
|
Remove no longer necessary light vector parameter.
|
2016-05-22 21:50:48 -04:00 |
|
Geenz
|
180f4ba4f5
|
Tweaked light attenuation formula some more.
Keeping the ulightvec parameter for now - I want to revisit this later.
|
2016-05-22 21:02:28 -04:00 |
|
Geenz
|
9e9f95059f
|
Merge remote-tracking branch 'highfidelity/master' into 20901
|
2016-05-22 18:08:58 -04:00 |
|