Chris Collins
34201ea1da
Merge pull request #10599 from jherico/ktx_cache_wipe
...
Add versioning support to the KTX cache
2017-06-02 13:02:18 -07:00
Sam Gateau
8a2837e1f7
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-06-02 11:52:11 -07:00
seefo
7ade5b07a6
Final touches to Polaroids
2017-06-02 11:35:56 -07:00
Andrew Meadows
d480123e93
Merge pull request #10555 from ctrlaltdavid/21372
...
Make stopwatch buttons work properly
2017-06-02 11:27:27 -07:00
David Rowe
58c4a2f12a
Fix icon for polylines in entities editor properties page
2017-06-03 06:26:13 +12:00
Brad Davis
1f95daf5c1
Add dev menu option to wipe KTX cache on next launch
2017-06-02 11:19:43 -07:00
seefo
655a411865
Cleaned up Polaroid code
2017-06-02 11:02:01 -07:00
Ryan Huffman
0d96f82888
Merge pull request #10592 from birarda/close-report
...
Send a close event to API on shutdown
2017-06-02 10:57:41 -07:00
Patrick Manalich
1f478bdf13
Repair Application.cpp
2017-06-02 10:44:58 -07:00
Patrick Manalich
a705e722f1
Ctrl-S sound feature added
2017-06-02 10:35:57 -07:00
NeetBhagat
580c2548e9
Initial Commit :
...
1) Resolve a bug when 2 different entity is grabbed in 2 hands. And move your left hand and entity of left hand grow/shrink when you move right/left hand.
2) Resolve right hand-left hand grow-shrink functionality
2017-06-02 23:04:58 +05:30
Patrick Manalich
0c71cf4bda
Edit: Snapshot will make sound when initially clicked
2017-06-02 10:24:27 -07:00
Patrick Manalich
4e61db8263
Snapshot will make sound when initially clicked
2017-06-02 10:24:27 -07:00
Seth Alves
d91b3700a7
Merge branch 'master' of github.com:highfidelity/hifi into head-controller
2017-06-02 10:07:50 -07:00
Ryan Huffman
0fdbf4a342
Add startup_sent_to user activity event
2017-06-02 09:59:29 -07:00
Vladyslav Stelmakhovskyi
8068e7201d
Fix position after rotation. May be fix rotation in HMD mode
2017-06-02 18:58:18 +02:00
Seth Alves
bc2311cb35
Merge pull request #10561 from AndrewMeadows/sanity-check-physics
...
fix crash in EntityMotionState::handleDeactivation()
2017-06-02 09:55:20 -07:00
howard-stearns
64c0498bed
Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor
2017-06-02 09:54:11 -07:00
David Kelly
70b6236890
Merge pull request #10605 from davidkelly/dk/analyticsForBubble
...
Add UserActivity calls for bubble usage
2017-06-02 09:48:15 -07:00
David Kelly
2feea16063
added comment
2017-06-02 09:47:03 -07:00
Seth Alves
f47a49e631
Merge pull request #10597 from druiz17/record-standard
...
Saved recording are officially g zipped and pose are played back to the standard endpoint
2017-06-02 09:44:03 -07:00
Ryan Huffman
de2f8bd944
Add clarifying comment to use of kill in isProcessRunning
2017-06-02 08:58:35 -07:00
David Kelly
4dae77cd9d
make sure we dont log the initial call to onBubbleToggled
2017-06-02 08:45:02 -07:00
NeetBhagat
6228ff19bf
Resolve the reviewed comments of @ZappoMan
2017-06-02 15:23:21 +05:30
Sam Cake
f9aa400b95
Refining the stencil configuration and triggering only in hmd mode
2017-06-02 00:22:38 -07:00
NeetBhagat
e08c3453a4
Merge branch 'master' into 21255
2017-06-02 12:36:07 +05:30
Menithal
e76dfe4182
21324: Implementation of last feedback
...
- If properties are expanded, the animation wrapper should now use the
values
- Decimal Values from filled in data now automatically get reduced the
1000th. The fields however will allow one to set smaller values and show
it, until the entity is selected again
- If particle is locked, keep fields locked.
2017-06-02 06:59:23 +03:00
Brad Davis
9a80a81321
Merge pull request #10565 from vladest/fix_claraio_download_clones
...
Make sure that there is only one connection created for web events, s…
2017-06-01 20:42:50 -07:00
Menithal
bdcf9a0070
Merge remote-tracking branch 'upstream/master' into 21324
2017-06-02 06:39:55 +03:00
samcake
4a419f2d07
Merging with upstream
2017-06-01 18:25:24 -07:00
Ryan Huffman
86da91ac8d
Remove the runningMarker timer
2017-06-01 18:19:13 -07:00
Ryan Huffman
0536f8974a
Remove shutdownWatcher option inside sandbox
2017-06-01 18:13:40 -07:00
Ryan Huffman
aa48f3f063
Rename watchProcessShutdown to shutdownWith
2017-06-01 18:13:27 -07:00
samcake
14f9a9848e
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-06-01 18:05:47 -07:00
samcake
c5e9551bab
more cleanup
2017-06-01 18:05:18 -07:00
Stephen Birarda
6a89726a6a
Merge pull request #10593 from birarda/log-api-session-id
...
print the metaverse session ID to the debug log
2017-06-01 18:02:17 -07:00
Stephen Birarda
6d1bbc389d
use a sleep instead of a yield waiting for close event
2017-06-01 17:57:23 -07:00
Stephen Birarda
9fad8d1821
rename ClosureEventSender to CloseEventSender
2017-06-01 17:52:01 -07:00
Andrew Meadows
29a05d7eb4
bid immediately when creating new entity
...
also clear EntityMotionState::_numInactiveUpdates on new ownership
2017-06-01 17:39:21 -07:00
Andrew Meadows
74827fc4c8
recently moved static objects added to changelist
...
since static objects are not active this will make the interface
release ownership of recently changed static objects
2017-06-01 17:39:21 -07:00
Andrew Meadows
e34f979ed9
add EntityMotionState::isLocallyOwned() for cleaner logic
2017-06-01 17:39:21 -07:00
Andrew Meadows
c56a6c44f8
minor formatting fix
2017-06-01 17:39:21 -07:00
Stephen Birarda
2de6162d38
change the packet version across the board for avatar mixer
2017-06-01 17:35:23 -07:00
Brad Davis
b9f9cddea0
Add versioning support to the KTX cache
2017-06-01 17:16:24 -07:00
Stephen Birarda
2c2f154360
push packet version for default mannequin avatar
2017-06-01 17:13:08 -07:00
Stephen Birarda
0b05774059
change default avatar to new baked mannequin
2017-06-01 17:12:29 -07:00
howard-stearns
6b2e4c5abc
zaru stuff
2017-06-01 17:08:22 -07:00
seefo
4e190434d1
Added polaroids to snapshots
2017-06-01 16:53:48 -07:00
David Kelly
37b738ff8b
initial cut at some UserActivities for the bubble
2017-06-01 16:46:31 -07:00
Seth Alves
27664756de
with vive head-puck, isHeadController is true, even when HMD isn't mounted
2017-06-01 16:37:04 -07:00
