Atlante45
|
a0afcdfe79
|
Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame
|
2014-11-13 11:39:15 -08:00 |
|
Atlante45
|
ac34db14aa
|
Send pieces ID
|
2014-11-13 11:35:14 -08:00 |
|
Atlante45
|
ce0cb9fdc7
|
Better move / start of auto move dead piece
|
2014-11-13 11:34:38 -08:00 |
|
Philip Rosedale
|
9cfc95bc6a
|
Merge pull request #3786 from ZappoMan/animationUnification
Animation unification
|
2014-11-13 10:23:36 -08:00 |
|
Atlante45
|
2498fd11a3
|
Preload sounds / use hash injector options
|
2014-11-13 10:22:45 -08:00 |
|
Atlante45
|
bc4514649e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame
|
2014-11-13 09:35:39 -08:00 |
|
Stephen Birarda
|
42a73e280e
|
remove the concert camera scripts from examples
|
2014-11-13 09:29:37 -08:00 |
|
ZappoMan
|
55c177594b
|
only set animationIsPlaying if it changed
|
2014-11-13 08:37:54 -08:00 |
|
ZappoMan
|
ea0022501b
|
only set animation properties if they actually changed
|
2014-11-13 08:13:30 -08:00 |
|
ZappoMan
|
4077f6c2ab
|
Merge branch 'master' of https://github.com/highfidelity/hifi into animationUnification
|
2014-11-12 20:39:39 -08:00 |
|
ZappoMan
|
8a2e3d5045
|
add animationSettings property to model entities
|
2014-11-12 17:41:55 -08:00 |
|
Atlante45
|
16e243aec5
|
typo
|
2014-11-12 17:19:16 -08:00 |
|
Atlante45
|
bada1d8e38
|
Cleaner code + metadata
|
2014-11-12 17:13:29 -08:00 |
|
Atlante45
|
7193fcc89d
|
Metadata for pieces
|
2014-11-12 17:12:27 -08:00 |
|
Brad Hefta-Gaub
|
99dd20f828
|
Merge pull request #3780 from ctrlaltdavid/20182
CR for Job #20182 - Add ability to set alpha on text overlays
|
2014-11-12 16:26:59 -08:00 |
|
Brad Hefta-Gaub
|
70c463695a
|
Merge pull request #3779 from PhilipRosedale/master
Remove buckyBalls and faceshift lean-to-drive
|
2014-11-12 16:26:50 -08:00 |
|
Atlante45
|
6f8b702334
|
New grid
|
2014-11-12 15:34:39 -08:00 |
|
Atlante45
|
76d45953fd
|
switch to mesh board
|
2014-11-12 15:34:14 -08:00 |
|
Atlante45
|
d25af3b4c9
|
Actual piece meshes
|
2014-11-12 14:15:18 -08:00 |
|
Atlante45
|
b4585163db
|
Global board position / piece boundaries
|
2014-11-12 14:14:37 -08:00 |
|
Atlante45
|
685734bdcc
|
Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame
|
2014-11-12 09:04:48 -08:00 |
|
Philip Rosedale
|
6af2b7aadf
|
remove buckyballs and face shift lean driving (should be a script if desired)
|
2014-11-12 07:33:59 -08:00 |
|
Stephen Birarda
|
b7b371ba61
|
resolve conflicts on merge with upstream master
|
2014-11-11 20:53:24 -08:00 |
|
David Rowe
|
8ac3aba2bd
|
Make text overlays apply alpha to text as well as background
|
2014-11-11 17:54:02 -08:00 |
|
Stephen Birarda
|
9aa950e657
|
fix audio injector cleanup for local only injectors
|
2014-11-11 17:34:03 -08:00 |
|
Stephen Birarda
|
7f79f0946d
|
play a random musak song in lobby when it is shown
|
2014-11-11 17:10:25 -08:00 |
|
Atlante45
|
f80068798f
|
playChess script with autonomous pieces
|
2014-11-11 17:09:08 -08:00 |
|
Atlante45
|
e4975c0e2b
|
chessPiece script with sound
|
2014-11-11 17:08:35 -08:00 |
|
Stephen Birarda
|
0433586293
|
switch lobby noise back to drone
|
2014-11-11 16:59:15 -08:00 |
|
Stephen Birarda
|
cb5d5dd3a8
|
handle looping via AudioInjectorLocalBuffer
|
2014-11-11 16:57:25 -08:00 |
|
Stephen Birarda
|
a5a02b5f8a
|
add AudioInjectorLocalBuffer for more control
|
2014-11-11 16:34:00 -08:00 |
|
Stephen Birarda
|
0e30c65e60
|
handle cleanup of local injection, volume
|
2014-11-11 15:12:11 -08:00 |
|
Philip Rosedale
|
e6bbb53483
|
Merge pull request #3774 from ZappoMan/newEntityNotification
implement "preload" method for entity Scripts
|
2014-11-11 14:46:23 -08:00 |
|
ZappoMan
|
8ec3f8ce99
|
implement support for calling preload when the script changes
|
2014-11-11 14:21:06 -08:00 |
|
Stephen Birarda
|
cd3877b584
|
handle local audio output via AudioInjector directly for control
|
2014-11-11 14:14:43 -08:00 |
|
ZappoMan
|
2bc7896dee
|
first cut at preload script behavior
|
2014-11-11 13:46:48 -08:00 |
|
Ryan Huffman
|
db9a5f2282
|
Add back XZ constraining to entity edit tools
|
2014-11-11 11:43:27 -08:00 |
|
Stephen Birarda
|
1f452c8baa
|
replace AudioInjectionOptions with hash in playSoundOnEnterOrLeave
|
2014-11-11 11:17:45 -08:00 |
|
Stephen Birarda
|
d81609f045
|
use hash in place of AudioInjectionOptions in other js files
|
2014-11-11 11:16:45 -08:00 |
|
Stephen Birarda
|
89ae8f53ba
|
use new AudioInjectionOptions format in botProceduralWayPoints
|
2014-11-11 11:05:35 -08:00 |
|
Stephen Birarda
|
bfc25767ed
|
repairs to bot_procedrual for hash injector options format
|
2014-11-11 10:57:07 -08:00 |
|
Stephen Birarda
|
853c0197a1
|
repairs to birdSongs for new hash injector format
|
2014-11-11 10:55:45 -08:00 |
|
Ryan Huffman
|
bedd9c76f2
|
Merge branch 'master' of github.com:highfidelity/hifi into entity-grid-tool
Conflicts:
examples/newEditEntities.js
|
2014-11-11 10:48:49 -08:00 |
|
Stephen Birarda
|
d4b74e6ecf
|
update birdSongs to new injector hash format
|
2014-11-11 10:30:16 -08:00 |
|
Stephen Birarda
|
12e15eab6a
|
update avatarCollision to new hash injector format
|
2014-11-11 10:29:29 -08:00 |
|
Stephen Birarda
|
c684a1cf00
|
update audioBall to new hash injector format
|
2014-11-11 10:28:33 -08:00 |
|
Stephen Birarda
|
05174ffdf3
|
update airGuitar.js to new AudioInjectionOptions format
|
2014-11-11 10:26:53 -08:00 |
|
Atlante45
|
e58664d418
|
Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame
|
2014-11-11 10:20:12 -08:00 |
|
Ryan Huffman
|
d537c5efdb
|
Add grid tool menu option
|
2014-11-11 09:56:02 -08:00 |
|
Ryan Huffman
|
b04fd89e4f
|
Update grid tool html location
|
2014-11-11 09:55:30 -08:00 |
|