Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 12:53:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
36896 commits 71 branches 56 tags 1.2 GiB
Commit graph

36896 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
ce1b8ae6f0 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2016-01-04 19:35:36 -08:00
Eric Levin
f569d08ca8 Merge pull request #6761 from imgntn/grab_add_beam 
Add Beam Visualization When Grab Doesn't Intersect
 2016-01-04 15:36:05 -08:00
Brad Davis
125d103e29 Merge pull request #6762 from ZappoMan/hideMirrorAndAudioInHMD 
hide the rear view mirror and the audio in the HMD
 2016-01-04 18:03:33 -05:00
Andrew Meadows
164c649a33 Merge pull request #6681 from howard-stearns/pid-render-limits 
Pid render limits
 2016-01-04 14:47:31 -08:00
Andrew Meadows
d2b757d6ad Merge pull request #6755 from zzmp/fix/optimize-gpu-stream-copy 
Optimize getVertexStream() by using a const&
 2016-01-04 14:31:21 -08:00
Brad Hefta-Gaub
f719f4a1cc hide the rear view mirror and the audio in the HMD 2016-01-04 13:31:01 -08:00
James B. Pollack
29612f2246 Merge pull request #6760 from ericrius1/muzzleFix 
Fix to pistol.js so muzzle flash particle system doesn't stick around…
 2016-01-04 12:53:38 -08:00
Brad Hefta-Gaub
26f0030ca0 Merge pull request #6758 from jherico/vr_keys 
Allow keyboard navigation of the VR/overlay menu
 2016-01-04 12:42:34 -08:00
James B. Pollack
4bb03f8c2d add beam visualization if sphere doesnt actually hit anything 2016-01-04 12:34:08 -08:00
James B. Pollack
0be5725f71 Merge pull request #6744 from ericrius1/raveGlow 
Added glow effect to ravestick
 2016-01-04 11:49:54 -08:00
ericrius1
4360595ed6 Fix to pistol.js so muzzle flash particle system doesn't stick around forever 2016-01-04 11:29:57 -08:00
Howard Stearns
342d3e80bc fix MSVC formatting 2016-01-04 09:49:25 -08:00
Howard Stearns
9c8a04ce1e Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits 2016-01-04 09:26:14 -08:00
Brad Hefta-Gaub
5b177404d5 Merge pull request #6749 from jherico/resource_override 
Allow a script to set a resource override.
 2016-01-04 09:17:38 -08:00
Brad Davis
297e58fbc6 Cleanup 2016-01-03 20:29:31 -08:00
Brad Davis
435ab8c4e8 Fix possible log spam issue 2016-01-03 20:22:55 -08:00
Brad Davis
bfa9213a10 Allow keyboard navigation of 'vr menu' 2016-01-03 20:22:39 -08:00
Brad Davis
3b4f5d36a5 PR feedback 2016-01-03 12:29:32 -08:00
Brad Hefta-Gaub
ec8a2ae093 Merge pull request #6739 from jherico/qml_window 
Support QML and Web content in overlay windows
 2016-01-03 10:18:26 -10:00
Brad Hefta-Gaub
c17e8a6d9e Merge pull request #6753 from jherico/sdl_fix 
Fix SDL breakage due to missing init
 2016-01-03 10:11:19 -10:00
Brad Hefta-Gaub
02835fc960 Merge pull request #6702 from hyperlogic/tony/soft-attachments 
Soft Attachment Support
 2016-01-03 08:46:16 -10:00
Seth Alves
63293d5838 remove commented code 2016-01-03 08:07:31 -08:00
Seth Alves
f5bc58f606 back out off-brand change 2016-01-03 08:00:31 -08:00
Seth Alves
40a25f859a cleanups 2016-01-03 08:00:23 -08:00
Seth Alves
86b551c177 back out off-brand change 2016-01-03 07:33:50 -08:00
Seth Alves
9145a8a753 back out off-brand change 2016-01-03 07:29:24 -08:00
Seth Alves
9f828448a0 add comment 2016-01-03 07:29:14 -08:00
Seth Alves
bfa8cc1969 merge from upstream 2016-01-03 06:47:25 -08:00
Seth Alves
b190b2757e Merge pull request #6751 from hyperlogic/tony/model-entity-item-animation-fix 
ModelEntityItem: Fix for missing pre-rotations for animated models.
 2016-01-01 07:08:24 -08:00
Brad Davis
a0196f0cde Ensure we don't hang if the QML thread doesn't shutdown 2015-12-31 15:23:39 -08:00
Brad Davis
67e32cc1f0 Consolidating URL handling, exposing to all QML objects 2015-12-31 14:14:48 -08:00
Philip Rosedale
60bc023d6e Merge pull request #6754 from PhilipRosedale/master 
Show hand-sphere search line and point just with hand direction again
 2015-12-31 13:53:21 -08:00
Philip Rosedale
85a0dfa21a remove debug line 2015-12-31 13:49:24 -08:00
Philip Rosedale
f4389c3b1f Add head-to-hand mixing ratio, default to zero (hands only) 2015-12-31 13:36:24 -08:00
Brad Davis
462cc325e5 Cleanup, moving some QML objects to OffscreenUI 2015-12-31 12:39:56 -08:00
Philip Rosedale
c18a2fc264 blend 50/50 between head and hands for search 2015-12-31 11:56:37 -08:00
Zach Pomerantz
c6e6aceb85 Optimize getVertexStream() by using a const& 2015-12-31 11:51:05 -08:00
Philip Rosedale
0d4ac4387a Show hand-sphere search line and point just with hand direction again 2015-12-31 11:46:35 -08:00
Brad Davis
7d71a187d8 Fix SDL breakage due to missing init 2015-12-31 08:47:27 -08:00
Brad Davis
a883891197 Expose the username to scripts (and thus QML) 2015-12-30 22:28:16 -08:00
Brad Davis
000130617e Allow input devices to break up their mappings into multiple files 2015-12-30 22:28:10 -08:00
Brad Davis
c77b66f88c Make navigation directions into axes 2015-12-30 22:28:08 -08:00
Brad Davis
3eddf8d4a4 Allow and conditionals to be initialized from simple pairs 2015-12-30 22:24:34 -08:00
Brad Davis
4c26627622 Add navigation actions and wire them up in the standard controller 2015-12-30 17:14:40 -08:00
Brad Davis
a834f28eca Add a tag to the top level QML dialog so loaded content can manipulate it easily 2015-12-30 17:14:03 -08:00
Brad Davis
af132e267f Support a 'nav focus' state to allow joystick / hydra navigation of UI 2015-12-30 17:13:20 -08:00
Brad Davis
e863d4edee Fix SDL breakage due to missing init 2015-12-30 16:48:19 -08:00
Brad Davis
bfe7ab4d94 Allow QML windows to quit the application 2015-12-30 11:39:34 -08:00
Brad Davis
f4bd2afc8e Make script launched windows invisible at creation time 2015-12-30 11:38:34 -08:00
Eric Levin
9276c78368 Merge pull request #6741 from PhilipRosedale/master 
Improved hand controller grab and mouse movement
 2015-12-30 11:10:37 -08:00