Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-17 12:37:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
36800 commits 69 branches 56 tags 1.2 GiB
Commit graph

36800 commits

This branch
This branch
All branches
Author SHA1 Message Date
howard-stearns
a37b9157bc simplify preferences 2016-01-04 15:00:54 -08:00
howard-stearns
333eadd551 Don't show render count / distance when using acuity. 2016-01-04 14:46: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
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
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
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
Anthony J. Thibault
8f71a5fda5 ModelEntityItem: Fix for missing pre-rotations for animated models. 
This should fix the issue with the Kaya and Claire models, while
also not breaking the windmill model in demo.
 2015-12-30 10:17:18 -08:00
Brad Davis
d6f5296c3b Working on event bridge and scripting interfaces 2015-12-30 09:14:50 -08:00
Brad Davis
0901e3aae1 Support QML and Web content in overlay windows 2015-12-30 09:14:49 -08:00
Brad Davis
07531353e4 Allow a script to set a resource override. 2015-12-30 09:06:04 -08:00
Andrew Meadows
a5c19c04e5 Merge pull request #6672 from ctrlaltdavid/fix-nodelist-shutdown 
Don't send a domain-server check in when shutting down
 2015-12-30 08:43:19 -08:00
Andrew Meadows
b83987331b Merge pull request #6725 from huffman/fix-avatar-get-myavatar 
Fix crash when getting MyAvatar.sessionUUID from AvatarManager
 2015-12-30 08:41:52 -08:00
Brad Davis
76eba89f7d Merge pull request #6745 from hyperlogic/tony/neuron-plugin 
Support for Perception Neuron
 2015-12-30 11:39:32 -05:00
Andrew Meadows
ec27c75332 Merge pull request #6660 from hyperlogic/tony/anim-expressions 
AnimExpression: boolean expression parser and evaluator
 2015-12-30 08:36:44 -08:00
Brad Davis
65862bfd02 Merge pull request #6747 from hyperlogic/tony/glmhelpers-tests 
Added tests for GLMHelpers::safeEulerAngles.
 2015-12-30 11:35:17 -05:00
Philip Rosedale
118f919c8b fix merge conflicts 2015-12-30 00:42:14 -08:00
Philip Rosedale
e995b29712 can target without grabbing 2015-12-30 00:36:11 -08:00
Philip Rosedale
6d857296f9 show search sphere instead of beams, start at center of view 2015-12-29 23:37:10 -08:00
Philip Rosedale
54edd94dd2 Merge pull request #6743 from zzmp/fix/skymap-tex-load 
Guard against unloaded skymap tex
 2015-12-29 21:34:48 -08:00
Philip Rosedale
a44a64d9c0 Merge pull request #6748 from ericrius1/gunFix 
Fixing issue with muzzle flash and hit sparks being out of sync for pi…
 2015-12-29 21:31:40 -08:00
James B. Pollack
5caa6cbdbf Update pistol.js 
leading zeroes
 2015-12-29 18:38:57 -08:00
ericrius1
4cc94b44ba muzzle is in sync 2015-12-29 18:30:07 -08:00
ericrius1
1a84b5c0f0 Fixing issue with muzzle flash and hit point being out of sync for pistol 2015-12-29 18:13:34 -08:00
Anthony J. Thibault
f4f4bd44cb SoftAttachmentModel: added a descriptive comment. 2015-12-29 13:28:04 -08:00
Anthony J. Thibault
c2dd00375d Merge branch 'master' into tony/soft-attachments 2015-12-29 13:21:37 -08:00
Eric Levin
f71a4807f7 Merge pull request #6667 from imgntn/light_mod 
Entity Sliders for Changing Spotlight Properties
 2015-12-29 10:58:47 -08:00