Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-13 09:56:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
39431 commits 25 branches 0 tags 1.1 GiB
Commit graph

15832 commits

Author SHA1 Message Date
Howard Stearns
91b0f69312 When the avatar marketplace is chosen from avatar preferences, let it be moveable so that the user can move it aside to see their avatar. 2016-01-26 21:02:16 -08:00
Zach Pomerantz
e770d7b679 Add PhysicsShowOwned back to Menu 2016-01-26 18:56:52 -08:00
Brad Davis
0a6be80578 Added some disabled modal focus protection code 2016-01-26 18:50:55 -08:00
Brad Davis
fbee221966 Fix tool window breaking when visible while edit.js reloads 2016-01-26 18:15:41 -08:00
Brad Davis
9a8d56da77 Center new windows without a defined position 2016-01-26 17:25:36 -08:00
Brad Davis
cea57a111b Desktop cleanup 2016-01-26 16:56:33 -08:00
Brad Davis
8dc066fc00 Fix the recursive launching of load script from URL 2016-01-26 16:49:23 -08:00
Zach Pomerantz
5009e8702e Cleanup new render settings 2016-01-26 15:58:50 -08:00
Seth Alves
1cc0aa18bb Merge branch 'master' of github.com:highfidelity/hifi into avatar-updates-query-cube 2016-01-26 13:31:07 -08:00
Seth Alves
1fefe0fa0e when an avatar moves a child entity around, it has to invoke MovingEntitiesOperator to keep the local octree up-to-date 2016-01-26 13:30:55 -08:00
howard-stearns
e145cf60be cleanup init 2016-01-26 13:01:29 -08:00
Zach Pomerantz
2da2bc60db Tie shadow frustum to boom offset 2016-01-26 12:26:16 -08:00
howard-stearns
2e7f1cbb3f Align avatar animation with LOD visibility. 2016-01-26 11:59:18 -08:00
Anthony J. Thibault
3cee3cbb5a Avatar Developer Menu: added animation debug options 
This options are for for developers only and might help debug animation related issues.

* Enable Inverse Kinematics: this can be toggled to disable IK for the avatar.
* Enable Anim Pre and Post Rotations: this option can be used to use FBX pre-rotations from source avatar animations, instead of the current default, which is to use them from the source model.
  This only effects FBX files loaded by the animation system, it does not affect changing model orientations via JavaScript.
 2016-01-25 18:52:13 -08:00
Zach Pomerantz
bed325d675 Add Graphics to general settings 2016-01-25 15:17:43 -08:00
howard-stearns
cd44094efa When user is asked about disk cache, allow them to say no. 2016-01-25 14:46:11 -08:00
howard-stearns
6928984448 remaining Application message boxes, EXCEPT asset upload, which has a 
checkbox.
 2016-01-25 14:45:26 -08:00
howard-stearns
eb19f293c4 Fix askToSetAvatarUrl dialogs to use new style. 2016-01-25 14:04:06 -08:00
Brad Davis
1c97e15757 Fix overlay message dialog 2016-01-25 13:30:05 -08:00
Zach Pomerantz
29f9d15af0 Remove render engine items from developer menu 2016-01-25 12:14:58 -08:00
Zach Pomerantz
f3265db298 Gut RenderContext 2016-01-25 12:14:58 -08:00
Zach Pomerantz
f5a408d82a Notes for later 2016-01-25 12:14:58 -08:00
Zach Pomerantz
9064438bf0 Replace RenderScriptingInterface with dynamic Task::Config 2016-01-25 12:13:55 -08:00
Zach Pomerantz
2e1fbf66ad Refine Configuration for render::Job 
wip

wip

wip

wip
 2016-01-25 12:13:55 -08:00
Zach Pomerantz
8b68d5922c Make Engine a Task 2016-01-25 12:13:55 -08:00
Brad Davis
7eac917de5 Address bar polish and visibility handler fix 2016-01-24 15:23:37 -08:00
Brad Davis
79e6aaf17f Make tool window closable 2016-01-24 14:25:23 -08:00
Brad Davis
8ed5ea8605 Login dialog polish 2016-01-24 13:32:55 -08:00
Brad Hefta-Gaub
ab133f37a0 Merge pull request #6920 from jherico/preferences4 
Break up preferences into multiple dialogs
 2016-01-24 13:24:25 -08:00
Brad Davis
6e3796963c Window swallows more events, preventing them from reaching the applicaiton. 2016-01-24 12:25:03 -08:00
Brad Davis
19f259b273 Fix url auth issues again 2016-01-24 12:07:39 -08:00
Brad Davis
bbefafcb07 Break up preferences dialogs 2016-01-23 23:11:41 -08:00
Brad Davis
3a0f6993c7 Put QML in front of 2D overlays 2016-01-23 22:07:01 -08:00
Brad Davis
8e57f06de2 Add browser action shortcut to our custom desktop 2016-01-23 22:06:59 -08:00
Brad Davis
12cc873716 Hide focus debugger unless it's explicitly turned on 2016-01-23 22:06:58 -08:00
Brad Davis
5fc43e7018 Render scalable favicons at a fixed size 2016-01-23 22:06:14 -08:00
Brad Davis
e52e35df8c Better initial window positioning 2016-01-23 22:06:13 -08:00
Brad Davis
159794cafd Stop address bar stealing keyboard focus 2016-01-23 22:05:01 -08:00
Brad Davis
d70faf5985 Fix running scripts filter initial state 2016-01-23 22:03:24 -08:00
Brad Davis
5fde166a38 Fix menu Z-order 2016-01-23 22:03:24 -08:00
Brad Davis
0e0fcdae74 fixing accidental commit of leap motion disabling. 2016-01-22 20:27:23 -08:00
Brad Davis
208d7c3cfc Killing the old preferences dialog 2016-01-22 19:24:38 -08:00
Brad Davis
71ae36f5c0 Button prefs and conditionally enabled prefs 2016-01-22 19:06:30 -08:00
Brad Davis
858bbbf987 Adding OffscreenUI API for QInputDialog functionality 2016-01-22 17:31:03 -08:00
Brad Davis
27fdb523cb Add directory & avatar browsing preferences 2016-01-22 17:30:10 -08:00
Brad Davis
c7186590ea Support for directory browsing 2016-01-22 17:30:09 -08:00
Brad Davis
2026821d9e Moving preferences to dependency mananger 2016-01-22 17:30:08 -08:00
Brad Davis
205ab05506 First pass on preferences dialog 
Conflicts:
	tests/ui/qmlscratch.pro
 2016-01-22 17:30:07 -08:00
Brad Hefta-Gaub
0c64d45c18 Merge pull request #6909 from hyperlogic/tony/fly 
MyAvatar: fly animation
 2016-01-22 17:04:53 -08:00
samcake
338342cdec Merge pull request #6859 from zzmp/flag/shadows 
Add shadows behind a render-menu flag
 2016-01-22 16:28:17 -08:00
Andrew Meadows
86162094c1 Merge pull request #6895 from hyperlogic/tony/hmd-recenter-on-rotation 
MyAvatar: Recenter when the head turns away from the hips
 2016-01-22 14:07:40 -08:00
Andrew Meadows
200676ac68 Merge pull request #6896 from AndrewMeadows/another-crash-fix 
fix crash when deleting entities quickly
 2016-01-22 14:04:46 -08:00
Anthony J. Thibault
7af20e90c8 Hooked up fly animation to json and Rig 2016-01-22 13:47:09 -08:00
Anthony J. Thibault
8bfa80d5fc Merge remote-tracking branch 'upstream/master' into tony/hmd-recenter-on-rotation 2016-01-22 13:37:43 -08:00
Anthony J. Thibault
61b760038a Address feedback from code review 2016-01-22 11:54:28 -08:00
Seth Alves
b6af8ee0cc Merge branch 'master' of github.com:highfidelity/hifi into avatar-updates-query-cube 2016-01-22 11:46:17 -08:00
Seth Alves
7a3401a8d7 Merge pull request #6867 from AndrewMeadows/collision-group-prep 
cleanup in preparation for smarter collision grouping
 2016-01-22 11:45:42 -08:00
Howard Stearns
9cec0e655b Remove obsolete reference to text chat within "about" text. 2016-01-22 10:45:04 -08:00
Andrew Meadows
d8fb61e820 fix crash when deleting entities quickly 2016-01-22 10:25:10 -08:00
Zach Pomerantz
dee8e0ba9d Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows 2016-01-22 10:03:06 -08:00
Brad Davis
f343598d91 Focus hack for menu fix 2016-01-22 00:55:32 -08:00
Brad Davis
3d46eda165 Frame construction in onCompleted was messing up the browser keyboard focus 2016-01-22 00:55:31 -08:00
Brad Hefta-Gaub
e1c369dc10 Merge pull request #6766 from samcake/hdr 
Ambient Occlusion
 2016-01-21 18:10:52 -08:00
Brad Hefta-Gaub
7bfe2730e8 Merge pull request #6849 from jherico/atmosphere 
Remove old atmosphere rendering
 2016-01-21 17:58:59 -08:00
Anthony J. Thibault
a91c181a89 MyAvatar: Recenter when the head turns away from the hips 
Compute HMD facing moving average.
When the moving average diverges from the hips by more then 45 degrees, recenter the body.

Also, the follow code has been changed, instead of a follow velocity being passed to the CharacterController
a desired target is passed.  The CharacterController homes toward it's target based on the time remaining.
Any follow deltas applied to move the avatar's position closer to it's target is stored and re-applied
to the bodySensorMatrix.  This centralizes the moving/homing code to one place, the CharacterContoller.

A new FollowHelper class was also introduced, it groups together the data and logic necessary to perform the
re-centering/follow procedure.  This "hopefully" makes it easier to maintain.
 2016-01-21 16:38:42 -08:00
samcake
2471a88e85 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-21 15:53:25 -08:00
Seth Alves
2e1727610e MyAvatar updates the entity-server about queryAACubes of children entities 2016-01-21 15:52:59 -08:00
Brad Davis
f9f9ddd8bd Yet more atmosphere removal 2016-01-21 15:15:17 -08:00
Brad Davis
b8109af196 Ignite the atmosphere 2016-01-21 15:15:15 -08:00
Atlante45
db18d188b8 Fix wifi ping spikes 
Moves the setting of Qt's bearer poll timeout earlier to be sure
it's caught.
 2016-01-21 15:05:32 -08:00
Leonardo Murillo
098b7a4ff3 Merge pull request #6870 from birarda/console 
Your Stack Manager is now a Server Console
 2016-01-21 14:31:34 -06:00
Stephen Birarda
b1c151b165 remove dead code in main.cpp 2016-01-21 11:04:39 -08:00
Andrew Meadows
58a7528b68 Merge pull request #6854 from sethalves/access-avatar-parent-id-from-js 
Access avatar parent information from js
 2016-01-21 09:19:40 -08:00
David Rowe
d7d4961778 Wire up missing GlobalServices.connected() signal 2016-01-21 20:58:14 +13:00
Brad Hefta-Gaub
7919d7bc17 Merge pull request #6866 from jherico/menufix 
Fixing overlay menu popup & some more QML cleanup
 2016-01-20 16:58:21 -08:00
samcake
4e5869b247 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-20 16:30:24 -08:00
Zach Pomerantz
0c798c06a9 Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows 2016-01-20 14:51:42 -08:00
samcake
0da4df93b8 Merge pull request #6860 from zzmp/refactor/cull-functor 
Refactor ShouldRenderFunctor to be out of RenderArgs
Tested on windows, checking the values returned by the culling/visible/too small
Looks good
 2016-01-20 14:25:42 -08:00
Brad Davis
d2900200a1 More cleanup & menu fixing 2016-01-20 11:23:56 -08:00
samcake
320c799379 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-20 10:14:02 -08:00
Brad Hefta-Gaub
4ea5c11b73 Merge pull request #6862 from ctrlaltdavid/20783 
Make running scripts list scrollable with scroll bar
 2016-01-19 23:29:37 -08:00
Brad Davis
d97f930dc9 Prevent update dialog from becoming locked 2016-01-19 22:33:00 -08:00
Andrew Meadows
a92c512c17 move collision group/mask calculus into EntityItem 2016-01-19 19:52:08 -08:00
Howard Stearns
730640068c Merge pull request #6865 from ZappoMan/fixPrematureQuery 
fix premature octree query before preferences are loaded
 2016-01-19 19:32:34 -08:00
Stephen Birarda
8bc063e758 Merge branch 'master' of https://github.com/highfidelity/hifi into console 2016-01-19 16:21:19 -08:00
Stephen Birarda
b233f2710e call fixup_interface only on OS X 2016-01-19 16:04:43 -08:00
Seth Alves
09dd3e2a56 merge from upstream, respond to code review 2016-01-19 14:38:22 -08:00
Brad Hefta-Gaub
bcdff7ba4a fix premature octree query before preferences are loaded 2016-01-19 13:11:11 -08:00
samcake
c5c3f464cd Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-19 12:13:11 -08:00
Andrew Meadows
feb2a82d93 Merge pull request #6856 from hyperlogic/tony/hand-grab-one-frame-lag-fix 
Avatar: Fix for one frame lag in hold action
 2016-01-19 11:43:27 -08:00
Zach Pomerantz
568ae2e7bc Move ShoudRenderFunctor to render::CullFunctor 2016-01-19 11:24:11 -08:00
Anthony J. Thibault
b750128c94 Avatar: centeralized palm rotation/position to world space calculation. 2016-01-19 11:03:00 -08:00
James B. Pollack
347293a6a4 Merge pull request #6858 from ctrlaltdavid/20780 
Make filter in Running Scripts window be case-insensitive
 2016-01-19 10:51:42 -08:00
Brad Hefta-Gaub
fca5b29e6f Merge pull request #6786 from AlessandroSigna/overlays 
Thread-safe access to EntityTree in OverlayPanel
 2016-01-19 09:02:45 -08:00
David Rowe
9393735478 Make running scripts list scrollable with scroll bar 2016-01-19 20:25:16 +13:00
Anthony J. Thibault
ec2f8db83a Avatar: Fix for one frame lag in hold action 
AvatarActionHold now uses the most recent un-cached palm positions/orientations
instead of the cached version from the previous frame.
 2016-01-18 17:37:28 -08:00
Zach Pomerantz
1b36d56b7a Add shadowmap as a debug feature 2016-01-18 17:12:42 -08:00
samcake
df496b065c Merging with master 2016-01-18 16:40:34 -08:00
samcake
29945bba92 Merge pull request #6837 from zzmp/feat/render-shadow 
Add RenderShadowTask
 2016-01-18 15:45:51 -08:00
Howard Stearns
6f84a67453 Merge pull request #6840 from jherico/qml_cleanup 
File dialogs and modal message boxes in QML
 2016-01-18 15:04:37 -08:00
Seth Alves
af10fd3b36 Merge branch 'master' of github.com:highfidelity/hifi into access-avatar-parent-id-from-js 2016-01-18 14:39:15 -08:00
Howard Stearns
5caf10beed Merge pull request #6848 from ZappoMan/entityServerSideSizeCheck 
Include checking the angular size of entities on the server side for LOD support
 2016-01-18 14:13:34 -08:00
samcake
93c7c182b3 Exposing the gpu RangeTimer counter for the AO effect 2016-01-18 14:10:59 -08:00
Seth Alves
41c46423ba add support for avatar set/get parent Joint Index, as well 2016-01-18 13:09:09 -08:00
Seth Alves
5ee1acc1ea expose avatar getParentID and setParentID to javascript 2016-01-18 12:45:12 -08:00
Brad Hefta-Gaub
d10e1cc39d CR feedback, dead code cleanup 2016-01-18 12:09:21 -08:00
Brad Hefta-Gaub
88af387214 cleanup 2016-01-18 10:10:24 -08:00
Brad Hefta-Gaub
2774df38bc check for entity size before including it for LOD 2016-01-18 09:06:57 -08:00
Brad Davis
5aa8398adb Working on keyboard focus issues 2016-01-17 20:56:07 -08:00
Brad Davis
cf8d2c5182 Integrate file open dialog into running scripts dialog 2016-01-15 23:53:37 -08:00
Brad Davis
746c388f7a Cleanup of QML windowing and message boxes 2016-01-15 23:14:49 -08:00
David Rowe
0b71f1e1b8 Make filter in Running Scripts window be case-insensitive 2016-01-16 16:29:01 +13:00
Stephen Birarda
cf5b6198fd use install command to manually place ssleay library 2016-01-15 15:41:34 -08:00
Stephen Birarda
05e48528bd make sure SSL_EAY_LIBRARY_* is set when used 2016-01-15 15:41:34 -08:00
Stephen Birarda
c1a9a7f4c1 add ssleay copy for win AC/DS/Interface 2016-01-15 15:41:34 -08:00
Stephen Birarda
59b4c2545f remove DDE as component of installer 2016-01-15 15:41:34 -08:00
Stephen Birarda
c83ac2171c fix for reference to interface filename 2016-01-15 15:41:34 -08:00
Stephen Birarda
876d36c2d3 install scripts beside interface executable 2016-01-15 15:41:34 -08:00
Stephen Birarda
0b118a8e98 replace ApplicationVersion with BuildInfo 2016-01-15 15:41:34 -08:00
Stephen Birarda
d14c8cf9cc add signing of DS and AC executable 2016-01-15 15:41:34 -08:00
Stephen Birarda
9aa5d017d6 add optional signing of interface executable 2016-01-15 15:41:34 -08:00
Stephen Birarda
3a9ac7d4ac remove macro to consolidate installer components 2016-01-15 15:41:34 -08:00
Stephen Birarda
6a503f3db0 remove icon as source to interface executable 2016-01-15 15:41:34 -08:00
Stephen Birarda
ae67da4bcb use absolute path to interface icon 2016-01-15 15:41:34 -08:00
Stephen Birarda
301124ba3c fix reference to rc template and icon prefix 2016-01-15 15:41:34 -08:00
Stephen Birarda
f8f0b99a46 add icon to interface exec, icons in start menu 2016-01-15 15:41:34 -08:00
Stephen Birarda
8662fd0afb use correct dde install path for win 2016-01-15 15:41:34 -08:00
Stephen Birarda
fcd9d9b810 setup optional dde archive for windows 2016-01-15 15:41:34 -08:00
Stephen Birarda
8842c66109 include trailing slash in windows file copy 2016-01-15 15:41:34 -08:00
Stephen Birarda
1faa78fe72 install fixed up DS and AC beside console 2016-01-15 15:41:34 -08:00
Stephen Birarda
aa9e9836b4 repair another committed conflict 2016-01-15 15:41:34 -08:00
Stephen Birarda
6db36a3863 remove accidentally committed conflict 2016-01-15 15:41:34 -08:00
Stephen Birarda
3b3140de48 exclude console build from all by default 2016-01-15 15:41:34 -08:00
Stephen Birarda
acdd0bda2e use external project hack on win only 2016-01-15 15:41:34 -08:00
Stephen Birarda
275fa1c5c7 fix for override warnings with clang on OS X 2016-01-15 15:41:34 -08:00
Stephen Birarda
dedb7e2778 bury components in a shell application inside the server-console 2016-01-15 15:41:34 -08:00
Stephen Birarda
55886d43f5 add DDE component as downloadable optional 2016-01-15 15:41:34 -08:00
Stephen Birarda
4f00982724 remove extraneous add dependency for FIXUP_LIB 2016-01-15 15:41:34 -08:00
Stephen Birarda
817d651c47 add initial fixup install commands for interface 2016-01-15 15:41:34 -08:00
Stephen Birarda
e3ef18ae6e customize Interface output name for PR/dev/prod 2016-01-15 15:41:34 -08:00
Stephen Birarda
f87d8885f4 rename interface bundle for production and pr build 2016-01-15 15:41:34 -08:00
Stephen Birarda
d491a7f0e5 work around OS X package installer relocation 2016-01-15 15:41:34 -08:00
Stephen Birarda
92064fe507 generate a componentized server/client installer 2016-01-15 15:41:34 -08:00
Stephen Birarda
0463e008cf base cpack configuaration using install commands 2016-01-15 15:41:34 -08:00
Andrew Meadows
8b420adbc8 namechange MotionType to PhysicsMotionType 2016-01-15 15:21:25 -08:00
samcake
2494623bc7 Cleaning the code for review 2016-01-15 10:55:43 -08:00
Ryan Huffman
0f2b9744d1 Merge branch 'console' of github.com:birarda/hifi into console-logging 2016-01-15 10:46:22 -08:00
Philip Rosedale
0ec754cf5f Merge pull request #6839 from hyperlogic/tony/squeeze-hands-part-deux 
Updated animations for left hand grasp
 2016-01-14 16:57:46 -08:00
Brad Hefta-Gaub
a70adc8a57 Merge pull request #6823 from jherico/tool_window 
Tool window in QML
 2016-01-14 16:56:27 -08:00
Brad Davis
98df0d8fcc Merge pull request #6836 from ZappoMan/menuGroups 
wire up audio show level meter menu
 2016-01-14 19:27:47 -05:00
Anthony J. Thibault
90516d95f2 Updated animations for left hand grasp 2016-01-14 16:22:58 -08:00
Philip Rosedale
a8d13cb947 Merge pull request #6831 from hyperlogic/tony/squeeze-hands-part-deux 
Simplify grab animation logic
 2016-01-14 15:49:00 -08:00
Brad Davis
e76e13c05c Removing close button on tool window, fixing dragging 2016-01-14 14:20:31 -08:00
Brad Hefta-Gaub
0ad39feeb6 juggle developer menus a bit 2016-01-14 13:31:01 -08:00
Brad Hefta-Gaub
2177765b09 wire up audio show level meter menu 2016-01-14 13:12:16 -08:00
Anthony J. Thibault
51d678670d Updated grab animations for right hand 2016-01-14 12:57:30 -08:00
Ryan Huffman
fe4c161cb6 Fix sending URL to second interface instance 2016-01-14 12:47:36 -08:00
Ryan Huffman
196161fe93 Merge pull request #66 from birarda/console-dev 
some initial packaging work and console fixes
 2016-01-14 10:17:24 -08:00
Brad Davis
d924e042bc Merge pull request #6834 from ZappoMan/hmdFixes 
fix issues with HMD lookout 2D, and cleanup
 2016-01-14 12:42:23 -05:00
Anthony J. Thibault
c267d672d2 Updated hand grab animations 
Left hand is old squeeze hands poses
Right hand is new hydra grasp poses
 2016-01-14 08:57:27 -08:00
Brad Hefta-Gaub
6b76cf484d fix issues with HMD lookout 2D, and cleanup 2016-01-14 08:48:55 -08:00
Andrew Meadows
82e261480f Merge pull request #6827 from howard-stearns/physics-timing 
Physics timing
 2016-01-14 08:39:29 -08:00
Brad Hefta-Gaub
8f8afabbfe Merge pull request #6811 from Atlante45/master 
Fix skybox not always rendering correctly
 2016-01-13 21:00:48 -08:00
Anthony J. Thibault
75b3523c33 Simplify grab animation logic 
Moved all animation control out of the handControllerGrab.js script and back into
squeezeHands.js

Deleted old hydra/squeezeHands.js to avoid confusion.

Added new sqeezeHands.js script to the default scripts.
 2016-01-13 17:57:51 -08:00
Zach Pomerantz
2938829167 Add shadow items to stats 2016-01-13 17:49:37 -08:00
Brad Davis
b6272b7824 Migrate tool window to overlay/QML 2016-01-13 15:40:37 -08:00
howard-stearns
830dcb582a Merge branch 'master' of https://github.com/highfidelity/hifi into physics-timing 2016-01-13 13:32:38 -08:00
howard-stearns
8a77e2ee95 Split physics perf timing into three parts: updateStates, stepSimulation, 
and harvestChanges.
 2016-01-13 13:31:37 -08:00
Atlante45
205c14eb43 Remove unused headers 2016-01-13 11:47:43 -08:00
Atlante45
11dc3cd261 Move primitive rendering out of DeferredLightingEffect 2016-01-13 11:47:43 -08:00
Atlante45
12f9091dc1 Fix doInBatch lambdas 2016-01-13 11:47:43 -08:00
Atlante45
0008b1a055 Code cleanup 2016-01-12 20:49:25 -08:00
Andrew Meadows
e1ba4ff0a8 add CollisionMask entity property 2016-01-12 15:08:52 -08:00
Brad Hefta-Gaub
cd167e43fb Merge pull request #6812 from jherico/running_scripts 
Running scripts in QML
 2016-01-12 13:40:47 -08:00
Brad Davis
e7bfcba44f Fix 'load' button 2016-01-12 13:17:06 -08:00
Brad Davis
2ed54d8ea7 Cleanup running scripts 2016-01-12 13:11:03 -08:00
Howard Stearns
d1a72e8d63 Merge pull request #6807 from hyperlogic/tony/grab-script-hand-animation 
Move hand animation control into grab script
 2016-01-12 13:02:59 -08:00
Brad Davis
dcc6739bce Final functionality for running scripts 2016-01-12 12:40:46 -08:00
Brad Davis
a9eb5b8229 Load script from file 2016-01-12 12:40:45 -08:00
Brad Davis
4f975de6a6 Working on crash fixes, file open dialog 2016-01-12 12:40:43 -08:00
Brad Davis
21534cbde0 Layout for running scripts 2016-01-12 12:40:42 -08:00
Anthony J. Thibault
fee6bda721 Updated hand animation references. 2016-01-12 12:18:26 -08:00
Brad Hefta-Gaub
4c98c3a7a5 Merge pull request #6815 from ctrlaltdavid/20773 
Resume Interface in 1st person if exit in 1st person
 2016-01-12 12:05:12 -08:00
Brad Hefta-Gaub
8619be28ef Merge pull request #6816 from ctrlaltdavid/20772 
Don't use cache when use load script "from Disk" button
 2016-01-12 11:46:41 -08:00
Brad Hefta-Gaub
5b9607ca29 fix merge 2016-01-12 10:36:59 -08:00
Brad Hefta-Gaub
6ac9b737d2 Merge branch 'master' of https://github.com/highfidelity/hifi into fixCrashRedux 
Conflicts:
	interface/src/Application.cpp
 2016-01-12 10:35:24 -08:00
Brad Hefta-Gaub
5ec5ff9ad0 temporary fix to crash on startup 2016-01-12 09:11:20 -08:00
David Rowe
71ed8d2a64 Change camera to first person if start up with it in camera entity mode 
Same as happens if start up with camera in independent mode.
 2016-01-12 17:39:39 +13:00
David Rowe
92d63c48dd Resume Interface in 1st person if exited in 1st person 2016-01-12 17:38:16 +13:00
David Rowe
74515f9089 Don't use cache when user loads script from disk 2016-01-12 16:09:40 +13:00
Anthony J. Thibault
b44ae3a197 avatar-animation.json: Updated right hand grasp animations 2016-01-11 16:55:45 -08:00
Zach Pomerantz
801dde7950 Merge branch 'master' of github.com:highfidelity/hifi into feat/render-shape 2016-01-11 16:38:04 -08:00
Brad Davis
d1d178787c PR comments 2016-01-11 12:55:23 -08:00
Brad Davis
d28f80aa07 Moving running scripts functionality to scripting library 2016-01-11 12:44:03 -08:00
Brad Hefta-Gaub
dfba05ae5f CR feedback 2016-01-11 11:07:07 -08:00
Anthony J. Thibault
8f78a0624c Merge branch 'master' into tony/grab-script-hand-animation 2016-01-11 10:16:51 -08:00
Brad Hefta-Gaub
3e05d95478 Merge branch 'master' of https://github.com/highfidelity/hifi into menuGroups 2016-01-11 09:09:37 -08:00
David Rowe
9068d55998 Fix display of File > About Interface window 2016-01-11 15:58:00 +13:00
Brad Davis
d74686474a Ensure VR menus never render off the overlay 2016-01-10 11:39:47 -08:00
Anthony J. Thibault
8e915733f0 added place holder right hand open/searching animation 2016-01-08 17:15:18 -08:00
Zach Pomerantz
c8d3342aca Merge branch 'master' of github.com:highfidelity/hifi into feat/render-shape 2016-01-08 17:04:02 -08:00
Brad Hefta-Gaub
e2a3903def add support for advanced/developer plugins and change diplay modes to match spec 2016-01-08 16:58:25 -08:00
Brad Hefta-Gaub
e70be2d8fe more menu rework 2016-01-08 11:58:13 -08:00
Brad Hefta-Gaub
0f52b82c21 allow scripted addMenu() to specify grouping 2016-01-08 11:21:37 -08:00
Anthony J. Thibault
cac19b8579 grab animation work 
Hand animations now have 5 states:

* idle
* open
* grasp
* point
* farGrasp

The handControllerGrab.js script now chooses one of these five animations, based on the state of the HandController object.

Also, removed hand trigger AnimVar setting from C++ Rig class.
 2016-01-07 19:36:57 -08:00
Anthony J. Thibault
c2736cb68c Merge branch 'master' into tony/grab-script-hand-animation 2016-01-07 16:58:10 -08:00
Seth Alves
8e199e0457 Merge pull request #6794 from hyperlogic/tony/soft-avatar-attachment-script 
Added avatarAttachmentTest.js script
 2016-01-07 16:41:41 -08:00
Anthony J. Thibault
7bef1ebdac Merge remote-tracking branch 'upstream/master' into tony/soft-avatar-attachment-script 2016-01-07 16:14:52 -08:00
Anthony J. Thibault
031f59b7b5 Support for adding soft attachments from script. 
Also, bug fixes for setting MyAvatar.attachmentData property.
 2016-01-07 16:12:36 -08:00
Stephen Birarda
404fb2f781 Merge branch 'master' of https://github.com/highfidelity/hifi into console 2016-01-07 16:02:32 -08:00
Brad Davis
35e17b7604 movable audio bar 2016-01-07 15:43:51 -08:00
Brad Davis
3a7ec33d38 Merge pull request #6790 from ZappoMan/menuGroups 
Menu restructuring
 2016-01-07 17:48:20 -05:00
Brad Hefta-Gaub
45b85735d3 disable the not yet implemented menu items 2016-01-07 14:37:42 -08:00
Brad Hefta-Gaub
e9ec561a55 add separator in View menu 2016-01-07 14:28:44 -08:00
Brad Hefta-Gaub
cdc982c6e5 mini mirror off by default 2016-01-07 14:22:20 -08:00
Brad Hefta-Gaub
a8383238e4 make mini mirror a standard option 2016-01-07 13:46:55 -08:00
Philip Rosedale
c5ab29071e Merge pull request #6791 from jherico/qml_hang 
Stop QML hanging the app on shutdown
 2016-01-07 13:29:47 -08:00
Brad Hefta-Gaub
04a5f5ce1b remove dead code for friends, since its handled by users.js 2016-01-07 13:26:03 -08:00
Philip Rosedale
3e8f26d591 Merge pull request #6789 from jherico/url_loop 
Stop looping on URL fixing
 2016-01-07 13:10:54 -08:00
Brad Hefta-Gaub
d51f514281 reworking of view/camera mode to match spec 2016-01-07 12:42:18 -08:00
Brad Davis
660304a0a3 Stop QML hanging the app on shutdown 2016-01-07 12:25:25 -08:00
Brad Hefta-Gaub
1508a637ab Menu restructuring 2016-01-07 12:09:02 -08:00
AlessandroSigna
eaa67a41dd Following coding standard 2016-01-07 11:09:27 -08:00
AlessandroSigna
18390c87da handling NULL pointer 2016-01-07 11:09:26 -08:00
AlessandroSigna
7b74f7407a Threadsafe access to EntityTree in OverlayPanel 2016-01-07 11:09:25 -08:00
Seth Alves
bc538a0f7d Merge pull request #6756 from AndrewMeadows/physics-cleanup-003 
more correct management of MotionState pointers
 2016-01-07 11:04:28 -08:00
Andrew Meadows
8ae1e750ab Merge pull request #6783 from sethalves/fix-h0ld-action 
try harder to ensure that a held object is active in bullet
 2016-01-07 10:53:55 -08:00
Brad Davis
144af19ebd Stop looping on URL fixing 2016-01-07 10:52:28 -08:00
Andrew Meadows
36e19b43c9 add some comments; specify const and overrides 2016-01-07 10:19:46 -08:00
Andrew Meadows
c1206ca73d fix bad merge 2016-01-07 10:19:46 -08:00
Andrew Meadows
e0ec941476 fix typo 2016-01-07 10:19:46 -08:00
Andrew Meadows
6a642bdcf8 fix misusage of smart-pointers 2016-01-07 10:19:46 -08:00
Andrew Meadows
6eb177091b overhaul of MotionState cleanup 
Moved MotionState deletes out of PhysicsEngine.
EntityMotionStates are deleted by the PhysicsEntitySimulation.
AvatarMotionStates are deleted in the Avatar dtor.
 2016-01-07 10:19:46 -08:00
Andrew Meadows
534bfa5983 remove dangling whitespace 2016-01-07 10:19:46 -08:00
Brad Hefta-Gaub
a78d5274e7 Merge pull request #6780 from jherico/z_order 
Address some z-ordering issues in overlay windows
 2016-01-06 20:08:52 -08:00
Atlante45
e59397a97a Merge branch 'master' of https://github.com/highfidelity/hifi into fix/skybox 2016-01-06 18:56:58 -08:00
Clément Brisset
447f2f6361 Merge pull request #6785 from ZappoMan/fixWarnings 
fix warnings
 2016-01-06 18:56:26 -08:00
Anthony J. Thibault
dfc3f02db3 avatar-animation.json: Removed point outro state. 
Also replaced right hand point with force grab animation.
 2016-01-06 18:15:32 -08:00
Atlante45
3effa9d5e1 Fix skybox rendering 2016-01-06 17:03:29 -08:00
Anthony J. Thibault
1251be1b2b Merge branch 'master' into tony/grab-script-hand-animation 2016-01-06 16:26:56 -08:00
Brad Hefta-Gaub
335ab3c501 fix warnings 2016-01-06 15:24:52 -08:00
Seth Alves
b873d92469 try harder to ensure that a held object is active in bullet 2016-01-06 14:12:58 -08:00
Andrew Meadows
b8b113844f reduced avatar max fly speed from 300 to 30 2016-01-06 11:22:58 -08:00
Brad Davis
44b9bc7115 Force active focus on the address bar line while address bar is visible 2016-01-06 11:10:05 -08:00
Brad Davis
1b82200ecb Address some z-ordering issues in overlay windows 2016-01-06 10:58:56 -08:00
Anthony J. Thibault
3e6ff0eb68 Moved hand animation control into grab script. 2016-01-05 19:56:56 -08:00
Anthony Thibault
95f821d61a Merge pull request #6732 from sethalves/set-model-entity-joints 
hook up a way for scripts to set model-entity joint state
 2016-01-05 17:31:18 -08:00
Zach Pomerantz
444a014252 Delay renderEngine init for GLBackend init 2016-01-05 17:20:08 -08:00
Andrew Meadows
9ab5ef358a remove dangling whitespace 2016-01-05 16:44:36 -08:00
Seth Alves
b59934573a Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2016-01-05 13:50:12 -08:00
Brad Hefta-Gaub
c2f2f950fb Merge pull request #6673 from hyperlogic/tony/get-palm-thread-safe 
Make Avatar palm position/rotation accessors thread safe
 2016-01-05 13:07:47 -08:00
Brad Davis
908c1072ce Merge pull request #6763 from ZappoMan/scriptMessageBoxesOffscreen 
move alert and confirm to use offscreen ui
 2016-01-05 15:26:48 -05:00
Seth Alves
b222c12857 unmangle merge 2016-01-05 12:21:50 -08:00
Seth Alves
cd82383d33 Merge branch 'master' of github.com:highfidelity/hifi into improve-grab-action-reliability 2016-01-05 11:13:38 -08:00
Anthony J. Thibault
a21b604746 Simplified implementation of ThreadSafeValueCache 2016-01-05 11:08:08 -08:00
Andrew Meadows
0473891e86 Merge pull request #6671 from sethalves/near-grab-via-parenting 
queryAACube plumbing
 2016-01-05 11:01:28 -08:00
Andrew Meadows
62688d5c07 Merge pull request #6768 from jherico/vr_keys 
Tweaks for supporting the new QML UI
 2016-01-05 10:31:57 -08:00
Seth Alves
212d2d9e8f merge from upstream 2016-01-05 10:27:45 -08:00
Howard Stearns
5f85e0a4c0 Merge pull request #6769 from hyperlogic/tony/marketplace-avatar-attachment-support 
Interface support for avatar attachments from Marketplace
 2016-01-05 10:17:33 -08:00
Brad Hefta-Gaub
927fe97359 migrate callers of QMessageBox::warning() to OffscreenUi::warning() 2016-01-05 10:17:16 -08:00
Andrew Meadows
43d8c14c16 Merge pull request #6767 from howard-stearns/pid-render-limits 
render limits fixes
 2016-01-05 10:17:04 -08:00
Anthony J. Thibault
9ea6079c64 Merge branch 'master' into tony/get-palm-thread-safe 2016-01-05 10:16:52 -08:00
Brad Hefta-Gaub
d98c2d1413 migrate callers of QMessageBox::question() to OffscreenUi::question() 2016-01-05 09:39:39 -08:00
Brad Davis
900a0f7f08 Trigger selection is too twitchy 2016-01-05 09:16:44 -08:00
Brad Davis
4b6f58dcab Restoring code commented out for debugging 2016-01-04 20:51:52 -08:00
Brad Davis
8485c89a0e More work on exposing tools to QML overlay windows 2016-01-04 20:51:52 -08:00
Brad Davis
56ee48a084 Working on focus problems 2016-01-04 20:51:51 -08:00
Brad Davis
e6b59cb0a1 Make it easier for QML dialogs to access the global menu, manipulate the overlay desktop 2016-01-04 20:51:50 -08:00
Brad Davis
41dcc3d52b QML dialogs should not consume key events when disabled 2016-01-04 20:51:49 -08:00
Seth Alves
ce1b8ae6f0 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2016-01-04 19:35:36 -08:00
Anthony J. Thibault
bac6570655 Interface support for avatar attachments from Marketplace 
Drag and drop support of ava.json files is also supported and
at the moment the only way to test.

To test:

1. Create a cowboyhat.ava.json file on your hard-drive, with the following contents:
    {
        "version": "0.1",
        "name": "Cowboy Hat",
        "modelUrl": "https://s3.amazonaws.com/hifi-public/tony/cowboy-hat.fbx",
        "jointName": "Head",
        "transform": {
            "rotation": {"x": 0, "y": 0, "z": 0, "w": 1},
            "translation": {"x": 0, "y": 0, "z": 0},
            "scale": {"x": 1, "y": 1, "z": 1}
        },
        "isSoft": false
    }
2. Create a leatherjacket.ava.json file, with the following contents:
    {
        "version": "0.1",
        "name": "Leather Jacket",
        "modelUrl": "https://hifi-content.s3.amazonaws.com/ozan/dev/clothes/coat/coat_rig.fbx",
        "isSoft": true
    }
3. Run interface
4. Drag-and-Drop cowboyhat.ava.json onto the main Interface window.
5. You should be prompted wear the 'Cowboy Hat' attachment.
6. If you select 'Yes', the cowboy hat should appear on the avatar.
7. Do the same with leatherjacket.ava.json file.
 2016-01-04 17:50:45 -08:00
Stephen Birarda
8dc074c0a3 fix stars file discovery without full binary dir include 2016-01-04 15:52:06 -08:00
Stephen Birarda
184bae2561 undo change to Stars headers 2016-01-04 15:41:31 -08:00
Stephen Birarda
7304e695b3 resolve conflicts on merge with upstream/master 2016-01-04 15:40:16 -08:00
Stephen Birarda
508a5c74a2 include application version to interface 2016-01-04 15:35:22 -08:00
howard-stearns
715826cc0d Full speed (no more half speed), and fix shouldRender for objects larger 
than their distance.
 2016-01-04 15:12:14 -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
howard-stearns
a37b9157bc simplify preferences 2016-01-04 15:00:54 -08: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
howard-stearns
333eadd551 Don't show render count / distance when using acuity. 2016-01-04 14:46:57 -08:00
Brad Hefta-Gaub
2b5956af99 move alert and confirm to use offscreen ui 2016-01-04 13:57:36 -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
Stephen Birarda
efa0813ae9 Merge remote-tracking branch 'origin/console' into console-dev 2016-01-04 13:18:27 -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
Ryan Huffman
471c555bca Add shared memory back into main.cpp 2016-01-04 11:58:56 -08:00
Stephen Birarda
b3e46d1ed8 some macro renaming and cleanup 2016-01-04 10:26:37 -08:00
Stephen Birarda
02069bfcd2 Merge remote-tracking branch 'leo/master' into console 2016-01-04 09:57:55 -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 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
02835fc960 Merge pull request #6702 from hyperlogic/tony/soft-attachments 
Soft Attachment Support
 2016-01-03 08:46:16 -10:00
Seth Alves
86b551c177 back out off-brand change 2016-01-03 07:33:50 -08:00
Seth Alves
5d0604b8d3 activateBody doesn't help if called from inside the action callback, because the callback isn't called on inactive bodies. call it from the setup routine, instead 2016-01-03 07:33:10 -08:00
Seth Alves
bfa8cc1969 merge from upstream 2016-01-03 06:47:25 -08:00
Brad Davis
67e32cc1f0 Consolidating URL handling, exposing to all QML objects 2015-12-31 14:14:48 -08:00
Brad Davis
462cc325e5 Cleanup, moving some QML objects to OffscreenUI 2015-12-31 12:39:56 -08:00
Leonardo Murillo
379cdf1d5d Merge branch 'master' of github.com:highfidelity/hifi 2015-12-31 09:06:44 -06: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
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
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
Stephen Birarda
a8896de140 remove dead code, use stop index 2015-12-30 09:45:23 -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
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
Stephen Birarda
6b4db2707e Merge branch 'console' into console-dev 2015-12-29 17:55:22 -08:00
Stephen Birarda
948bc45d49 Merge branch 'console' of github.com:birarda/hifi into console 2015-12-29 17:55:10 -08:00
Anthony J. Thibault
feb63772f3 ThreadSafeValueCache added class and method descriptions 
Also, changed callback prototype.
 2015-12-29 17:08:17 -08:00
Anthony J. Thibault
17e6a04aa8 Renamed ThreadSafeValue to ThreadSafeValueCache 
Also bug fixes where I was incorrectly swapping left and right hands.
 2015-12-29 16:35:31 -08:00
Anthony J. Thibault
e7f3f549a5 Avatar getPalm* methods are thread-safe and non-blocking 
Uses newly added ThreadSafeValue template class.
 2015-12-29 15:10:38 -08:00
Anthony J. Thibault
e67fdf1c04 Merge branch 'master' into tony/get-palm-thread-safe 2015-12-29 14:08:55 -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
Stephen Birarda
e399a3709e remove debug for bytes read from message 2015-12-29 11:44:06 -08:00
Stephen Birarda
5887867ccf use a QLocalServer to handle multiple instance launches 2015-12-29 11:10:40 -08:00
Zach Pomerantz
12fa223004 Render SKY_DOME when SKY_MAP tex is loading 2015-12-29 10:58:23 -08:00
Leonardo Murillo
2ac42d9a2b Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-28 18:37:19 -06:00
Anthony Thibault
878fe80040 Merge branch 'master' into tony/neuron-plugin 2015-12-25 10:24:55 -08:00
Zach Pomerantz
687eef37da Move final blit into RenderDeferredTask 
- Also changes color buffer clearing, such that
anything run through Blit will now clear BUFFER_COLOR0  to 0,0,1,0.
- Blit will always be added to RenderDeferredTask, but
will only run if renderArgs._blitFramebuffer is set.
 2015-12-23 18:21:08 -08:00
Leonardo Murillo
ec6f572d68 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-23 08:26:24 -06:00
Ryan Huffman
14e71778a8 Remove unused captures from lambdas in main() 2015-12-22 16:30:02 -08:00
Ryan Huffman
c396caee5e Update interface to support --url on all platforms 2015-12-22 16:27:33 -08:00
Seth Alves
036002151d call activateBody in prepareForPhysicsSimulation rather than various other places 2015-12-22 12:40:38 -08:00
Seth Alves
5e4a165b4d Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-22 11:23:09 -08:00
Ryan Huffman
00b47cacea Fix crash when getting MyAvatar.sessionUUID from AvatarManager 
The previous code inadvertently added a default constructed shared pointer
to the avatar hash, causing it to crash when dereferencing it in
the update loop.
 2015-12-22 09:59:57 -08:00
Anthony J. Thibault
0459479c2b NeuronPlugin: Added external project for Neuron SDK 
Now builds on windows with actual Neuron SDK.
Can to TCP server on localhost, and receive joint data.
Will debug draw joint 6, (left foot?)
 2015-12-21 18:30:15 -08:00
Brad Hefta-Gaub
3dfc48e205 Merge pull request #6687 from jherico/marketplace 
Support the marketplace in QML
 2015-12-21 17:55:55 -08:00
Brad Davis
95c524fba1 Fixing authentication token for followed links 2015-12-21 15:44:35 -08:00
Zach Pomerantz
d8022aa5b0 Add back deferred debugging and combine context init 2015-12-21 14:32:06 -08:00
Zach Pomerantz
c6a2f5b20d Nest JS props in RenderScriptingInterface 2015-12-21 14:32:06 -08:00
Seth Alves
76df582a6c Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-21 14:29:32 -08:00
Brad Hefta-Gaub
111a8caa3c Merge pull request #6701 from highfidelity/graphics 
Graphics merge into Master: Adding Gamma correction, Tone Mapping and Debugging tool
 2015-12-21 13:54:50 -08:00
Brad Davis
6ef77bc46a Support the marketplace in QML 2015-12-21 11:34:03 -08:00
Brad Davis
05b7fcc957 Remove script -> qt::webchannel dependency 2015-12-21 11:19:05 -08:00
samcake
6bbc94badc Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-21 10:48:55 -08:00
Anthony J. Thibault
dcde640acd Stub Perception Neuron input plugin 2015-12-21 10:06:36 -08:00
Seth Alves
1d9a81d5d4 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-21 09:14:37 -08:00
Brad Davis
46a4a469e9 Merge pull request #6689 from ZappoMan/rightClickMenu 
Some early work to support hand driven reticle
 2015-12-20 17:49:50 -08:00
Leonardo Murillo
aca60e23c2 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-19 18:44:21 -06:00
samcake
1e8e3fec87 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-19 11:38:20 -08:00
Seth Alves
b82559e898 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-19 07:08:25 -08:00