Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-09 06:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
31812 commits 69 branches 58 tags 1.2 GiB
Commit graph

31812 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
James Pollack
c3ed2d9064 fix file paths 2015-09-10 17:10:55 -07:00
ericrius1
7969fb64ce tweaking distance threshold 2015-09-10 17:08:52 -07:00
James Pollack
1cec61ebba fire particles before burst sound 2015-09-10 17:05:24 -07:00
Seth Alves
94dc86833f Revert "edit.js adjustment" 2015-09-10 17:01:11 -07:00
James Pollack
387e7b74a9 Return wand to its original position if it hasnt moved for 5 seconds, better particles, wand scaled to human size 2015-09-10 16:58:39 -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
Stephen Birarda
c6aeee7036 fix for OSX_SDK default string 2015-09-10 15:28:03 -07:00
Stephen Birarda
9a33a48ba5 clarify OSX_SDK option 2015-09-10 15:25:30 -07:00
Stephen Birarda
973fd80c1d fail asset request if hash does not match 2015-09-10 15:24:37 -07:00
Stephen Birarda
2fa3ab7a14 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-09-10 15:09:13 -07:00
Stephen Birarda
699a9566c3 add option to specify OS X SDK for Xcode 7 2015-09-10 15:00:01 -07:00
David Rowe
4aa553c183 Stop DDE and EyeTracker early but don't destroy until later in shutdown 2015-09-10 14:53:56 -07:00
Seth Alves
a6a61d7e2f Merge pull request #5770 from birarda/master 
repair to packing of octree query from headless viewer
 2015-09-10 14:53:27 -07:00
Stephen Birarda
f58804a30e repair to packing of query data from headless viewer 2015-09-10 14:35:44 -07:00
Seth Alves
698ccc6fb0 don't change camera when edit.js is activated. don't highlight entites I mouse-hover over. 2015-09-10 13:48:36 -07:00
Brad Hefta-Gaub
8eacdbf1c4 first cut at making sure entity scripts are called on the entities script engine thread 2015-09-10 13:02:02 -07:00
Brad Hefta-Gaub
5a4a75f4cc Merge pull request #5767 from jherico/lisa 
Eliminate excessive debug logging from procedural setup
 2015-09-10 12:25:41 -07:00
James Pollack
ee7e25a137 remove localhost refs 2015-09-10 11:49:12 -07:00
Anthony J. Thibault
9a9838fd0d Clean up of AnimNodeLoader after merge from master. 2015-09-10 11:47:41 -07:00
Anthony J. Thibault
663e37da66 Merge branch 'master' into tony/ik-and-controllers 2015-09-10 11:37:47 -07:00
Anthony Thibault
e8ede3ad00 Merge pull request #5731 from ChristophHaag/master 
build fixes
 2015-09-10 11:36:45 -07:00
James Pollack
5df483b35f ignore 0,0,0 positions so we have accurate unload for bubbles 2015-09-10 11:32:21 -07:00