Commit graph

9412 commits

Author SHA1 Message Date
Andrew Meadows
e631ab8d38 use Qt::AutoConnection for Avatar::setFoo() methods
This prevents a JS script from blocking when setting C++ values.
2014-10-29 13:01:47 -07:00
Andrew Meadows
9ddd05ca72 smoother avatar motion at low velocities 2014-10-29 12:13:07 -07:00
Sam Gateau
7aaac69d35 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-10-28 18:22:42 -07:00
Sam Gateau
da70ec4c89 Fix the rendering bug on yosemite: due to the attribute channel number assigned by the compiler which colllides with the fixed pipeline vertex attrib channels, forced the attribute bind location after 3 2014-10-28 18:22:06 -07:00
Philip Rosedale
e5c9ad4525 Merge pull request #3661 from Atlante45/reverb_fixed
Audio Environment packets
2014-10-28 18:11:14 -07:00
Brad Hefta-Gaub
7ecc0ccb30 Merge pull request #3683 from birarda/lobby
fix for location naming break after AddressManager changes
2014-10-28 17:58:34 -07:00
Brad Hefta-Gaub
be65a798db Merge pull request #3681 from birarda/verbose-log-silencer
logging tweaks to reduce spam from repeated log messages
2014-10-28 17:58:17 -07:00
Stephen Birarda
6ba0845767 fix warnings that were bugging Xcode 2014-10-28 15:39:28 -07:00
Stephen Birarda
2816e8f114 fix location DataWebDialog missing InterfaceLocation object 2014-10-28 15:32:23 -07:00
Brad Hefta-Gaub
c39c716755 Merge pull request #3679 from AndrewMeadows/inertia
move code out of "shared" and into new "physics" lib
2014-10-28 15:25:38 -07:00
AndrewMeadows
4a9015c0e6 Merge pull request #3674 from stojce/20143
CR for Job #20143 - BUG:  Rearview mirror rendering at wrong size
2014-10-28 15:02:25 -07:00
Stephen Birarda
424793b905 complete output of suppressed repeated messages to log 2014-10-28 14:49:14 -07:00
Stephen Birarda
8e3102266a use the LogHandler in Interface 2014-10-28 14:23:34 -07:00
Stephen Birarda
d3bbd251db move Logging to LogHandler 2014-10-28 13:59:23 -07:00
Andrew Meadows
911c3bcc38 merge upstream/master into andrew/inertia 2014-10-28 13:53:46 -07:00
Andrew Meadows
4c3cdf5b7a move stuff out of shared and into physics library 2014-10-28 13:51:45 -07:00
Stephen Birarda
2711ff2b5f move functionality from VerboseLoggingHelper into the Logging class 2014-10-28 13:48:53 -07:00
Stojce
1229f0e8fa Merge branch 'master' of https://github.com/highfidelity/hifi into 20143 2014-10-28 21:39:36 +01:00
ZappoMan
06b31baa2a Merge branch 'master' of https://github.com/highfidelity/hifi into moreLightPropertiesAttempt2 2014-10-28 13:32:45 -07:00
Stephen Birarda
477b5096e8 don't start/end action/back events on auto-repeat 2014-10-28 11:34:31 -07:00
ZappoMan
7d2ef7923b Merge branch 'master' of https://github.com/highfidelity/hifi into moreLightPropertiesAttempt2 2014-10-28 10:50:02 -07:00
Stephen Birarda
27f7cdb2d4 handle location set/get in AddressManager, handle set to address map 2014-10-28 10:35:56 -07:00
Stojce
1debad3969 Merge branch 'master' of https://github.com/highfidelity/hifi into 20143 2014-10-28 17:22:00 +01:00
Brad Hefta-Gaub
4e7e9641f0 Merge pull request #3673 from birarda/lobby
initial groundwork for lobby interface
2014-10-28 08:48:33 -07:00
Stephen Birarda
cb7a6cb93c Merge branch 'master' of https://github.com/highfidelity/hifi into lobby 2014-10-28 08:40:20 -07:00
Stojce
9be107c9c1 Merge branch 'master' of https://github.com/highfidelity/hifi into 20143 2014-10-28 08:24:23 +01:00
Brad Hefta-Gaub
b506a99200 Merge pull request #3671 from ctrlaltdavid/20107
CR for Job #20107 - Keys p and h and some control keys wont override
2014-10-27 20:30:15 -07:00
Brad Hefta-Gaub
cfe26ead6e Merge pull request #3669 from lycanthus/20074
Worklist #20074
2014-10-27 20:29:23 -07:00
Andrzej Kapolka
fc3f27b70a Merge pull request #3670 from samcake/temp0
Add NSIGHT profiling information to the Build
2014-10-27 17:03:19 -07:00
Andrzej Kapolka
2db893c23c Merge pull request #3668 from AndrewMeadows/experimental
Experimental feature: skeleton offset
2014-10-27 17:02:01 -07:00
Stephen Birarda
e2536dd3f8 remove a debug line 2014-10-27 16:55:24 -07:00
Stephen Birarda
80d9014726 have spacebar fire an action event at center of screen 2014-10-27 16:54:28 -07:00
Stephen Birarda
209c12cb1c repairs for texture replacement by name 2014-10-27 16:52:22 -07:00
Stephen Birarda
bb652c0784 rename signal in AbstractControllerScriptingInterface from cancel to back 2014-10-27 16:01:39 -07:00
Stephen Birarda
8e6b6d5294 have controller A button fire action at center of screen 2014-10-27 15:58:42 -07:00
Stephen Birarda
8a9f2d172a rename HFCancelEvent to HFBackEvent, fire from joystick 2014-10-27 15:51:59 -07:00
Stephen Birarda
04e7e979aa bubble up HFCancelEvent from ESC key 2014-10-27 15:42:40 -07:00
Stephen Birarda
7b5115c35f add a new meta event, HFCancelEvent 2014-10-27 15:37:31 -07:00
ZappoMan
c17ffe9433 add the new properties to LightEntityItem class 2014-10-27 15:31:21 -07:00
Stephen Birarda
c3fe7c7497 send global HFActionEvent from ControllerScriptingInterface 2014-10-27 15:21:47 -07:00
Andrzej Kapolka
4ab90ce49c Avoid killing the updater twice. 2014-10-27 15:04:03 -07:00
Andrzej Kapolka
7bcc267cb5 Fix for crash on exit. 2014-10-27 15:01:06 -07:00
Sam Gateau
6101c3b758 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-10-27 14:55:42 -07:00
Sam Gateau
fd514ccfc9 Fixed the cmake so if NSIGHT is not available then no problem 2014-10-27 14:47:31 -07:00
Stephen Birarda
d38dd2c53a repairs for recursive source files, move HF meta events to SE 2014-10-27 14:18:23 -07:00
Stephen Birarda
0ddf665b86 add an HFMetaEvent class as super class for meta events 2014-10-27 12:56:48 -07:00
Sam Gateau
89f9e5b01b try to get more coherent names 2014-10-27 11:49:51 -07:00
Sam Gateau
ff44a460d6 Add NSIGHT Profiliing capability 2014-10-27 11:40:52 -07:00
Stephen Birarda
6626787ae5 have mouse press/release fire HFActionEvent 2014-10-27 11:40:33 -07:00
Stephen Birarda
55735a3f0d add start and end to HFActionEvent 2014-10-27 11:11:23 -07:00