Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 07:24:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
51529 commits 25 branches 0 tags 1.1 GiB
Commit graph

51529 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
8c232b5abb Initialize max offset to infinity 2017-02-27 16:38:55 -08:00
Atlante45
bf3a69a0b3 Add 2D UI when close to the seat 2017-02-27 16:38:55 -08:00
Atlante45
187cd0d5cf Get IK error and stand up based on it 2017-02-27 16:38:55 -08:00
Atlante45
8e9fc83759 Fix sit anim reference 2017-02-27 16:38:55 -08:00
Atlante45
69ce0a383e Add sitting animations 2017-02-27 16:38:54 -08:00
Atlante45
53948b8547 Check other avatar, disable movement in edit mode 2017-02-27 16:38:54 -08:00
Atlante45
1dbc133f12 Add animation state handler to the script 2017-02-27 16:38:54 -08:00
Atlante45
9033242584 More sit script work 2017-02-27 16:38:54 -08:00
Atlante45
1b2120d7e1 Sit script first draft 2017-02-27 16:38:54 -08:00
Atlante45
7132969083 Add hips pinning capability to MyAvatar 2017-02-27 16:38:54 -08:00
Atlante45
6821c8621f More sit work 2017-02-27 16:38:54 -08:00
Atlante45
cc5967e8f9 Pull part of the Out Of Body Exp code 2017-02-27 16:38:53 -08:00
Ryan Huffman
40b238c12e Add new teleport seat model + beam 2017-02-27 16:38:53 -08:00
Ryan Huffman
c632884aac Update teleport script to handle detecting seats 2017-02-27 16:38:53 -08:00
Ryan Huffman
9197819291 Cleanup teleport to make use of new TARGET 2017-02-27 16:38:53 -08:00
Ryan Huffman
b8c7905fa4 Cleanup some duplication of code in teleport.js 2017-02-27 16:38:53 -08:00
Chris Collins
53505d6013 Merge pull request #9787 from samcake/flash 
Fix the broken normals on Seth's avatar
 2017-02-27 15:51:36 -08:00
Chris Collins
a8ae693cef Merge pull request #9786 from druiz17/tablet-scaling-fix 
Tablet homebutton dimension and position now scales with tablet
 2017-02-27 15:51:02 -08:00
samcake
f050cc31f2 Backing up from the rgba format to go back to a rgb 888 just to repair the broken normals on Seth's Avatar 2017-02-27 13:32:24 -08:00
Dante Ruiz
b0b203edf9 Merge branch 'master' into tablet-scaling-fix 2017-02-27 19:34:58 +00:00
Dante Ruiz
21c15927cf Homebutton dimension and position scales with tablet 2017-02-27 19:33:52 +00:00
Ryan Huffman
5b59939195 Merge pull request #9602 from huffman/feat/shortbow-entity-server 
Add shortbow to marketplace scripts
 2017-02-27 11:09:52 -08:00
Brad Hefta-Gaub
795ff9a531 Merge pull request #9760 from birarda/bug/ess-crashes 
fix a crash in ESS on ES shutdown
 2017-02-26 22:29:39 -08:00
Andrew Meadows
6269284b3d Merge pull request #9758 from kunalgosar/passwordmatchingbug 
Fix Password Setting Bug
 2017-02-26 16:37:16 -08:00
Andrew Meadows
dbd1526d56 Merge pull request #9757 from kunalgosar/EntityFocusFix 
Fix for Web Entity not leaving Focus
 2017-02-26 16:35:55 -08:00
Stephen Birarda
f213b32167 clear the entity viewer before restarting ESS script engine 2017-02-26 09:38:51 -08:00
Philip Rosedale
4925b3c47c Merge pull request #9756 from ctrlaltdavid/21122 
Point index finger and raise thumb if not touching controller
 2017-02-25 14:59:48 -08:00
Seth Alves
6a7e04f052 Merge pull request #9733 from hyperlogic/bug-fix/script-engine-double-destroy 
Make Debug defaultScripts.js option less error prone.
 2017-02-25 08:57:23 -08:00
kunalgosar
a4e0d970bf Fix security section of domain server 2017-02-24 19:03:30 -08:00
kunalgosar
d6c1f1c99a Fixed Wed Entity not leaving Focus 2017-02-24 18:18:48 -08:00
David Rowe
0cc499b08b Point index fingers and raise thumbs if not touching controls 2017-02-25 14:20:23 +13:00
Ryan Huffman
e47b1be9cf Update shortbow spawning to use precise picking to find the ground 2017-02-24 14:48:22 -08:00
Ryan Huffman
85099513cd Reduce enemy lifetime to 30s 2017-02-24 14:48:01 -08:00
David Rowe
a205d2a00c Use animation for pointing index finger instead of setting joint angles 2017-02-25 11:36:06 +13:00
Chris Collins
8e91fc3dde Merge pull request #9748 from ZappoMan/avatarBandwidthBudgetImprovements 
fix avatars slightly out of view in large audience from freezing
 2017-02-24 13:57:56 -08:00
Howard Stearns
a9b8045697 Merge pull request #9720 from howard-stearns/filter-pal-by-view-distance 
Filter pal by view distance
 2017-02-24 11:10:13 -08:00
Brad Hefta-Gaub
60fd4afc4d don't count NoData avatars as having been broadcast, fix avatars slightly out of view from freezing 2017-02-23 18:52:10 -08:00
Chris Collins
e723385df2 Merge pull request #9726 from ZappoMan/avatarBandwidthBudgetImprovements 
Avatar bandwidth budget improvements
 2017-02-23 17:12:18 -08:00
Ryan Huffman
efd1a5c600 Update parameter name in getPropertiesForEntities 2017-02-23 16:38:28 -08:00
Ryan Huffman
0da9f72c42 Update spawn position/rotation of bows in shortbow 2017-02-23 16:05:12 -08:00
Ryan Huffman
4c310e1048 Update shortbow to use spawner entities to specify position/rotation at runtime 2017-02-23 16:02:56 -08:00
Brad Hefta-Gaub
1b7ec7d61e Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements 
Conflicts:
	libraries/avatars/src/AvatarData.cpp
 2017-02-23 13:50:16 -08:00
Brad Hefta-Gaub
1e91f74ce7 clean up some uneedded nullptr checks, make them asserts 2017-02-23 13:32:35 -08:00
Andrew Meadows
ed932fead5 Merge pull request #9611 from kunalgosar/AvatarEntityMapMetaObj 
Add QMetaObject for AvatarEntityMap
 2017-02-23 13:27:55 -08:00
Ryan Huffman
c8ec5cbf5d Fix coding standard issues in shortbow 2017-02-23 13:15:14 -08:00
Brad Hefta-Gaub
8cb8d686ec more cleanup and some CR feedback fixes 2017-02-23 13:09:39 -08:00
Chris Collins
57beeeefb9 Merge pull request #9739 from sethalves/stable-to-master-update 
Stable -> Master update
 2017-02-23 13:09:00 -08:00
Seth Alves
c765c8da73 pull stable into master 2017-02-23 11:57:32 -08:00
Anthony J. Thibault
84b29c6872 Reload all scripts when Debug defaultScripts.js is changed. 2017-02-23 11:02:25 -08:00
Brad Hefta-Gaub
f61e16fccf more aggressive out of view data culling 2017-02-23 11:01:55 -08:00