Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 15:32:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
59816 commits 75 branches 59 tags 1.2 GiB
Commit graph

59816 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
a4564f89d7 traversals work and cull checks of unchanged content 2017-09-29 11:34:33 -07:00
Andrew Meadows
8d535f9c5a remove bump to changeFromRemote for server case (revert) 2017-09-29 11:34:33 -07:00
Andrew Meadows
3665a3fbee libraries/entities/src/EntityTreeElement.cpp 2017-09-29 11:34:33 -07:00
Andrew Meadows
dd1febba2f add missing bump to element changed content 2017-09-29 11:34:33 -07:00
Andrew Meadows
91908ca3da moved TreePathTraversal logic into EntityTreeSendThread 2017-09-29 11:34:33 -07:00
Andrew Meadows
bf27412091 cleanup 2017-09-29 11:34:33 -07:00
Andrew Meadows
64fa3ec88f repeated and differential view traversals work 2017-09-29 11:34:33 -07:00
Andrew Meadows
481df49386 on server: note time of entity edit by remote 2017-09-29 11:34:33 -07:00
Andrew Meadows
648b8ff054 fix repeated and differential traversals 2017-09-29 11:34:33 -07:00
Andrew Meadows
929d52276e minor cleanup 2017-09-29 11:34:33 -07:00
Andrew Meadows
2b31a746e3 add content timestamp for EntityTreeElement 2017-09-29 11:34:32 -07:00
Andrew Meadows
ca470d67b4 fix indentation 2017-09-29 11:34:32 -07:00
Andrew Meadows
7edd99ca0b add basics for send queue and tree traversal 2017-09-29 11:34:32 -07:00
Andrew Meadows
3ae5c215ba stub EntityTreeSendThread::traverseTreeAndSendContents() 2017-09-29 11:34:32 -07:00
Andrew Meadows
82ed19386f make Octree::readBitstreamToTree() virtual 2017-09-29 11:34:32 -07:00
Andrew Meadows
171151b92a use new form of MovingEntitiesOperator ctor 2017-09-29 11:34:32 -07:00
Andrew Meadows
56bc48b31a don't use octcode data in entity update packets 2017-09-29 11:34:32 -07:00
Andrew Meadows
55e9ced5c3 cleanup MovingEntitiesOperator 2017-09-29 11:34:32 -07:00
Andrew Meadows
4fa60f5108 cleanup AddEntityOperator 2017-09-29 11:34:32 -07:00
SamGondelman
fcfac9efc0 no tpose when switching avatars 2017-09-29 11:14:29 -07:00
Brad Davis
a7d507e9fd Disable watchdog with environment variable 2017-09-29 10:44:04 -07:00
Seth Alves
e7705175a3 Merge pull request #11481 from ZappoMan/animatedOverlays 
support animation of model overlays
 2017-09-29 10:26:24 -07:00
samcake
395d7c3157 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-29 10:04:44 -07:00
anshuman64
0eec99c448 Merge pull request #11485 from hyperlogic/bug-fix/bad-oculus-head-offset 
Oculus: Bug fix for head offset on large/small scaled avatars.
 2017-09-29 10:01:18 -07:00
ZappoMan
9c81bc5479 CR fixes 2017-09-29 09:52:30 -07:00
samcake
3265fe62ad Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-29 09:09:27 -07:00
vladest
01a0b26b90 Remove mouse area for text fields. use activeFocusOnPress property instead 2017-09-29 17:14:35 +02:00
Chris Collins
da3d5a92d9 Merge pull request #11488 from sethalves/fix-grab-drop-and-leave-bug 
server only deletes an entity if it's still the child of an avatar, not if it has ever been
 2017-09-29 07:55:23 -07:00
vladest
d3cd034d61 Cleanup 2017-09-29 16:33:52 +02:00
vladest
174287c5f5 Merge branch 'master' into login_dialog_rework 2017-09-29 15:57:27 +02:00
Seth Alves
7645808694 Merge pull request #11479 from druiz17/more-bugs 
fixing grabbing and tablet bugs
 2017-09-28 20:02:47 -07:00
Seth Alves
72cacc4cef server only deletes and entity if it's still the child of an avatar, not if it has ever been 2017-09-28 19:56:15 -07:00
Sam Gateau
3562a4be96 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-28 19:31:20 -07:00
Atlante45
af69222fdb Fix icon name change 2017-09-28 18:34:42 -07:00
Seth Alves
bd8dbe4aae Merge pull request #11483 from zfox23/fixEntityAdd 
Fix entity add after incomplete rezCertified implementation
 2017-09-28 17:45:57 -07:00
samcake
e637842f8a Separating some of the code sepecific to render in its own cpp 2017-09-28 17:45:50 -07:00
Seth Alves
3d05a0c07c Merge pull request #11484 from druiz17/grab-js 
disable grab.js in HMD
 2017-09-28 17:27:26 -07:00
Howard Stearns
d1350a03c2 working checkpoint, but with a lot of debug/development stuff 2017-09-28 17:06:07 -07:00
Thijs Wenker
2ec2203ffa Merge pull request #11482 from highfidelity/bug/edit.js-opendialog-callback-stack-keeps-growing 
Bugfix: edit.js dialog callback events stacking up
 2017-09-28 17:00:54 -07:00
Zach Fox
a1ae13489e Slight changes to tutorial 2017-09-28 16:41:29 -07:00
Anthony J. Thibault
d8e2cbf871 Oculus: Bug fix for head offset on large/small scaled avatars. 2017-09-28 16:20:09 -07:00
druiz17
45b8bfdb1f disbale grab.js in HMD 2017-09-28 16:17:39 -07:00
Zach Fox
4814f277c1 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2 2017-09-28 16:07:32 -07:00
Zach Fox
0f66fb41fd Fix entity add after incomplete rezCertified implementation 2017-09-28 16:07:15 -07:00
Thijs Wenker
cabd68a63a Every time a dialog opened in edit.js a new callback is created, which wasn't disconnected after the event happened, this caused lots of entities to be created after each next import. 2017-09-28 16:03:09 -07:00
ZappoMan
be7729b276 support animation of model overlays 2017-09-28 15:14:59 -07:00
Zach Fox
2cff5c1fa6 First time Purchases tutorial 2017-09-28 15:12:55 -07:00
samcake
c112a3baf1 Seting up of camera and avatar correctly in game loop, not in render loop 2017-09-28 15:09:49 -07:00
Zach Fox
66be558a04 My Items Interface 2017-09-28 14:04:57 -07:00
vladest
4023c40149 Cleanup 2017-09-28 22:55:01 +02:00