Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-14 13:36:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
32492 commits 74 branches 59 tags 1.2 GiB
Commit graph

32492 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
a0b45b11e9 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-11 13:15:02 -07:00
Howard Stearns
841e23e29d Merge branch 'master' of https://github.com/highfidelity/hifi into rationalize-rig-settings 2015-09-11 12:59:19 -07:00
Howard Stearns
f8f2a067a1 whitespace 2015-09-11 12:59:07 -07:00
Seth Alves
f51f17b267 Merge pull request #5775 from ericrius1/paintCan 
Paint can
 2015-09-11 12:34:44 -07:00
Brad Davis
19806c16a7 Fix debug building 2015-09-11 12:31:32 -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
Sam Gateau
5cc5609e87 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-11 12:05:02 -07:00
Brad Davis
fd1cfadc47 Fixing potential access to null object 2015-09-11 12:02:57 -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
Howard Stearns
02fba12a48 Merge branch 'master' of https://github.com/highfidelity/hifi into rationalize-rig-settings 2015-09-11 11:53:19 -07:00
Howard Stearns
67ce0966d1 Rationalize the rig state setters. 2015-09-11 11:52:20 -07:00
Brad Davis
7fecd3261d Fixing bad merge 2015-09-11 11:40:57 -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
Brad Davis
244795b629 Merge branch 'homer' into temp 
Conflicts:
	interface/src/Application.cpp
 2015-09-11 11:21:29 -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
Brad Hefta-Gaub
20a733b9f5 prevent sending signals in the entities script engine 2015-09-11 10:06:06 -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
Sam Gateau
c9ec65fd65 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-11 09:51:43 -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
Seth Alves
b1c5a04531 respond to code review 2015-09-11 09:29:52 -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 Davis
e9edbb9dd1 Can't promote readlock to writelock 2015-09-10 22:52:40 -07:00
Brad Davis
2a15726aaf More PR comments 2015-09-10 22:29:40 -07:00
Brad Davis
b7ffb96adf Working on thread safety for the entity tree 2015-09-10 22:28:50 -07:00
Brad Davis
92eeb564fe PR comments 2015-09-10 20:57:43 -07:00
Brad Davis
aa989c3687 Fixing some entity race condition crashes 2015-09-10 20:53:17 -07:00
Brad Davis
3bc9e8c98d Fixing some entity race condition crashes 2015-09-10 20:43:41 -07: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
Sam Gateau
c37cdce750 Merging back with master 2015-09-10 17:53:50 -07:00
James Pollack
c3ed2d9064 fix file paths 2015-09-10 17:10:55 -07:00