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

33356 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
066696e201 don't go into continue-far-grabbing-non-colliding mode. 2015-10-16 11:18:41 -07:00
Seth Alves
fe709a9397 keep object active in kinematic mode, also 2015-10-16 10:53:33 -07:00
Seth Alves
966499b9e5 continually activate (in the bullet sense) a held object 2015-10-16 10:17:17 -07:00
Seth Alves
937959c1c1 cleanups 2015-10-16 09:57:27 -07:00
Seth Alves
d2b7e5c4eb Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes 2015-10-16 09:54:26 -07:00
Seth Alves
8338491c3b Merge pull request #6095 from Atlante45/master 
Fix export bug
 2015-10-16 07:32:56 -07:00
Seth Alves
b18bb1e076 Merge pull request #6084 from AndrewMeadows/physics-cleanup 
move DIRTY_FLAGS out of EntityItem namespace
 2015-10-16 07:22:40 -07:00
Seth Alves
359a318568 fold kinematic hold into normal hold (disabled by default, an argument enables) 2015-10-15 20:23:06 -07:00
Atlante45
a84fdecec9 Fix export bug 2015-10-15 18:43:32 -07:00
Brad Hefta-Gaub
26f82e899e Merge pull request #6079 from ericrius1/whiteboard 
Entity whitelist for raypicking and whiteboard painting example
 2015-10-15 17:50:35 -07:00
Brad Hefta-Gaub
c3ee419ad7 Merge pull request #6086 from imgntn/flashlight_life 
[Scripts] Add lifetime to lights created by flashlight
 2015-10-15 17:42:57 -07:00
Seth Alves
0964180f2c code review 2015-10-15 17:10:47 -07:00
ericrius1
97fe0170cb glowing box for black color 2015-10-15 17:09:41 -07:00
Stephen Birarda
e5825daa57 Merge pull request #6090 from ZappoMan/fixStat 
Add some additional stats for debugging edit lags
 2015-10-15 16:00:29 -07:00
Brad Hefta-Gaub
3718149157 include inbound queue PPS stats in server stats page 2015-10-15 15:49:12 -07:00
Ryan Huffman
421e2a6c21 Merge pull request #6078 from imgntn/top_tool_tabs 
Move  Edit.js Tool Window Tabs to the Top
 2015-10-15 15:40:42 -07:00
Brad Hefta-Gaub
e1570e3197 include inbound queue PPS stats in server stats page 2015-10-15 15:31:52 -07:00
Brad Hefta-Gaub
82a211174b added packet recieved,lost,recovered stats to detailed server stats page 2015-10-15 15:23:12 -07:00
James B. Pollack
aee11d4c06 cleanup merge 2015-10-15 15:05:34 -07:00
James B. Pollack
112007e5a9 cleanup 2015-10-15 14:58:05 -07:00
Seth Alves
462918ffcf cleanups 2015-10-15 14:55:17 -07:00
Seth Alves
487131dde1 cleanups 2015-10-15 14:52:38 -07:00
Seth Alves
36a523478f Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes 2015-10-15 14:21:30 -07:00
Seth Alves
4903db45b1 give other avatars an anim-skeleton 2015-10-15 14:21:06 -07:00
James B. Pollack
8b57b3c0ff fix memory leak 2015-10-15 14:13:07 -07:00
ericrius1
e8b6b32572 Remembering whiteboards last color between sessions 2015-10-15 14:12:15 -07:00
Andrew Meadows
3d17c57910 Merge pull request #6083 from sethalves/groundwork-for-hold-action-changes 
Groundwork for hold action changes
 2015-10-15 13:30:02 -07:00
James B. Pollack
e63ed5cf84 Merge pull request #6087 from thoys/20708 
CR for Job #20708 - Script Editor Improvements
 2015-10-15 12:28:32 -07:00
Brad Hefta-Gaub
923e1ed208 add more processing stats 2015-10-15 12:21:36 -07:00
Brad Hefta-Gaub
93113af2d2 improve server error message for failed edit 2015-10-15 11:55:20 -07:00
Stephen Birarda
b6a2cc396c Merge pull request #6089 from ZappoMan/fixStat 
fix Queue OUT stat
 2015-10-15 11:53:34 -07:00
ericrius1
dc6875f5b5 Strokes moving forward to avoid zfighting and incorrect overlaps 2015-10-15 11:50:23 -07:00
Seth Alves
a70ba4cd5a add some accessors 2015-10-15 11:42:53 -07:00
Brad Hefta-Gaub
b7c40c2df1 fix Queue OUT stat 2015-10-15 11:41:04 -07:00
ericrius1
3b59bffb79 Deleting only strokes from the whiteboard where the erase button was clicked on 2015-10-15 11:38:18 -07:00
Seth Alves
1d8db13f41 switch to low-entity-server traffic hold 2015-10-15 10:56:47 -07:00
Seth Alves
c884f466bc adjust timing of action refresh 2015-10-15 10:40:58 -07:00
Seth Alves
64c5cde2d2 further unmangle branch split 2015-10-15 10:33:58 -07:00
Seth Alves
a78728c96b further unmangle branch split 2015-10-15 10:29:25 -07:00
Seth Alves
e571cb7ca4 more lock adjustments 2015-10-15 10:22:25 -07:00
Seth Alves
8195145dc7 further unmangle branch split 2015-10-15 10:13:00 -07:00
ericrius1
55c68e0509 Merge branch 'master' into whiteboard 2015-10-15 10:08:32 -07:00
James B. Pollack
d8c979b9d4 add lifetime to lights created by flashlight 2015-10-15 10:07:21 -07:00
Seth Alves
d833fb08d7 further unmangle branch split 2015-10-15 10:03:32 -07:00
Andrew Meadows
2ae62de84e Merge pull request #6026 from birarda/qt-polling-env 
set bearer poll timeout env for wlan scan in Qt 5.5
 2015-10-15 09:58:32 -07:00
Andrew Meadows
fa17b77d70 move DIRTY_FLAGS out of EntityItem namespace 2015-10-15 09:34:09 -07:00
Seth Alves
c96f7562f2 Merge branch 'master' of github.com:highfidelity/hifi into groundwork-for-hold-action-changes 2015-10-15 09:28:57 -07:00
Seth Alves
7ef5fc9613 remove line that leaked over from other branch 2015-10-15 09:19:47 -07:00
Seth Alves
9f40c7bf8c fix up AvatarActionHold 2015-10-15 09:13:06 -07:00
Seth Alves
5ebefadda1 remove some debugging 2015-10-15 09:07:35 -07:00