Brad Hefta-Gaub
|
a71a78b2d3
|
add comments and license header to reticleDepth.js
|
2016-02-23 11:22:24 -08:00 |
|
Brad Hefta-Gaub
|
71262c3e64
|
cleaner QML rejection of mouse messages
|
2016-02-23 11:14:16 -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 |
|
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 |
|
Brad Davis
|
160a107bbd
|
Auto-unhide the desktop when showing or raising a window
|
2016-02-22 19:36:00 -08:00 |
|
Seth Alves
|
23b204c0c6
|
fix logic that checks getEntityProperties return value
|
2016-02-22 19:03:12 -08: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 |
|
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 |
|
Atlante45
|
cb4f400c7e
|
Cleanup obfuscation code
|
2016-02-22 15:32:00 -08:00 |
|
Atlante45
|
17b4d6fcf9
|
Factor members copy
|
2016-02-22 15:15:38 -08:00 |
|
Atlante45
|
f06ac911c5
|
Fix XORing algorithm
|
2016-02-22 15:15:38 -08:00 |
|
Atlante45
|
3a11e84c94
|
Use hex for msvc compatibility
|
2016-02-22 15:15:38 -08:00 |
|
Atlante45
|
c29ad09306
|
Fix obfuscation
|
2016-02-22 15:15:38 -08:00 |
|
Atlante45
|
bf5a65ca45
|
Add missing copies
|
2016-02-22 15:15:38 -08:00 |
|
Atlante45
|
4605cf5087
|
Move all udt header constants to Constant.h
|
2016-02-22 15:15:38 -08:00 |
|
Atlante45
|
3d7d812044
|
Add resend mecanic with obfuscation
|
2016-02-22 15:15:38 -08:00 |
|
Atlante45
|
6d9405d91d
|
Add obfuscation level to packets
|
2016-02-22 15:15:38 -08:00 |
|
Atlante45
|
f6526272de
|
Add header descriptions
|
2016-02-22 15:15:38 -08:00 |
|
Brad Davis
|
c07f3789e4
|
Don't crash on script destructor
|
2016-02-22 14:26:33 -08:00 |
|
Brad Davis
|
b4a7dc113e
|
Safer shutdown behavior in QML surfaces
|
2016-02-22 14:25:30 -08:00 |
|
Brad Davis
|
4169e9be9d
|
Don't deadlock objreader on shutdown
|
2016-02-22 14:24:31 -08:00 |
|
Seth Alves
|
f113a83c5b
|
merge from upstream
|
2016-02-22 14:02:38 -08:00 |
|
Seth Alves
|
c470649076
|
don't crash if entity vanishes while doing touch test
|
2016-02-22 14:00:01 -08:00 |
|
Seth Alves
|
8a3b233659
|
don't crash if entity vanishes while doing touch test
|
2016-02-22 13:58:07 -08:00 |
|
Brad Hefta-Gaub
|
3f7a2eb10a
|
add support in depthReticle.js to set depth to overlay depth when you're over a 2D overlay
|
2016-02-22 13:54:46 -08:00 |
|
Brad Hefta-Gaub
|
54b21abf02
|
remove editWithHacks and move to more generic depthReticle
|
2016-02-22 13:32:19 -08:00 |
|
Brad Hefta-Gaub
|
fc002df5e7
|
implement Reticle.depth using the apparent 3D look at logic instead
|
2016-02-22 13:24:14 -08:00 |
|
Ryan Huffman
|
e6ccf501fa
|
Merge pull request #7135 from zzmp/fix/grid
Update renderGrid to use a shader, and fix grid edit tools
|
2016-02-22 12:58:23 -08:00 |
|
Brad Hefta-Gaub
|
715355464f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork
|
2016-02-22 12:52:56 -08:00 |
|
Zach Pomerantz
|
5bf9b8bc76
|
Set grid minor div min to 0.01
|
2016-02-22 11:59:15 -08:00 |
|
Howard Stearns
|
523b77328c
|
Merge pull request #7157 from ZappoMan/revertFlippedAudioChange
revert change that trusted Qt's claim that it supports the audio format
|
2016-02-22 11:37:54 -08:00 |
|
Brad Hefta-Gaub
|
bb1ed2147f
|
revert change that trusted Qt's claim that it supports the format
|
2016-02-22 11:22:03 -08:00 |
|
Brad Hefta-Gaub
|
e369c1f327
|
fix unix warning
|
2016-02-22 10:28:00 -08:00 |
|
Chris Collins
|
f24e4bc6b1
|
Merge pull request #7152 from sethalves/fix-touch
fix grab-script touch
|
2016-02-22 09:58:29 -08:00 |
|
Brad Hefta-Gaub
|
3f03678d02
|
add version of edit that sets reticle depth
|
2016-02-22 09:27:27 -08:00 |
|
Chris Collins
|
7074f72e6f
|
Merge pull request #7154 from ZappoMan/hmdHacking
various HMD fixes and improvements
|
2016-02-22 09:24:44 -08:00 |
|
Brad Hefta-Gaub
|
19d0968ccb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork
Conflicts:
interface/src/ui/ApplicationCompositor.h
|
2016-02-22 09:18:40 -08:00 |
|
Brad Hefta-Gaub
|
cbe80bffd6
|
go into away mode if you the HMD loses mouse capture
|
2016-02-21 12:57:14 -08:00 |
|
Brad Hefta-Gaub
|
9f602a938d
|
don't move mouse on reset sensors
|
2016-02-21 12:42:02 -08:00 |
|
Brad Davis
|
f35c1694f7
|
Merge pull request #7133 from ZappoMan/hmdHacking
Working on making HMD mouse really work
|
2016-02-21 12:20:12 -08:00 |
|
Brad Hefta-Gaub
|
ba36eed9eb
|
whitespace fixes
|
2016-02-21 11:40:15 -08:00 |
|
Brad Hefta-Gaub
|
68771c92f7
|
change position to use mutex instead of atomic<>
|
2016-02-21 11:38:26 -08:00 |
|
Brad Hefta-Gaub
|
2c7c6be6a6
|
fix build buster
|
2016-02-21 10:40:11 -08:00 |
|
Brad Hefta-Gaub
|
a12446dab5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking
Conflicts:
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
|
2016-02-21 10:10:24 -08:00 |
|
Brad Hefta-Gaub
|
f41ebdf71d
|
CR feedback
|
2016-02-21 10:03:54 -08:00 |
|
Brad Hefta-Gaub
|
3e6cddede3
|
CR feedback
|
2016-02-21 10:03:51 -08:00 |
|