Seth Alves
c0eccca6d3
relay 'kinematic' mode of a hold to other interfaces
2015-10-21 12:29:26 -07:00
Andrew Meadows
d02fe784a9
css and cfg filetypes are text in .gitattributes
2015-10-20 13:58:44 -07:00
Andrew Meadows
341bc3666f
Merge pull request #6093 from sethalves/hold-action-changes
...
Hold action changes
2015-10-20 09:19:48 -07:00
Brad Hefta-Gaub
9f17f10d6a
fix warning in master
2015-10-19 17:56:38 -07:00
Seth Alves
4feb9dc8c6
prepare for possible future coding standard
2015-10-19 17:46:34 -07:00
Seth Alves
41f7ef1e2e
cleanups
2015-10-19 16:53:27 -07:00
Brad Hefta-Gaub
0b2bf8bda8
remove some dead code
2015-10-19 15:23:45 -07:00
Brad Hefta-Gaub
110adc5c22
fix model LOD behavior
2015-10-19 15:21:25 -07:00
Seth Alves
46e5bf0435
take entity-server clock-skew into account when handling action expiration times
2015-10-19 11:59:03 -07:00
Seth Alves
aaad1a4a36
Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes
2015-10-16 14:34:21 -07:00
Brad Hefta-Gaub
88a66d3c52
Merge pull request #6088 from hyperlogic/tony/regen-english-translation-strings
...
Updated english translation file
2015-10-16 10:59:26 -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
d2b7e5c4eb
Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes
2015-10-16 09:54:26 -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
Seth Alves
0964180f2c
code review
2015-10-15 17:10:47 -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
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
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
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
Seth Alves
a70ba4cd5a
add some accessors
2015-10-15 11:42:53 -07:00
Anthony J. Thibault
605da499c8
Updated english translation file
...
Generated using the following command:
~/code/hifi > lupdate interface -ts interface/i18n/interface_en.ts
Scanning directory 'interface'...
Updating 'interface/i18n/interface_en.ts'...
Found 146 source text(s) (130 new and 16 already existing)
Kept 28 obsolete entries
NOTE: this translation file is far from complete, many menu strings from Menu.h do not show up in this list.
2015-10-15 11:15:06 -07:00
Seth Alves
1d8db13f41
switch to low-entity-server traffic hold
2015-10-15 10:56:47 -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
8195145dc7
further unmangle branch split
2015-10-15 10:13:00 -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
Thijs Wenker
8111432088
Merge branch 'master' of https://github.com/worklist/hifi into JS_Rotation_FIX
2015-10-15 14:50:20 +02:00
James B. Pollack
c8b6fed0e0
Update ToolWindow.cpp
2015-10-14 21:18:17 -07:00
James B. Pollack
84973c590d
Update ToolWindow.h
2015-10-14 21:17:19 -07:00
James B. Pollack
c18aeef6b3
remove redundant call
2015-10-14 17:29:38 -07:00
James B. Pollack
a1e2292e62
remove title bar from docked tool widgets
2015-10-14 17:27:45 -07:00
Clément Brisset
efd106e68c
Merge pull request #6075 from birarda/default-asset-server
...
add a migrator to move assets to ATP
2015-10-14 17:02:10 -07:00
James B. Pollack
536351e9d5
move set tab position to constructor
2015-10-14 15:10:04 -07:00
Anthony J. Thibault
3e7a6fd490
Change to boom offset for 3rd person HMD camera.
...
Previously the boom offset was computed in HMD sensor space instead of
world space, so it did not play well with the vive, or the oculus
if you weren't facing the camera directly.
Now it is computed in world space, and is always behind the character's
position/orientation. This can cause the boom to swing if the character
rotation changes but now the avatar rotation in HMD uses comfort mode.
It's not that disorienting.
2015-10-14 14:43:59 -07:00
