Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 01:33:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
31609 commits 71 branches 56 tags 1.2 GiB
Commit graph

31609 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
6468046c68 Update AssetClient callbacks to return whether a response was received 2015-09-14 11:22:34 -07:00
Ryan Huffman
71456eee5e Add UploadDialog error for NetworkError 2015-09-14 11:19:47 -07:00
Ryan Huffman
a5ba86514c Remove log message 2015-09-11 14:01:08 -07:00
Ryan Huffman
b564ceb76f Add network error to AssetRequest 2015-09-11 14:01:08 -07:00
Ryan Huffman
42b4c7d423 Update AssetClient to handle disconnections from a node 2015-09-11 14:01:08 -07:00
Ryan Huffman
3ae323cb2e Move pending requests in AssetClient to include node sent to 2015-09-11 14:01:08 -07:00
Ryan Huffman
4ed3e36181 Update AssetClient::create* methods to not block on invokeMethod 2015-09-11 14:01:08 -07:00
Seth Alves
f51f17b267 Merge pull request #5775 from ericrius1/paintCan 
Paint can
 2015-09-11 12:34:44 -07:00
Brad Davis
44ee45a5ca Merge pull request #5783 from highfidelity/revert-5779-entityScriptCrashes 
Revert "Make sure all entity script callbacks happen on the Entities …
 2015-09-11 12:28:15 -07:00
ericrius1
0a46db60ac spawning particles on grab and deleting on release, with a lifetime, for better cleanup of particles 2015-09-11 12:01:01 -07:00
Brad Hefta-Gaub
5c6d8da97b Revert "Make sure all entity script callbacks happen on the Entities script engine thread" 2015-09-11 11:55:36 -07:00
ericrius1
eabdd1f4d9 quick fix for particles hanging around 2015-09-11 11:33:21 -07:00
ericrius1
6e46e3d3b6 cleanup for paintcan 2015-09-11 11:24:53 -07:00
Seth Alves
59c0cb4e6a Merge pull request #5777 from highfidelity/revert-5769-edit-js-adjustment 
Revert "edit.js adjustment"
 2015-09-11 10:59:00 -07:00
Seth Alves
218225e4a5 Merge pull request #5781 from hyperlogic/tony/head-ik 
Added head target to AnimGraph IK node.
 2015-09-11 10:58:53 -07:00
Anthony J. Thibault
8e504e63b0 Removed unused variable, changed glm::vec3(0) to glm::vec3() 2015-09-11 10:43:49 -07:00
Brad Davis
327d698b44 Merge pull request #5780 from ZappoMan/entityScriptCrashes 
prevent sending signals in the entities script engine
 2015-09-11 10:08:05 -07:00
Seth Alves
0e63147be2 Merge pull request #5776 from birarda/ac-pid-zero 
make sure AC process ID is valid before acting on the process
 2015-09-11 10:00:08 -07:00
Anthony J. Thibault
7996a02bd8 Added head target to AnimGraph IK node. 
* In HMD mode head orientation and position is set.
* When not in HMD only orientation is set, position should
  default to the underlying pose position.
 2015-09-11 09:48:48 -07:00
Brad Hefta-Gaub
b9d5412aad prevent sending signals in the entities script engine 2015-09-11 09:48:42 -07:00
ericrius1
1991ba0eba absolute path for now- just for testing purposes before merge 2015-09-11 09:37:03 -07:00
Stephen Birarda
a286f4e7d0 Merge pull request #5772 from Atlante45/protocol 
Asset server node JSON stats
 2015-09-11 09:35:39 -07:00
Ryan Huffman
9ab603e9a5 Merge pull request #5773 from birarda/master 
fail asset request if hash does not match
 2015-09-11 09:09:56 -07:00
Brad Davis
2f679a3526 Merge pull request #5779 from ZappoMan/entityScriptCrashes 
Make sure all entity script callbacks happen on the Entities script engine thread
 2015-09-11 08:34:08 -07:00
Atlante45
05df84ee67 Remove AS stats namespace/Filter DS 2015-09-11 15:20:01 +02:00
Atlante45
449d6a04d8 CR 2015-09-11 14:21:56 +02:00
Atlante45
8c1fb67825 Lock nodeHash mutex for node lookup 2015-09-11 14:21:55 +02:00
Atlante45
42d1ab3745 Remove accidentally added header 2015-09-11 14:21:55 +02:00
Atlante45
0037a1f4a7 Win build fix 2015-09-11 14:21:55 +02:00
Atlante45
18a696d88c Type cleanup 2015-09-11 14:21:54 +02:00
Atlante45
15f7745bcc JSON stats reliable and ordered 2015-09-11 14:21:54 +02:00
Atlante45
801f32295d Update JSON stats building 2015-09-11 14:21:54 +02:00
Atlante45
08e0a8d705 AssetServer JSON stats 2015-09-11 14:21:53 +02:00
Atlante45
5808658958 Make NodeJSONStats reliable 2015-09-11 14:21:53 +02:00
Brad Hefta-Gaub
92a5a999c6 quiet some debug 2015-09-10 19:52:44 -07:00
Brad Hefta-Gaub
ee30fe4a56 quiet some debug 2015-09-10 19:48:41 -07:00
ericrius1
7969fb64ce tweaking distance threshold 2015-09-10 17:08:52 -07:00
Seth Alves
94dc86833f Revert "edit.js adjustment" 2015-09-10 17:01:11 -07:00
Stephen Birarda
d10095ed20 make sure AC PID is valid before acting on process 2015-09-10 16:55:25 -07:00
ericrius1
a1fd867c09 timer fix for reset 2015-09-10 16:46:25 -07:00
ericrius1
510e253575 switching to hosted script for testing 2015-09-10 16:26:57 -07:00
ericrius1
66e4acf651 trying to move to instant reset 2015-09-10 16:21:57 -07:00
Philip Rosedale
c4c6e7264e Merge pull request #5774 from samcake/punk 
Toybox: Make the flashlight grab frame work correctly
 2015-09-10 16:08:01 -07:00
Sam Gateau
ae03d32a84 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-09-10 15:55:42 -07:00
Sam Gateau
3bf0f388eb Make the flashlight grab frame work correctly 2015-09-10 15:39:54 -07:00
Howard Stearns
0870c5ed87 Merge pull request #5768 from hyperlogic/tony/ik-and-controllers 
AnimInverseKinematics and AnimController node
 2015-09-10 15:38:53 -07:00
Howard Stearns
23431efdeb Merge pull request #5771 from ctrlaltdavid/20671-tidy 
Stop DDE and EyeTracker early but don't destroy until later in shutdown
 2015-09-10 15:38:16 -07:00
Philip Rosedale
5955228652 Merge pull request #5769 from sethalves/edit-js-adjustment 
edit.js adjustment
 2015-09-10 15:36:35 -07:00
Philip Rosedale
93261976c0 Merge pull request #5763 from hyperlogic/tony/squeeze-hands-improvements 
Improvements to squeezeHands.js
 2015-09-10 15:34:52 -07:00
Sam Gateau
d0592d562c Make the flashlight grab frame work correctly 2015-09-10 15:30:50 -07:00