Clément Brisset
e168966b87
Merge pull request #6409 from birarda/injector-hybrid
...
more efficient threading of networked AudioInjector objects
2015-11-30 15:36:41 -08:00
Atlante45
4aaa9ca02f
Make OctreeElementBag safer to use
2015-11-30 15:23:49 -08:00
Anthony J. Thibault
f922f61c3d
AvatarUpdate: fix for very large dt
...
This was affecting threaded avatar update when enabled.
2015-11-30 15:21:04 -08:00
ericrius1
706a67b9a1
lowered restitution to 0 to avoid too many collision sounds playing
2015-11-30 15:10:32 -08:00
Anthony J. Thibault
e2d9e37eb8
Fix for head offset for models with no eyes
...
This was causing in correct body poses while wearing an HMD.
2015-11-30 14:08:21 -08:00
James B. Pollack
9b90c19781
cleanup
2015-11-30 13:24:33 -08:00
Anthony Thibault
7af6dd9390
Merge pull request #6501 from hyperlogic/tony/cmake-fixes
...
cmake: Fix quazip configure on linux/mac
2015-11-30 13:19:55 -08:00
James B. Pollack
171ae02b03
update to parity with createWand.js
2015-11-30 13:12:39 -08:00
Atlante45
5019f79947
Fix header name
2015-11-30 11:48:34 -08:00
ericrius1
b7884f487c
rats
2015-11-30 11:44:34 -08:00
ericrius1
22efcb1854
Added sounds to pistol
2015-11-30 11:42:34 -08:00
Anthony J. Thibault
11bfed4185
Merge branch 'master' into tony/remove-joint-states
2015-11-30 11:21:44 -08:00
James B. Pollack
85b8266537
Merge pull request #6494 from ctrlaltdavid/20744
...
Fix menu shortcuts created in JavaScript not working
2015-11-30 11:20:10 -08:00
Anthony J. Thibault
79b06c3c8a
cmake: Fix quazip configure on linux/mac if QT_CMAKE_PREFIX_PATH is undefined.
2015-11-30 11:14:35 -08:00
Eric Levin
d27e6d70c1
Merge pull request #6171 from imgntn/bow
...
Add Bow & Arrow
2015-11-30 11:12:57 -08:00
Stephen Birarda
c76704dc17
Merge pull request #6484 from zzmp/patch-3
...
Update BUILD_OSX for CMake env vars.
2015-11-30 10:20:30 -08:00
Seth Alves
0043bef29a
Merge pull request #6499 from AndrewMeadows/fewer-warnings
...
Remove warning about unused AudioConstants::AUDIO_FRAME_NAME
2015-11-30 10:17:48 -08:00
Andrew Meadows
49a6f63663
remove whitespace and fix warning (unused var)
2015-11-30 10:00:05 -08:00
samcake
1be494a257
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-30 09:36:29 -08:00
Andrew Meadows
b74c229d02
Merge pull request #6495 from ctrlaltdavid/fix-webwindowclass-crash
...
Fix crash in WebWindowClass in debug build setTitle on open WebWindow
2015-11-30 09:25:12 -08:00
Philip Rosedale
2377875623
Tabs to spaces v2
2015-11-30 08:05:25 -08:00
Philip Rosedale
ba379e8830
Tabs to spaces
2015-11-30 08:00:12 -08:00
Sam Cake
3f43fde459
AFter 3 days on that piece of shit i just give up, js is just too hard to debug, i m very sad
2015-11-30 04:11:17 -08:00
David Rowe
ce100dbbc5
Fix crash in WebWindowClass in debug build setTitle on open WebWindow
2015-11-30 15:10:51 +13:00
James Pollack
44f69a2a18
Merge branch 'master' into bow
2015-11-29 11:37:25 -08:00
David Rowe
866037ec7c
Fix menu shortcut keys set by JavaScript not working
2015-11-30 08:33:38 +13:00
David Rowe
d6b13ef42c
Fix crash when try to remove invalid menu item in JavaScript
2015-11-30 08:33:38 +13:00
Seth Alves
ddf5539a49
Merge pull request #6492 from imgntn/grabupdates
...
Isolate handControllerGrab.js changes from bow branch
2015-11-29 06:21:44 -08:00
James Pollack
0625d4f4c2
remove debugging string
2015-11-28 23:40:58 -08:00
James Pollack
55f797838f
remove unused key
2015-11-28 23:22:00 -08:00
James Pollack
1e2398cbea
use constants
2015-11-28 23:04:52 -08:00
James Pollack
1315201bdc
update name of function
2015-11-28 22:55:44 -08:00
James Pollack
017ffb8f2e
change way messages get sent to the hand disabler
2015-11-28 22:54:31 -08:00
James Pollack
8f51ee6f58
rename hand disabler
2015-11-28 22:29:12 -08:00
Andrew Meadows
ce3fb028ef
Merge pull request #6493 from hyperlogic/tony/cmake-fixes
...
cmake: warning fixes
2015-11-28 10:51:57 -08:00
Anthony Thibault
63cef9c367
Configure fix for quazip
...
23> CMake Warning (dev) at C:/msys64/home/Anthony/code/hifi/build/ext/vc12/quazip/project/src/quazip-stamp/quazip-configure-Debug.cmake:3 (set):
23> Syntax error in cmake code at
23>
23> C:/msys64/home/Anthony/code/hifi/build/ext/vc12/quazip/project/src/quazip-stamp/quazip-configure-Debug.cmake:3
23>
23> when parsing string
23>
23> C:/Program Files (x86)/CMake/bin/cmake.exe;-DCMAKE_INSTALL_PREFIX:PATH=C:/msys64/home/Anthony/code/hifi/build/ext/vc12/quazip/project;-DCMAKE_PREFIX_PATH=C:\Qt\Qt5.5.1\5.5\msvc2013\lib\cmake;-DCMAKE_INSTALL_NAME_DIR:PATH=C:/msys64/home/Anthony/code/hifi/build/ext/vc12/quazip/project/lib;-DZLIB_ROOT=C:/msys64/home/Anthony/code/hifi/build/ext/vc12/zlib/project;-GVisual Studio 12 2013;C:/msys64/home/Anthony/code/hifi/build/ext/vc12/quazip/project/src/quazip
23>
23> Invalid escape sequence \Q
23>
23> Policy CMP0010 is not set: Bad variable reference syntax is an error. Run
23> "cmake --help-policy CMP0010" for policy details. Use the cmake_policy
23> command to set the policy and suppress this warning.
23> This warning is for project developers. Use -Wno-dev to suppress it.
By converting backslashes to slashes before using the QT_CMAKE_PREFIX_PATH environment variable on the command line.
2015-11-27 20:57:35 -08:00
Anthony Thibault
a9e25c51e5
Fix for linker warning LNK4075 on Windows
...
Specifcally, this warning:
LINK : warning LNK4075: ignoring '/INCREMENTAL' due to '/OPT:ICF' specification
The fix is to set /OPT:NOREF and /OPT:NOICF on debug builds.
2015-11-27 20:56:57 -08:00
James B. Pollack
8daeb0fa0d
revert hand grab script to current master
2015-11-27 12:18:11 -08:00
James B. Pollack
9ec2a01475
isolate grab script changes from bow branch
2015-11-27 12:13:53 -08:00
James B. Pollack
b6a165d3ef
Merge branch 'master' into bow
2015-11-27 11:41:21 -08:00
James B. Pollack
0ba6d172e8
Merge branch 'bow' of https://github.com/imgntn/hifi into bow
2015-11-27 11:21:33 -08:00
James B. Pollack
c237485023
revert playaspawner
2015-11-27 11:21:18 -08:00
Sam Cake
37d3083e07
Getting the Actor class starting to work and usable for the playback master!
2015-11-26 00:41:46 -08:00
Philip Rosedale
eccca218f0
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-11-25 20:47:01 -08:00
Philip Rosedale
a40ead077f
Mouth animation improvements
2015-11-25 20:37:51 -08:00
Anthony J. Thibault
549a8f7130
Fix for avatars with no eyes
...
For example:
https://hifi-public.s3.amazonaws.com/ozan/avatars/hifi_team/howard/howard.fst
https://hifi-public.s3.amazonaws.com/ozan/avatars/hifi_team/tony/tony.fst
2015-11-25 17:24:55 -08:00
Atlante45
a364e85e1d
Remove DeleteHooks
2015-11-25 17:21:56 -08:00
samcake
3273fbcad4
Creating the master / agent hiring system
2015-11-25 17:10:38 -08:00
Ken Cooke
a5b64473af
Fix bugs
2015-11-25 16:15:04 -08:00
Anthony J. Thibault
7c9cb97783
Merge branch 'master' into tony/remove-joint-states
2015-11-25 15:48:51 -08:00
