Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-12 09:34:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
35141 commits 76 branches 59 tags 1.2 GiB
Commit graph

35141 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
8bf5e3b429 Merge pull request #6469 from AlessandroSigna/groupRecording 
Group recording - overlay added
 2015-11-23 18:06:20 -08:00
AlessandroSigna
70cf5c6726 fixed icon position 2015-11-23 17:59:31 -08:00
AlessandroSigna
489cde7269 removed the local save of the recording 2015-11-23 17:51:58 -08:00
Eric Levin
40be9ae121 Commented out whiteboard cleanup 2015-11-23 17:15:26 -08:00
AlessandroSigna
44c95c13fb further UI fixes 2015-11-23 16:57:24 -08:00
Brad Hefta-Gaub
82ff0af05c Merge pull request #6472 from murillodigital/stack-manager 
Stack manager - integration checkpoint
 2015-11-23 16:53:53 -08:00
Leonardo Murillo
f759fa2cfa Ubuntu fixes 2015-11-23 18:30:40 -06: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
Leonardo Murillo
d58b11f0a2 Ubuntu fix - case sensitivity¨ 2015-11-23 18:13:41 -06:00
Leonardo Murillo
66803ce356 Ubuntu fix - case sensitivity¨ 2015-11-23 18:04:36 -06:00
Leonardo Murillo
fee50a56e5 Ubuntu fix - case sensitivity 2015-11-23 18:02:20 -06:00
Anthony J. Thibault
8f46b8a765 Added USE_PRE_ROT_FROM_ANIM option to AnimClip 
This will allow us in the future to pull preRotations from
animations instead of the model skeleton.  It is disabled
by default because our current animations preRotations are
not correct for the left hand.
 2015-11-23 15:58:18 -08:00
Stephen Birarda
6339c2c48f fix for unnecessary model URL updating 2015-11-23 17:25:31 -06:00
Philip Rosedale
5c390473e7 Merge pull request #6470 from birarda/ghost-avatar 
use MIN_AVATAR_SCALE to ensure avatar fades complete
 2015-11-23 15:04:59 -08:00
Stephen Birarda
905e11faa3 use MIN_AVATAR_SCALE to ensure avatar fades complete 2015-11-23 16:54:17 -06:00
AlessandroSigna
8f1ce6e1fb overlay added - waiting for official logos 
missing null assignment
 2015-11-23 14:52:16 -08:00
Leonardo Murillo
b83e466767 Removing comments 2015-11-23 16:31:29 -06:00
Stephen Birarda
0997d3dcae resolve conflicts on merge with upstream/master 2015-11-23 16:15:15 -06:00
Anthony J. Thibault
8252bbed9b AnimSkeleton: added pre rotation accessor methods 2015-11-23 13:50:14 -08:00
Clément Brisset
a261b240aa Merge pull request #6466 from samcake/controllers 
Adding the AssetClient to the Agent
 2015-11-23 13:35:50 -08:00
Andrew Meadows
865729ef26 Merge pull request #6463 from sethalves/fix-observers-dont-see-equip-motion 
fix bug where observers don't see a held/equipped object moving
 2015-11-23 13:17:29 -08:00
Leonardo Murillo
8b573cebfb Successfull windows build given any build type checkpoint 2015-11-23 15:16:48 -06:00
James B. Pollack
0fd389b02f remove arrowTest 2015-11-23 12:53:58 -08:00
David Rowe
d73e3a5490 Fix avatar pitch rate depending on FPS 2015-11-24 09:48:37 +13:00
David Rowe
f5d66bbf2e Fix avatar rotation rate depending on FPS 2015-11-24 09:42:12 +13:00
James B. Pollack
c22a07bba7 bow collisions, etc 2015-11-23 12:36:39 -08:00
samcake
25654824a2 Copy pasting the code that Stephen did and also adding the AssetServer to the list of dependent nodes for the agent 2015-11-23 12:32:27 -08:00
ericrius1
1409ed2d18 moved logic to build vertices buffer to renderable class, recalculating vertices anytime any of the normals, point, or strokeWidths data changes 2015-11-23 12:28:44 -08:00
Leonardo Murillo
ec6be93938 Merge branch 'master' of https://github.com/highfidelity/hifi into stack-manager 2015-11-23 14:22:05 -06:00
Leonardo Murillo
8e12e32dd2 Checkpoint - Windows specifics 2015-11-23 14:21:06 -06:00
Seth Alves
d4937071e1 rather than activating rigid body and forcing non-static on deserialize, just force non-static 2015-11-23 12:17:15 -08:00
Eric Levin
7e8b692499 Update whiteboardEntityScript.js 
Removed logging
 2015-11-23 12:04:13 -08:00
samcake
301f0ba145 Trying to instenciate the AssetCLient in the Agent 2015-11-23 11:48:02 -08:00
samcake
5f2944c41e Merge pull request #6445 from AlessandroSigna/groupRecording 
DO NOT MERGE Group recording - upload performance file on asset
 2015-11-23 11:25:02 -08:00
Seth Alves
c3821d7202 avoid deadlock 2015-11-23 11:24:56 -08:00
James B. Pollack
aa2450d755 cleanup, debugging script 2015-11-23 11:15:36 -08:00
Anthony J. Thibault
dd3f43705c Fix for Model Entity animations. 
Because rig->setJoint* methods take parameters in geometry space
the animations preRotation has to be applied manually.
 2015-11-23 11:06:11 -08:00
Seth Alves
5612174894 call activateBody when a hold action is deserialized 2015-11-23 11:02:41 -08:00
Howard Stearns
c94a5389a0 comments 2015-11-23 10:31:37 -08:00
Howard Stearns
5912808077 getShouldSkipRendering() => !getShouldRender(). 2015-11-23 10:27:49 -08:00
Howard Stearns
f1e0742aeb Add getTargetFrameRate(). 2015-11-23 10:20:59 -08:00
ericrius1
08a64f6a6b updated whiteboard to use new controller approach' 2015-11-23 10:08:23 -08:00
Seth Alves
6f19093cb9 if an entity with an action has a motion-type of static, flag it so it gets updated in bullet 2015-11-23 10:03:35 -08:00
James B. Pollack
b6d0be0090 Merge branch 'master' into bow 2015-11-23 10:03:15 -08:00
Brad Davis
64ba5b4f14 Cleaning up old recording files 2015-11-23 09:42:34 -08:00
James B. Pollack
8e81c3252a cleanup and mostly? working 2015-11-22 22:24:42 -08:00
James B. Pollack
aa832311f5 add beam disabler 2015-11-22 22:12:43 -08:00
Anthony J. Thibault
db21db3cbc Rig.h: more coordinate space comments 2015-11-22 16:34:06 -08:00
Anthony J. Thibault
dc169dc0aa Rig.h: updated comments with coordinate spaces 2015-11-22 16:21:22 -08:00
Anthony J. Thibault
821264a031 Merge branch 'master' of github.com:highfidelity/hifi into tony/remove-joint-states 2015-11-22 16:15:03 -08:00