Stephen Birarda
c451ede051
add crowd noises to assets yaml
2015-11-30 16:59:13 -08:00
Stephen Birarda
4a80e72d14
complete attribution for removed files
2015-11-30 16:48:05 -08:00
Stephen Birarda
f7537e3dc3
add initial version of asset description
2015-11-30 16:44:14 -08:00
Ryan Huffman
6fe370c4ef
Remove old comment in firework.js
2015-11-30 16:02:00 -08:00
Ryan Huffman
0ed249f0e7
Update script path include in firework.js
2015-11-30 16:01:53 -08:00
Stephen Birarda
1b1efe53d9
fix for two space indentation in createBatButton.js
2015-11-30 15:59:12 -08:00
Stephen Birarda
c3f3639374
more spacing adjustments in ScriptEngine.cpp
2015-11-30 15:57:10 -08:00
Stephen Birarda
733665d722
fix spacing in baseballCrowd.js
2015-11-30 15:53:42 -08:00
Stephen Birarda
b1a69bb2cf
cleanup spacing in ScriptEngine
2015-11-30 15:52:10 -08:00
Stephen Birarda
2acfbd0f8f
revert accidental CCD change
2015-11-30 15:52:03 -08:00
Stephen Birarda
361b4b80e6
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-30 14:57:44 -08:00
Stephen Birarda
a33e57dfdb
remove audio files from history
2015-11-30 14:06:09 -08:00
Stephen Birarda
3baf39ba2a
Merge branch 'baseball' of github.com:birarda/hifi into baseball
2015-11-30 14:01:09 -08:00
Stephen Birarda
f07314f4ef
resolve conflicts on merge with huffman/baseball
2015-11-30 13:34:36 -08:00
Stephen Birarda
4573e5c59e
resolve conflicts on merge with upstream/master
2015-11-30 13:32:38 -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
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
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
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
Anthony Thibault
6d65f1e3b6
Merge pull request #6491 from howard-stearns/fix-missing-own-avatar
...
Restore rendering of one's own avatar.
2015-11-25 15:46:50 -08:00
Andrew Meadows
527408c7c1
Merge pull request #6292 from huffman/physics-continuous-collision-detection
...
Physics continuous collision detection
2015-11-25 15:45:18 -08:00
Howard Stearns
6c7099a5f7
Coordinate with other uses of setVisibleInScene.
2015-11-25 15:18:32 -08:00
howard-stearns
546f09c0b1
Restore rendering of one's own avatar.
2015-11-25 13:30:54 -08:00
Clément Brisset
5ff482071e
Merge pull request #6465 from ericrius1/polyLineFix
...
moved logic to build vertex buffer to renderable polyline class, recalculati…
2015-11-25 11:02:02 -08:00
Andrew Meadows
bc20b72645
Merge pull request #6453 from howard-stearns/avatar-render-controller2
...
Survive Flash Mobs Without Making Everyone Sick
2015-11-25 09:52:28 -08:00
Brad Hefta-Gaub
a647b9ea40
Merge pull request #6485 from AlessandroSigna/groupRecording
...
Group recording - added prompt
2015-11-24 20:00:36 -08:00
Brad Hefta-Gaub
e807aaf718
Merge pull request #6486 from hyperlogic/tony/hand-ik-fix
...
Fixes hand IK for some avatars
2015-11-24 20:00:12 -08:00
