Atlante45
1d498af76e
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-12-04 15:18:25 -08:00
Brad Hefta-Gaub
d9a1563396
Merge pull request #6152 from sethalves/parents
...
Parents
2015-12-04 10:26:57 -08:00
Brad Hefta-Gaub
46556b7fa5
Merge pull request #6513 from huffman/fix-script-race-condition
...
Fix ScriptEngine setting _isFinished when it shouldn't, causing scripts to accumulate when restarting
2015-12-03 17:17:42 -08:00
Seth Alves
0595ef0938
merge from upstream
2015-12-02 09:30:19 -08:00
Ryan Huffman
4d84362757
Fix ScriptEngine setting _isFinished when it shouldn't
2015-12-01 11:30:56 -08:00
Stephen Birarda
c3f3639374
more spacing adjustments in ScriptEngine.cpp
2015-11-30 15:57:10 -08:00
Stephen Birarda
b1a69bb2cf
cleanup spacing in ScriptEngine
2015-11-30 15:52:10 -08:00
Stephen Birarda
4573e5c59e
resolve conflicts on merge with upstream/master
2015-11-30 13:32:38 -08:00
Seth Alves
ca75802b9c
unmangle merge
2015-11-26 06:43:28 -08:00
David Rowe
e25d4c17e8
Fix InputController (Leap Motion) not able to be created
2015-11-25 09:29:40 +13:00
Brad Hefta-Gaub
d32e500464
Merge pull request #6462 from jherico/rec5
...
Blendshapes and attachments in recordings, plus other minor fixes.
2015-11-24 10:01:17 -08:00
Stephen Birarda
762709748d
Merge pull request #6473 from ZappoMan/waitForScriptThreads
...
change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete
2015-11-24 10:39:22 -06:00
Brad Davis
3738f21936
Fix occasional deadlock in loading recordings
2015-11-23 22:34:17 -08:00
samcake
a1668cdc73
Let the AssertClient JS interface use global vars
2015-11-23 22:28:59 -08:00
Brad Hefta-Gaub
5f88d958ab
CR feedback
2015-11-23 18:26:15 -08:00
Brad Hefta-Gaub
ce46c30647
change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete
2015-11-23 16:27:06 -08:00
Seth Alves
f013f95e9b
merge from upstream
2015-11-21 08:43:00 -08:00
Seth Alves
0b1fa4f60f
add interface for getters for specific joints
2015-11-21 08:21:10 -08:00
EdgarPironti
ebbed7c525
Save clip to asset - removing last fix
2015-11-20 18:23:36 -08:00
samcake
de56f698aa
Merge pull request #6444 from EdgarPironti/asset_branch
...
Save clip to asset
2015-11-20 16:28:55 -08:00
Brad Davis
336562b894
Merge pull request #6452 from ctrlaltdavid/20732
...
Make multiline strings from JavaScript's print() readably in log file
2015-11-20 16:25:17 -08:00
EdgarPironti
df2153186d
Fixes
2015-11-20 16:07:31 -08:00
EdgarPironti
e70f6855aa
Fixes
2015-11-20 16:07:30 -08:00
EdgarPironti
35365f9157
Fixes
2015-11-20 16:07:30 -08:00
EdgarPironti
1db6d0e3c1
Upload QByteArray
2015-11-20 16:07:29 -08:00
EdgarPironti
1b18d3656f
Save clip to asset
2015-11-20 16:07:29 -08:00
David Rowe
c72c6a0a47
Make multiline strings from JavaScript's print() readably in log file
...
Addresses quoting of newline characters as "\n" which was introduced in
Qt 5.5.
2015-11-21 10:44:21 +13:00
Brad Davis
cc2a7cbda8
Force synchronous loading of clips in JS
2015-11-20 11:51:08 -08:00
samcake
732c911fd7
Merge pull request #6439 from ZappoMan/assetJS
...
add Assets.uploadData() and Assets.downloadData()
2015-11-19 17:56:10 -08:00
Brad Hefta-Gaub
f80a765a29
add Assets.uploadData() and Assets.downloadData()
2015-11-19 17:28:20 -08:00
Brad Davis
e187aaedcb
Load recorded clips from URLs, not file paths
2015-11-19 15:56:37 -08:00
Brad Davis
5b8047ded4
Make recording and playback work in interface, playback in agent
2015-11-18 14:04:45 -08:00
samcake
368f19b4e2
Merging with todays upstream and checking
2015-11-17 18:58:10 -08:00
samcake
d2f3b48637
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-17 17:36:38 -08:00
Brad Hefta-Gaub
2f142eb088
add a receiver example
2015-11-17 13:33:30 -08:00
Brad Hefta-Gaub
32bf81ef0d
move MessagesClient to agent
2015-11-17 12:59:12 -08:00
Sam Gateau
5b92929833
Moving the REcordingScriptingInterface into the script-engine and wiiring up in the assignment-client
2015-11-17 09:32:22 -08:00
Stephen Birarda
ef778c554c
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-12 10:40:51 -08:00
Seth Alves
3519dd248b
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-12 09:53:11 -08:00
James B. Pollack
39f44115be
Merge pull request #6373 from Atlante45/rotationBetween
...
Rotation between
2015-11-12 09:25:56 -08:00
Brad Davis
f521be10fe
Avatar recording work in progress
2015-11-12 00:33:38 -08:00
Atlante45
e4897a8de7
Use new constants
2015-11-11 15:58:27 -08:00
Seth Alves
4df65e4c11
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-10 15:02:07 -08:00
Eric Levin
a2abc11df1
Merge pull request #6351 from huffman/script-path-resolution
...
Update script engine path resolution behavior to behave consistently
2015-11-10 14:10:42 -08:00
Seth Alves
b9ca509f07
Merge branch 'master' of github.com:highfidelity/hifi into render-debug-fixup
2015-11-10 09:50:12 -08:00
Ryan Huffman
f6df7e298e
Merge branch 'script-path-resolution' into baseball
2015-11-09 14:03:10 -08:00
Atlante45
b15054c1fb
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-09 13:41:06 -08:00
Eric Levin
7700e67734
Merge pull request #6326 from imgntn/entity_params
...
Add Ability to Pass Parameters When Calling Methods on Entities
2015-11-09 12:17:58 -08:00
Ryan Huffman
b835711266
Update script engine path resolution behavior
...
The path resolution will now be relative to the script currently
being evaluated *on its initial evaluation.* The previous behavior
was that all paths would be resolved relative to the root script
for client scripts, and inconsistent for entity scripts depending
on the order that scripts were loaded. The entity script situation
was particularly bad because including more than 1 level deep produced
inconsistent results.
2015-11-09 12:04:17 -08:00
Seth Alves
f3d26e163d
turn _drawItemStatus into a bitfield, split out bounding boxes and network/physics-sim-ownership. hook Display-Simulation-Ownership menu item to this system
2015-11-07 07:19:27 -08:00
