Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 06:06:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
53750 commits 76 branches 59 tags 1.2 GiB
Commit graph

53750 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
b4ff3a8691 don't destroy and recreate constraints when reinserting rigid body 2017-04-15 21:08:59 -07:00
Seth Alves
d42970d480 fix hinge-constraint constructors to use otherAxis 2017-04-15 08:51:08 -07:00
Seth Alves
db98020974 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-15 07:22:16 -07:00
Sam Cake
61ed5c3ce9 THank you mac 2017-04-15 01:35:28 -07:00
Sam Cake
2b97171061 Avoiding temp variable reference to appease mac and fixing a warning 2017-04-15 01:06:01 -07:00
Sam Cake
038d01ce04 Avoiding temp variable reference to appease mac and fixing a warning 2017-04-15 00:45:50 -07:00
Sam Cake
96960a505d COmpleted the Resource Buffer, compilation and binding works. Now need to help on the shader side 2017-04-14 23:22:45 -07:00
Zach Fox
e65079f826 Merge pull request #10224 from zfox23/fixGifSharing 
Fix GIFs not sharing
 2017-04-14 18:44:41 -07:00
Seth Alves
2a76061ef3 Merge branch 'bullet-constraints-0' of github.com:sethalves/hifi into bullet-constraints-1 2017-04-14 16:38:50 -07:00
Seth Alves
5fba4654c8 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0 2017-04-14 16:37:48 -07:00
Seth Alves
41fb05ecf7 bump protocol version 2017-04-14 16:26:54 -07:00
Seth Alves
371118a6c0 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-14 16:26:30 -07:00
Zach Fox
b410399a16 Resolve your paths, silly! 2017-04-14 16:26:29 -07:00
Seth Alves
f08fecbfa7 make sure new constraint data gets transmitted over network 2017-04-14 16:25:27 -07:00
Zach Fox
85e5173abe Fix embedded location 2017-04-14 16:11:37 -07:00
Zach Fox
f81dce5e70 Fix the bug 2017-04-14 15:42:19 -07:00
Seth Alves
66137e78a2 grab script checks for touch devices continually, rather than just when the script starts 2017-04-14 15:28:56 -07:00
Andrew Meadows
6a8ddee878 send keep-alive packets but don't resend identity 2017-04-14 15:16:14 -07:00
Andrew Meadows
06b9fd6a7e don't keep stale avatars alive 2017-04-14 15:16:02 -07:00
Andrew Meadows
d72f6cf45e avatar-mixer to send identity packets as 'reliable' 2017-04-14 15:15:54 -07:00
Andrew Meadows
eaefa3d3f2 avatar-mixer resends to avoid stale avatar 2017-04-14 15:15:45 -07:00
Chris Collins
6a6800b8c3 Merge pull request #10222 from sethalves/fix-late-touch-cant-grab-tablet 
fix can't grab tablet
 2017-04-14 14:57:06 -07:00
Andrew Meadows
45bb639ef5 Merge pull request #10128 from kunalgosar/fingerpainting 
Make it easier to exit FingerPaint
 2017-04-14 14:34:57 -07:00
Seth Alves
110cfb47d1 turn off handControllerGrab debug prints 2017-04-14 14:23:27 -07:00
Seth Alves
6420ddd038 grab script checks for touch devices continually, rather than just when the script starts 2017-04-14 14:20:04 -07:00
kunalgosar
891d52909e fixed typo in comments 2017-04-14 14:10:19 -07:00
Seth Alves
708008d8a5 cleanups 2017-04-14 13:43:48 -07:00
Sam Gateau
3519a72f8a Merge pull request #10190 from samcake/ambient-bis 
Introducing a tool to debug the current Zone Stack
 2017-04-14 13:28:59 -07:00
Seth Alves
07b23b8235 expose other hinge-constraint parameters to javascript 2017-04-14 13:28:25 -07:00
Zach Fox
a4587e33f3 Tiny forward/backward icon updates 2017-04-14 13:19:33 -07:00
Seth Alves
d17d12446b Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-14 12:49:03 -07:00
Seth Alves
d0144f4110 avatar-action-far-grab works now 2017-04-14 12:44:54 -07:00
Zach Fox
a623ced64e Fix hover states on back/forward buttons 2017-04-14 12:43:07 -07:00
Thijs Wenker
6f58e91d76 Merge pull request #10121 from birarda/bug/recording-cache 
cleanup Agent RSI handling, make loadRecording async
 2017-04-14 21:35:51 +02:00
Stephen Birarda
7b48feca66 address code review comments 2017-04-14 11:53:53 -07:00
Seth Alves
1009182c06 grab and handControllerGrab use new far-grab action 2017-04-14 11:52:07 -07:00
Seth Alves
b1dc5be316 make far-grab it's own action (which is just like spring) in order to avoid bootstrapping own avatar 2017-04-14 11:48:06 -07:00
Sam Cake
f991475004 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-04-14 11:33:21 -07:00
Seth Alves
2dab3069da fix bug that was causing spring action to cause constant re-insertion of its rigidbody into bullet. store UUIDs rather than shared pointers in _objectDynamicsByBody so that refcounting works right and actions get their destructors called. 2017-04-14 11:06:40 -07:00
Dante Ruiz
863d64b2fd removed comments and non-needed files 2017-04-14 18:06:44 +01:00
samcake
17de3d1e28 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-04-14 10:03:03 -07:00
Chris Collins
e789492b34 Merge pull request #10212 from AndrewMeadows/avoid-invisible-avatars-003 
avoid invisible avatars when source interface stops sending updates to avatar-mixer
 2017-04-14 09:25:20 -07:00
Chris Collins
1eb3c5273f Merge pull request #10217 from sethalves/enable-grab-debug-prints 
turn on handControllerGrab debug prints
 2017-04-14 09:15:28 -07:00
Dante Ruiz
7189d4d7fa daving web work 2017-04-14 17:01:23 +01:00
Seth Alves
af5a352f02 turn on handControllerGrab debug prints 2017-04-14 08:10:31 -07:00
Seth Alves
f5a5369055 attempt to remove dynamics associated with a rigid-body before removing the rigid-body 2017-04-14 07:06:53 -07:00
Seth Alves
52aee63e05 keep track of objectDynamics per rigidBody 2017-04-14 06:08:58 -07:00
Sam Cake
bb15b8c701 ANd fixing the gl41 rendering 2017-04-14 00:46:41 -07:00
Sam Cake
29545f0918 FInally bringing all the shader compilation related fuinctions in the Backend in the same cpp, making specialized version based on the Backend 2017-04-13 23:53:56 -07:00
Zach Fox
0543709081 Focus fix 2017-04-13 16:10:36 -07:00