Commit graph

53314 commits

Author SHA1 Message Date
Rob Kayson
a0c8c4df52 tetherball stick and ball remove themselves after 2 seconds if user who has them equipped leaves the domain 2017-04-18 10:07:02 -07:00
Rob Kayson
2257af42be removed extra actions, creating all entities in create script. 2017-04-12 17:07:59 -07:00
Rob Kayson
5ce70decfc Merge branch 'master' of github.com:highfidelity/hifi into W-21204-tetherball-toy 2017-04-07 19:26:02 -07:00
Rob Kayson
49858d3ec5 Equip stick instead of grab. String is less rigid. Fixed bug where the ball was not recognized when other clients equipped the stick. 2017-04-07 19:16:29 -07:00
Brad Hefta-Gaub
0d4649ded8 Merge pull request #10079 from jherico/entity_thread_safety
Thread safety for property getter/setters on entities
2017-04-07 19:01:07 -07:00
Chris Collins
8e12f62cbb Merge pull request #10153 from druiz17/goto-fix
Ability to toggle goto with the crt-l and enter keys
2017-04-07 16:36:41 -07:00
Faye Li
d53b5b9c8c Merge pull request #10137 from fayeli/handheld-cam
Selfie Stick Script
2017-04-07 16:12:23 -07:00
Chris Collins
1175f65cb0 Merge pull request #10162 from vladest/goto-white-buttons-fix
Check if offset outside image, set to last image
2017-04-07 15:58:48 -07:00
Howard Stearns
57d8ec883e Merge pull request #10163 from davidkelly/dk/3938
updated availability combo dialog
2017-04-07 13:57:17 -07:00
Seth Alves
03065ee6c8 Merge pull request #9938 from kunalgosar/jsRenderBug
Stop WebEntities Running Files and Commands
2017-04-07 13:44:03 -07:00
Dante Ruiz
cde9310f3e goto home button fix 2017-04-07 21:35:28 +01:00
Dante Ruiz
909fda98a4 git goto button toggle hightlight 2017-04-07 21:01:53 +01:00
David Kelly
870e003311 Scattered X glyphs around the letterbox and combo dialogs 2017-04-07 11:12:54 -07:00
David Kelly
ee9bc0bfa4 updated availability combo dialog 2017-04-07 10:25:37 -07:00
Vladyslav Stelmakhovskyi
9a563ba02f Check if offset outside image, set to last image 2017-04-07 19:17:09 +02:00
Faye Li
3caea88641 use JS method to enable/disable avatar collisions 2017-04-07 10:02:30 -07:00
Andrew Meadows
b9c7d6351f Merge pull request #10135 from samcake/ambient
Rename render::PendingChanges to render::Transaction
2017-04-07 09:54:10 -07:00
Brad Davis
91f8bf45b8 Merge pull request #10159 from highfidelity/revert-10158-revert-10157-brown
Fixing the rendering bug triggered with Nvidia driver 381.65
2017-04-07 09:53:41 -07:00
David Kelly
12b5b91754 Merge pull request #10161 from howard-stearns/fix-pal-connections-help
fix pal connections-tab help trigger
2017-04-07 09:34:11 -07:00
Howard Stearns
468cc7f19b Merge pull request #10150 from davidkelly/dk/3930
friends checkbox speedup
2017-04-07 09:27:39 -07:00
David Kelly
d363bde0d4 Merge pull request #10155 from howard-stearns/make-connection-message-not-logged-in
make connection messaging when not logged in
2017-04-07 09:12:24 -07:00
Howard Stearns
03013ecb3a fix pal connections-tab help trigger 2017-04-07 07:30:36 -07:00
Howard Stearns
5d341778c5 fix notification word wrapping 2017-04-07 07:08:19 -07:00
samcake
f82310545c Revert "Revert "Fixing the rendering bug triggered with Nvidia driver 381.65"" 2017-04-07 02:03:58 -07:00
samcake
700c319953 Merge pull request #10158 from highfidelity/revert-10157-brown
Revert "Fixing the rendering bug triggered with Nvidia driver 381.65"
2017-04-07 02:03:51 -07:00
samcake
ab3d39951e Revert "Fixing the rendering bug triggered with Nvidia driver 381.65" 2017-04-07 02:03:31 -07:00
samcake
ac9b181786 Merge pull request #10157 from samcake/brown 2017-04-07 02:01:05 -07:00
Sam Cake
b1a4bc329b Introducing a fix to the graphics bug 2017-04-07 01:10:18 -07:00
Sam Cake
da1355dc32 Introducing a fix to the graphics bug 2017-04-07 01:03:07 -07:00
samcake
aae7349c40 trying to understand the bug with nvidia new driver 2017-04-06 18:31:03 -07:00
howard-stearns
b089fd03b8 make connection messaging when not logged in 2017-04-06 16:48:11 -07:00
samcake
0254c3372f Merge pull request #10143 from jherico/ktx_crash
Don't crash if KTX file is invalid
2017-04-06 16:28:19 -07:00
David Kelly
d64a803451 no need to set checked 2017-04-06 16:08:48 -07:00
Chris Collins
4e9e3cccea Merge pull request #10116 from birarda/bug/rel-ext-textures
fix relative/absolute path handling for external FBX textures
2017-04-06 15:58:02 -07:00
Seth Alves
ec2ebc00c0 Merge pull request #10145 from hyperlogic/feature/openvr-1.0.6
OpenVR: upgrade to version 1.0.6, for better generic tracker support
2017-04-06 15:53:49 -07:00
David Kelly
a1c211395b Merge pull request #10152 from howard-stearns/fix-sort-by-connections-friend-column
fix sorting by pal connections-tab friends column
2017-04-06 15:43:21 -07:00
Dante Ruiz
22521526ec removed stray space 2017-04-06 23:41:30 +01:00
Seth Alves
b1a015affd Merge pull request #10117 from huffman/fix/unlock-propagation
Fix entity "unlock" edits not being propagated to clients
2017-04-06 15:28:05 -07:00
Howard Stearns
67f2cc3567 Merge pull request #10148 from davidkelly/dk/3936
pal selection changes
2017-04-06 14:58:46 -07:00
Clément Brisset
da27cd1c8b Merge pull request #10149 from mittens/patch-1
Link to coding standards.
2017-04-06 14:46:45 -07:00
howard-stearns
9577102c22 fix sorting by pal connections-tab friends column 2017-04-06 14:45:08 -07:00
Dante Ruiz
a89081601c fix merge issues 2017-04-06 22:31:47 +01:00
Dante Ruiz
52fd446d4d toggle goto in tablet 2017-04-06 22:27:37 +01:00
David Kelly
331f2da4f8 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3936 2017-04-06 14:22:08 -07:00
Seth Alves
3c6429cdf3 Merge pull request #10103 from vladest/master-qml-bugfixes
Master qml bugfixes
2017-04-06 14:22:06 -07:00
David Kelly
726395ac3e friends checkbox speedup 2017-04-06 14:07:07 -07:00
Howard Stearns
f7ef587c61 Merge pull request #10138 from davidkelly/dk/3935
Now you can forget connections
2017-04-06 14:05:25 -07:00
Chris Collins
494c8d868e Merge pull request #10126 from samcake/brown
Fixing the rendering of Image3D overlay when drawn in the scene
2017-04-06 13:40:09 -07:00
Anthony J. Thibault
4e49774d0e Moved device class check into handleTrackedObject 2017-04-06 13:20:00 -07:00
Trent Polack
d163b34368 Link to coding standards. 2017-04-06 15:57:32 -04:00