James B. Pollack
5ed8fc534c
tilt maze
2016-02-23 11:48:25 -08:00
Clément Brisset
a802f69aa9
Merge pull request #7169 from samcake/red
...
Fix the crash when Particle system entities are created and removed quickly
2016-02-23 11:45:32 -08:00
Stephen Birarda
7e92841367
Merge pull request #7168 from howard-stearns/audio-restart-injector-limits
...
audio restart injector limits
2016-02-23 11:28:38 -08:00
Stephen Birarda
4b4ea25ed6
immediately send ice heartbeat once keypair is ready
2016-02-23 11:24:26 -08:00
Brad Hefta-Gaub
a71a78b2d3
add comments and license header to reticleDepth.js
2016-02-23 11:22:24 -08:00
Stephen Birarda
83e8c248bd
repairs to failure case for keypair generation
2016-02-23 11:20:21 -08:00
Brad Hefta-Gaub
71262c3e64
cleaner QML rejection of mouse messages
2016-02-23 11:14:16 -08:00
Stephen Birarda
bfdf74367e
don't update the AM keypair until uploaded
2016-02-23 11:09:28 -08:00
samcake
d3cdc5117f
clean up one more render::Item::isValid(ID)
2016-02-23 11:01:57 -08:00
Stephen Birarda
e2f02347dd
repairs to issues discovered during ID change
2016-02-23 10:57:54 -08:00
Howard Stearns
6a987391d2
Remove debugging code.
2016-02-23 10:55:36 -08:00
samcake
7e39cc7753
clean up a bit the 2 globals RenderItem in APplication.cpp
2016-02-23 10:53:33 -08:00
Howard Stearns
5d9ee84e63
Extend the test for number of active injectors to apply to injector restarts.
2016-02-23 10:42:39 -08:00
samcake
1c53f9bc87
Fix the cleanup of the render::Item::ID in the EntityITem Rendereable wich were often not invalidated after beeing removed from the scene. THis caused a bug with particule system when beeing added /removed / updated quickly
2016-02-23 10:40:50 -08:00
Zach Pomerantz
7c9022fb3e
Fix model overlay scaling
2016-02-23 10:40:47 -08:00
Brad Hefta-Gaub
8117d51324
Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork
2016-02-23 10:21:10 -08:00
Clément Brisset
d7f55b1f3c
Merge pull request #7158 from sethalves/stuck-web-entities
...
Stuck web entities
2016-02-23 10:16:35 -08:00
Stephen Birarda
8385d12d9b
Merge pull request #7159 from Atlante45/fix/atp
...
Fix packet resend faillure bug
2016-02-23 10:15:36 -08:00
Brad Hefta-Gaub
2db25690f1
detect when mouse is over QML overlays or 2D JS Overlays
2016-02-23 10:14:44 -08:00
ericrius1
749f4478ab
Fixed bug with parsing numbers for editjs
2016-02-23 09:33:37 -08:00
David Rowe
fdb7a9cf75
Merge branch '20805' into 20809
2016-02-23 20:29:18 +13:00
Brad Hefta-Gaub
04bd32e008
Merge pull request #7160 from jherico/auto_show_desktop
...
Auto-unhide the desktop when showing or raising a window
2016-02-22 23:28:24 -08:00
David Rowe
fec82e3125
Merge branch 'master' into 20805
2016-02-23 20:16:31 +13:00
David Rowe
e30135a89d
Increase height of dialog to avoid scrollbars
2016-02-23 20:05:45 +13:00
David Rowe
67b6cafc92
Use placeholder text for Filter field instead of separate label
...
Also fixes color of separate label if that is reinstated at some time.
2016-02-23 20:05:16 +13:00
David Rowe
9583b801f6
Increase size of resize handle
2016-02-23 19:57:13 +13:00
David Rowe
6bf377aac8
Move FontAwesome.qml to be with other font files
2016-02-23 18:16:32 +13:00
David Rowe
0e3cbd2930
Tidying
2016-02-23 18:05:49 +13:00
David Rowe
b09a20187a
Reverse order buttons appear in to make more consistent with Windows
2016-02-23 17:57:21 +13:00
David Rowe
49c229897f
Give the "change avatar?" confirmation dialog a default action
2016-02-23 17:55:36 +13:00
David Rowe
aa32c1f1af
Restyle modal message dialog content
2016-02-23 17:54:02 +13:00
David Rowe
86bb1b1ed8
Make copy of TextEdit control for restyling
2016-02-23 17:44:11 +13:00
Anthony J. Thibault
0fd260076b
SixenseManager: fix velocity and angularVelocity computation
...
Copied the delta based computation of velocity and angularVelocity that was in
Application::setPalmData() and moved it into SixenseManager. This will guarantee
that the velocity computation is the same as it was previously. The goal here is
to NOT change the behavior of the hydra.
The moving average style calculation of velocities has been removed.
Removed dead code.
2016-02-22 20:05:41 -08:00
Brad Davis
160a107bbd
Auto-unhide the desktop when showing or raising a window
2016-02-22 19:36:00 -08:00
Zach Pomerantz
2534bb14f3
Amend entityProperties for fixed-dec light values
2016-02-22 19:27:36 -08:00
Zach Pomerantz
1e3cfd6baf
Detect changes for surfaceRadius
2016-02-22 19:27:35 -08:00
James B. Pollack
19ce178791
light at the end
2016-02-22 19:20:01 -08:00
Anthony Thibault
3b87cd0ea8
Improve hold action by using controller velocity
...
The AvatarHoldAction now derives the body velocity by using data from the controller::Pose. Rather then trying to derive it based on previous positions. This results in more acurate motion of the held object when the hold is released.
OpenVR input plugin: pass the velocity and angularVelocity directly from the controller pose to the controller::Pose.
2016-02-22 19:15:22 -08:00
Seth Alves
23b204c0c6
fix logic that checks getEntityProperties return value
2016-02-22 19:03:12 -08:00
Stephen Birarda
d510ee0e47
complete ice-server signature verification
2016-02-22 18:00:05 -08:00
David Rowe
84e352a1de
Move icon to be in title
2016-02-23 14:54:49 +13:00
David Rowe
33cfe8f21f
Style modal dialog icon and message
2016-02-23 13:31:08 +13:00
Clément Brisset
965d6bb006
Merge pull request #7155 from jherico/script_engine_crash
...
Fix a number of crashes / hangs on exit
2016-02-22 16:17:33 -08:00
David Rowe
f1921b4e38
Style modal dialog title
2016-02-23 13:14:38 +13:00
Stephen Birarda
ddf4f029d9
request and store domain public key in ice-server memory
2016-02-22 16:14:11 -08:00
David Rowe
e86b36b00f
Don't whitewash screen when modal dialog is displayed
...
Focus shadow is used instead.
2016-02-23 13:12:29 +13:00
David Rowe
f7654dce05
Style modal dialog background and border
2016-02-23 13:10:02 +13:00
Zach Pomerantz
8688bf2abb
Move light entity defaults to light
2016-02-22 15:56:10 -08:00
Atlante45
4c18a50473
Only debug if define set
2016-02-22 15:42:11 -08:00
Atlante45
97aebaf52a
Fix log regexes
2016-02-22 15:33:53 -08:00
