Commit graph

43587 commits

Author SHA1 Message Date
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
cb40cfbead Merge pull request #7972 from jherico/entity_shape_protocol_fix
Fix broken protocol for shapes
2016-05-25 14:13:15 -07:00
Brad Davis
b16e701ea3 Fix broken protocol for shapes 2016-05-25 13:53:28 -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
David Rowe
9ec6b77460 Make file browser dialog movable 2016-05-25 13:49:01 +12: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
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
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
Brad Davis
cd1e910844 Add a generic shape primitive 2016-05-21 23:46:44 -07:00
Seth Alves
d7142aee80 try to make osx clang happy, also 2016-05-21 18:06:21 -07:00
Seth Alves
40e862cf9e quiet gcc 5 warnings 2016-05-21 16:53:01 -07:00
Brad Davis
e07674134f Merge pull request #7950 from ZappoMan/removeDisableEntityNACKS
remove old debug feature that is no longer needed.
2016-05-21 10:12:19 -07:00
Brad Hefta-Gaub
567f7f4b77 Merge pull request #7953 from ctrlaltdavid/20929
fix not being able to teleport to user when users window moved right
2016-05-21 09:25:07 -07:00
Brad Hefta-Gaub
ac49feda22 Merge branch 'master' of https://github.com/highfidelity/hifi into removeDisableEntityNACKS
Conflicts:
	libraries/entities/src/EntityEditPacketSender.h
2016-05-21 09:23:45 -07:00
Brad Hefta-Gaub
5b98b062f8 Merge pull request #7840 from sethalves/avatar-entities-3
Avatar entities
2016-05-21 07:57:11 -07:00
David Rowe
a294170c74 Fix not being able to teleport to user when users window moved right 2016-05-21 15:50:06 +12:00
Geenz
a80f47e550 Merge remote-tracking branch 'highfidelity/master' into 20901 2016-05-20 21:12:42 -04:00
Seth Alves
637735bbc3 unmangle merge 2016-05-20 18:07:38 -07:00
David Rowe
5a27d656c5 Potential OSX fix plus extra logging 2016-05-21 13:03:58 +12:00
Seth Alves
f91a2403be merge from upstream 2016-05-20 17:07:34 -07:00
Brad Hefta-Gaub
e012630db2 Merge pull request #7860 from birarda/place-referrer
send lookup hostname to DS for split counts, correct number of DS connected users
2016-05-20 17:00:46 -07:00
Brad Hefta-Gaub
18613908df Merge pull request #7800 from sethalves/no-fly-zones
No fly zones
2016-05-20 16:59:55 -07:00
Brad Hefta-Gaub
5906f88226 Merge pull request #7952 from sethalves/fix-walking-far-grab
fix distance-grabbing and walking at the same time
2016-05-20 16:54:52 -07:00
Brad Hefta-Gaub
dc29e97d32 Merge pull request #7870 from jherico/input_cleanup
Update input plugins default active state & joint handling
2016-05-20 16:13:06 -07:00
Seth Alves
a24d63a39c make distance-grab work better when avatar is walking 2016-05-20 15:45:00 -07:00
Brad Hefta-Gaub
2062291810 Merge pull request #7926 from zzmp/fix/debug-script-crash
fix crash on shutdown in debug
2016-05-20 15:35:32 -07:00
Brad Hefta-Gaub
9dded91af3 Merge pull request #7934 from AndrewMeadows/trim-convex-hulls
reduce number of points in unreasonable convex hulls
2016-05-20 15:30:36 -07:00