Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-28 04:50:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
14870 commits 71 branches 59 tags 1.2 GiB
Commit graph

642 commits

Author SHA1 Message Date
barnold1953
fc9fb11e4f Added FacialAnimationData class 2014-07-22 11:56:19 -07:00
Atlante45
c07ba9fec5 Added browser as a tool 2014-07-17 17:50:56 -07:00
Atlante45
7ab8b5a843 Added S3 browser 2014-07-17 17:12:54 -07:00
Brad Hefta-Gaub
d8d6d08958 Merge pull request #3145 from samcake/19734 
19734 - Leapmotion support
 2014-07-17 08:45:55 -07:00
Brad Hefta-Gaub
cc7da35722 Merge pull request #3177 from Barnold1953/OculusSDK 
Use deltaTIme to ensure sand updates are somewhat uniform
 2014-07-16 12:36:52 -07:00
barnold1953
44cf662904 Use deltaTIme to ensure sand updates are somewhat uniform 2014-07-16 12:06:48 -07:00
Brad Hefta-Gaub
8a1484ce68 Merge pull request #3174 from wdings23/fix_new_avatar_light 
Fix new avatar light
 2014-07-16 12:03:21 -07:00
Brad Hefta-Gaub
3dfb5030c5 Merge pull request #3175 from Barnold1953/OculusSDK 
Two new example scripts
 2014-07-16 12:02:37 -07:00
Atlante45
60f242118e Code cleanup 2014-07-16 11:52:12 -07:00
barnold1953
77b2dd695d fixed header 2014-07-16 11:34:31 -07:00
Atlante45
f960b4fff3 new windows JS interface 2014-07-16 11:32:18 -07:00
barnold1953
4483c7dc6b Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK 2014-07-16 11:24:32 -07:00
barnold1953
8b911c3e2c Finished up basic falling sand example script 2014-07-16 11:21:58 -07:00
barnold1953
f6a184fc2b Bug fixes in fallingSand 2014-07-16 11:10:59 -07:00
TonyPeng
7aae85833b Take out getter for avatar's hash key. 2014-07-16 10:08:49 -07:00
TonyPeng
90d56bc108 Use the number of local lights to update new avatars instead of checking hashes. 2014-07-15 16:10:13 -07:00
barnold1953
b339e9c2af Added getVoxelEnclosingPointBlocking and improved sand script 2014-07-15 11:44:59 -07:00
TonyPeng
4cea4d2838 Resolve upstrem conflict 2014-07-15 10:33:22 -07:00
Brad Hefta-Gaub
12f8cfbb67 Merge pull request #3167 from Atlante45/typed_arrays 
Typed arrays
 2014-07-15 08:31:02 -07:00
barnold1953
4991bf37a2 Added a brush for the voxel sand script 2014-07-14 17:54:34 -07:00
barnold1953
13960cd645 Basic falling sand script 2014-07-14 16:16:07 -07:00
TonyPeng
afc573b248 Took out debug print 2014-07-14 15:08:29 -07:00
TonyPeng
1aa20dff60 Expose light directions and colors for the avatar list in AvatarManager. Light parameter changes within the script will effect all the avatars currently in AvatarManager. 2014-07-14 13:59:57 -07:00
Atlante45
afa43a9d7e Fix win build fail 2014-07-14 11:06:10 -07:00
Andrew Meadows
8ffc3aa73d merge upstream/master into andrew/thermonuclear (AKA samcake/19734) 
Conflicts:
	interface/src/Application.cpp
 2014-07-14 09:10:27 -07:00
Philip Rosedale
2d4194cae5 fixes per review, clap animation requires double-tap to start 2014-07-13 23:33:02 -07:00
Atlante45
6d4bb0f4fd Added Uint8ClampedArray 2014-07-11 18:27:26 -07:00
Atlante45
5a8569fcd5 Handling NaN values for floats 2014-07-11 17:46:07 -07:00
barnold1953
829918e6c0 Added grenadeLauncher.js to examples. Sorry in advance for any damage 2014-07-11 17:23:13 -07:00
Atlante45
75573a4c06 Added exception checking to unit tests 2014-07-11 16:23:50 -07:00
Atlante45
d456adff1d Merge branch 'master' of https://github.com/highfidelity/hifi into typed_arrays 2014-07-11 12:44:53 -07:00
Brad Hefta-Gaub
56a6cb9184 Merge pull request #3160 from Atlante45/sitting_improvments 
Sitting improvments
 2014-07-11 11:48:42 -07:00
Atlante45
e067a013a0 Made sitting point more consistant 2014-07-11 11:22:38 -07:00
Atlante45
a9ceec4627 Switched sit.js spheres to billboards 2014-07-11 10:50:46 -07:00
Atlante45
2347bd7eed Sitting position persists between sessions 2014-07-11 10:47:48 -07:00
Atlante45
02c951fba5 Added bunch of Typed arrays unit tests 2014-07-10 18:34:17 -07:00
Atlante45
ff378b60ac Added functionnalities to JS UnitTests 2014-07-10 18:33:24 -07:00
barnold1953
6e92beeb1c Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.h
 2014-07-09 16:32:02 -07:00
Andrzej Kapolka
af6704a83c Merge pull request #3134 from wdings23/light_and_haze 
Added local lights to avatar. Added haze to voxel.
 2014-07-09 16:07:20 -07:00
Stephen Birarda
33e42ae272 Merge pull request #3149 from birarda/master 
add two new concert cameras to examples
 2014-07-09 15:51:56 -07:00
Stephen Birarda
d412e21008 add two new concert cameras to examples 2014-07-09 15:51:37 -07:00
TonyPeng
ef4b95c6e0 Merged from master. Get rid of redundant GL fog states. Moved local light parameters to shader uniform arrays. 2014-07-09 13:27:42 -07:00
TonyPeng
56eadcb0dc Get rid of redundant GL calls for fog. Enable and disable fog during rendering stage of voxels. Moved the local light parameters to shader uniform arrays. 2014-07-09 12:05:34 -07:00
Atlante45
a76ebae771 Added typed array unit test 2014-07-09 10:28:50 -07:00
Atlante45
49302b2340 Merge branch 'master' of https://github.com/highfidelity/hifi into typed_arrays 2014-07-09 09:49:34 -07:00
samcake
3ecaaa5a85 After HIfi visit, Fix skinning from javascript 
- Understood the skinning mechanism from an absolute transform in model
space that need to use a call to
//JointState::setRotationFromBindFrame(rotation, priority);

- This is not available from the javascript MyAvatar interface yet

- now require LeapMOtion SDK2.0.3 to support arms
 2014-07-08 23:57:37 -07:00
Philip Rosedale
b2912552f6 switched to better sounds for clapping 2014-07-08 21:00:02 -07:00
barnold1953
b5a9f50ae7 Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK 2014-07-08 17:15:35 -07:00
Philip Rosedale
40ad03dbf5 Another improvement to clapping to match animation pace with keystrokes 2014-07-08 14:53:41 -07:00
Philip Rosedale
e75b9dc832 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-08 11:43:45 -07:00