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

9427 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jose Carlos
b899834c54 Show "displayname" in correct position 
Show "displayname" when on mouse hover
Persistant displayname data
 2014-02-14 00:23:21 +01:00
Jose Carlos
319d1f6795 Wired up the send of the display data to the servers 
Added the renderDisplayName in Avatar
 2014-02-12 00:54:50 +01:00
Jose Carlos
665971c2ab Merge remote-tracking branch 'upstream/master' into 19489 2014-02-10 23:56:10 +01:00
Jose Carlos
b42c2a9dbe Centered text 2014-02-10 23:55:43 +01:00
AndrewMeadows
c517675edb Merge pull request #1931 from ey6es/master 
Fix for textures on Blender FBX exports (such as jellyrob_blue_blender.fbx).
 2014-02-10 14:27:44 -08:00
ZappoMan
d743df902a Merge pull request #1959 from birarda/authentication 
default domain is root again
 2014-02-10 11:25:44 -08:00
Stephen Birarda
230caf5b27 add the default body and head to the resources directory 2014-02-10 10:26:28 -08:00
Stephen Birarda
27305c7a43 change default domain to root, don't double load domains on startup 2014-02-10 10:23:06 -08:00
Philip Rosedale
f61fe77058 Merge pull request #1950 from ZappoMan/camera_lookat_support 
Camera lookat support
 2014-02-10 08:58:12 -08:00
ZappoMan
bdf5c7a6b7 changed stopKeepLookingAt() to stopLooking() 2014-02-09 23:26:46 -08:00
ZappoMan
221a5c75c7 remove debug 2014-02-09 23:22:10 -08:00
ZappoMan
d5447452ae more work on lookAt behavior 2014-02-09 21:06:32 -08:00
ZappoMan
a457ccf933 simple example of Camera.lookAt() 2014-02-09 16:25:18 -08:00
ZappoMan
c64a530be4 first cut at lookAt 2014-02-09 16:24:38 -08:00
Jose Carlos
4aa053befe Constant size in 3D world billboard text 2014-02-09 23:59:51 +01:00
Jose Carlos
d05fb392e0 Always facing camera billboard 
TODO: having constant fix size
 2014-02-09 23:39:53 +01:00
Philip Rosedale
e30e1ffe28 Merge pull request #1949 from ZappoMan/more_events 
Better multi-touch rotate gesture support
 2014-02-09 12:50:08 -08:00
ZappoMan
e35df7904b cleanup bad merge 2014-02-09 12:32:12 -08:00
ZappoMan
fe1a6b8f29 improvements to rotating gesture detection 2014-02-09 12:29:57 -08:00
Philip Rosedale
9d5e68913a Merge pull request #1948 from ZappoMan/more_events 
Several new JS events features
 2014-02-09 12:14:59 -08:00
ZappoMan
dca0b05927 added easier support for calculating multitouch rotating behavior including deltaAngle, isRotating, rotating(direction) properties 2014-02-09 12:08:17 -08:00
ZappoMan
3bf8dd87e8 Merge branch 'master' of https://github.com/worklist/hifi into more_events 2014-02-09 10:32:14 -08:00
ZappoMan
3f4af9f363 Merge pull request #1944 from PhilipRosedale/master 
Audio Noise Reduction,  Edit voxels with script
 2014-02-09 10:29:05 -08:00
Jose Carlos
128219b9f6 Merge branch '19489-2' into 19489 2014-02-09 15:51:07 +01:00
ZappoMan
9c21eb7949 removed comments 2014-02-09 02:56:26 -08:00
ZappoMan
70c5e674e9 add rotating detection to touch events 2014-02-09 02:54:12 -08:00
ZappoMan
d2b3e74f5d added isPinching and isPinchOpening to touch events 2014-02-09 02:02:42 -08:00
ZappoMan
120807f9ba add touch event radius 2014-02-09 01:31:48 -08:00
ZappoMan
02e6a3336d added several new JS events attributes 2014-02-09 01:05:27 -08:00
ZappoMan
8d89e05900 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-09 00:30:48 -08:00
Philip Rosedale
cfa7f5e6ca Add drag to add more voxels, turn off hover orbit voxels until in the script as function key 2014-02-08 23:17:04 -08:00
Philip Rosedale
6b0c31e6e9 Script for editing voxels with mouse clicks 2014-02-08 20:47:02 -08:00
Philip Rosedale
9655e93432 Remove re-coloring of voxels on hover or click, anticipating switch to scripted behavior 2014-02-08 19:13:43 -08:00
Philip Rosedale
c6bf11361e Merge branch 'master' of https://github.com/worklist/hifi 2014-02-08 16:52:28 -08:00
Philip Rosedale
7dce067014 Merge pull request #1943 from ZappoMan/ray_cast_scripting 
JavaScript support for Voxels.findRayIntersection()
 2014-02-08 16:47:30 -08:00
Philip Rosedale
03bc5adf64 Add Audio Noise Reduction 2014-02-08 16:35:37 -08:00
ZappoMan
bd0953131e Merge branch 'master' of https://github.com/worklist/hifi 2014-02-08 12:52:36 -08:00
ZappoMan
07585dbe5b add scripts to voxels 2014-02-08 12:07:24 -08:00
ZappoMan
c9fd4b5e6b add back animation-server in cmake unix 2014-02-08 11:45:20 -08:00
ZappoMan
56c383891c revert animation-servers cmake 2014-02-08 11:44:48 -08:00
ZappoMan
ad8683a4a9 Merge pull request #1937 from birarda/master 
pools are allowed to have dashes
 2014-02-08 11:36:35 -08:00
ZappoMan
df4e2c4273 revert 2014-02-08 11:01:32 -08:00
ZappoMan
c0858cdaef remove animation server from unix to see if that addresses build buster, temporary solution 2014-02-08 10:54:34 -08:00
ZappoMan
b3ec273e33 remove animation server from unix to see if that addresses build buster, temporary solution 2014-02-08 10:53:33 -08:00
Philip Rosedale
f5bbdc2c65 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-08 10:35:25 -08:00
ZappoMan
ef7dee4387 Merge branch 'master' of https://github.com/worklist/hifi into ray_cast_scripting 2014-02-07 18:34:43 -08:00
ZappoMan
e517125cfb Merge pull request #1938 from AndrewMeadows/fix-mouselook 
Fix mouselook
 2014-02-07 18:34:09 -08:00
Andrew Meadows
6b2c7c556d Fixing mouselook. 
Faceshift head rotations are stored separately and then integrated into
the final (rendered) head rotation at the right times but do not affect
the camera.
 2014-02-07 17:46:14 -08:00
Andrew Meadows
8c3ba5b2de Cruft removal. We don't use Head::YawRate stuff. 2014-02-07 17:45:25 -08:00
Andrew Meadows
3894fc0cb8 Minor comment change. 2014-02-07 17:44:43 -08:00