Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-29 05:26:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
44503 commits 28 branches 28 tags 1.2 GiB
Commit graph

44503 commits

This branch
This branch
All branches
Author SHA1 Message Date
Howard Stearns
c600b65f45 Merge pull request #8114 from jherico/vive-keyboard 
Don't trigger keyboard on revealing the overlay layer
 2016-06-21 17:00:36 -07:00
SamGondelman
db8190ad49 fix typo 2016-06-21 16:56:00 -07:00
howard-stearns
d6095d1f11 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-21 16:52:22 -07:00
Howard Stearns
3879312968 Merge pull request #8116 from ZappoMan/cleanupPlugins 
remove dead refereince to PluginContainer.h from space mouse
 2016-06-21 16:51:06 -07:00
SamGondelman
f0b78eae47 fix mini mirror 2016-06-21 16:48:32 -07:00
Seth Alves
9ca27f267d cap lifetime rather than reject edits from nodes which only have tmp-rez rights 2016-06-21 16:48:04 -07:00
Ryan Huffman
4e52521f8c Update UserActivityLogger device blacklist 2016-06-21 16:43:16 -07:00
Ryan Huffman
310adb0f45 Update spacemouse deviceConnected implementation 2016-06-21 16:42:39 -07:00
Ryan Huffman
70be7b3273 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions 2016-06-21 16:39:25 -07:00
Ryan Huffman
da71fcb57f Update connected device detection implementation 2016-06-21 16:37:58 -07:00
Brad Hefta-Gaub
d9e8026cd6 Merge pull request #8113 from AndrewMeadows/fix-kinematic-motion 
fix setting velocity of inactive kinematic RigidBody
 2016-06-21 16:32:04 -07:00
Brad Hefta-Gaub
f2f7e21eaf remove dead refereince to PluginContainer.h from space mouse 2016-06-21 16:17:43 -07:00
Brad Davis
f3bad3a63b Don't trigger keyboard on revealing the overlay layer 2016-06-21 16:04:06 -07:00
howard-stearns
8421931c56 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-21 14:47:45 -07:00
SamGondelman
9a17f5b439 update homebrew instructions 2016-06-21 14:12:27 -07:00
Andrew Meadows
702e83ba6a prevent incompatible entity properties combos 2016-06-21 14:03:21 -07:00
Andrew Meadows
4c9ec7ca43 protect physics against bad entity properties 2016-06-21 13:55:11 -07:00
Andrew Meadows
937bd0c1be SHAPE_TYPE_MESH --> SHAPE_TYPE_STATIC_MESH 2016-06-21 13:54:21 -07:00
Brad Hefta-Gaub
5878927bd0 Merge pull request #8050 from ZappoMan/cleanupPlugins 
Cleanup plugins
 2016-06-21 13:53:22 -07:00
Howard Stearns
7e88772e85 Merge pull request #8106 from howard-stearns/triggering-change 
triggering change
 2016-06-21 13:51:12 -07:00
Brad Hefta-Gaub
c18f5e19f5 Merge pull request #8090 from zzmp/doc/metadata-script 
add example script for metadata from metaverse
 2016-06-21 13:42:10 -07:00
Brad Davis
c928de6051 Merge pull request #8099 from howard-stearns/turn-hud-reset-behavior-on-by-default 
turn hud reset behavior on by default
 2016-06-21 13:33:23 -07:00
Brad Davis
f475dd1d85 Merge pull request #8100 from howard-stearns/minimize-trigger-distance-to-hud 
minimize trigger distance to hud
 2016-06-21 13:33:16 -07:00
Ryan Huffman
0ea9c5c26d Fix getMemoryInfo not returning false on non-Windows 2016-06-21 13:32:17 -07:00
Ryan Huffman
251e2137d3 Remove old use of connectedDevice 2016-06-21 13:31:10 -07:00
Ryan Huffman
6c2c7f1eec Fix connected_device user activity event 2016-06-21 13:28:40 -07:00
Zach Pomerantz
c8ead2ad04 conform to coding braces standard 2016-06-21 13:28:15 -07:00
Howard Stearns
cd09c61f31 Merge pull request #8108 from jherico/vive-toolbars 
Additional toolbar work
 2016-06-21 13:26:09 -07:00
Brad Hefta-Gaub
5dcf5031a3 Merge pull request #8111 from zzmp/feat/domain-hours-metadata 
add operating hours to domain
 2016-06-21 13:14:13 -07:00
Howard Stearns
4f71f621f7 Merge pull request #8102 from hyperlogic/feature/remove-grip-button 
Use trigger to both grab and equip objects
 2016-06-21 13:09:11 -07:00
Brad Hefta-Gaub
160a5de271 CR feedback 2016-06-21 12:49:42 -07:00
Brad Hefta-Gaub
c322317878 rework plugins to not depend on PluginContainer unless they want to 2016-06-21 12:07:05 -07:00
Anthony J. Thibault
972c292857 Fix for equip-hotspot being visible for whiteboard markers 2016-06-21 11:59:11 -07:00
Seth Alves
c97618f8bc reduce the number of user public-key downloads during a login attempt 2016-06-21 11:40:55 -07:00
Zach Pomerantz
c784fa42e9 log failure to fetch metadata 2016-06-21 11:34:23 -07:00
Brad Davis
cf57e71f1a Merge pull request #8112 from howard-stearns/do-not-tilt-keyboard 
do not tilt virtual keyboard
 2016-06-21 11:33:53 -07:00
Brad Davis
ec87e2fe90 Merge pull request #8107 from zzmp/fix/metadata-tags-hosts-restrictions 
fix metadata tags, hosts, restriction
 2016-06-21 11:33:32 -07:00
Zach Pomerantz
52170eb12e use refs for domain metadata parsing 2016-06-21 11:21:20 -07:00
Ryan Huffman
6d753e317b Fix more osx warning 2016-06-21 10:51:31 -07:00
Andrew Meadows
31706a3909 force activate kinmatic objects when necessary 2016-06-21 10:38:44 -07:00
samcake
117a39d52a Merge pull request #8103 from SamGondelman/compileShaderFix 
Reduce GLShader::compileShader log spam
 2016-06-21 10:30:05 -07:00
Ryan Huffman
a77dea9048 Fix osx warning 2016-06-21 10:30:05 -07:00
Seth Alves
568987922a Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-06-21 09:56:52 -07:00
Seth Alves
f397c4760f comments 2016-06-21 09:56:39 -07:00
howard-stearns
2ac6dc8798 do not tilt virtual keyboard 2016-06-21 09:48:01 -07:00
Zach Pomerantz
807596596f fix badging, parsing of operating hours 2016-06-21 00:18:38 -07:00
Zach Pomerantz
7fa7abdb1d add operating hours to domain-server settings/UI 2016-06-20 22:58:20 -07:00
Andrew Meadows
f22a5613bd fix static mesh for model with per-mesh transforms 2016-06-20 17:29:20 -07:00
Andrew Meadows
5484b6fbb7 more correct extraction from triangle strips 2016-06-20 17:29:20 -07:00
Andrew Meadows
c0c77e9027 optimize/cleanup compound/mesh shape computation 2016-06-20 17:29:20 -07:00