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

39454 commits

This branch
This branch
All branches
Author SHA1 Message Date
ericrius1
0ff8201994 fixed line gaps 2016-02-23 18:45:41 -08:00
ericrius1
045d542f11 lines no longer disapear after drawing for a while 2016-02-23 18:03:38 -08:00
ericrius1
0b569a0fab only show overlay if within painting range 2016-02-23 16:49:03 -08:00
ericrius1
d1d4a9d6b1 adjusted surface position 2016-02-23 14:48:45 -08:00
ericrius1
5e0de4bdee tweaks 2016-02-23 12:16:22 -08:00
ericrius1
4b45fd2d4d Merge branch 'master' into whiteboardV2 2016-02-23 12:15:59 -08:00
ericrius1
a2ece772ef refactor for laser pointer 2016-02-23 12:08:51 -08:00
ericrius1
8d058c2bb3 eraser working 2016-02-23 11:53:27 -08:00
ericrius1
20fd79fc43 Lines markers 2016-02-23 11:25:46 -08:00
ericrius1
6682b9bd58 eraser is spawing 2016-02-23 10:36:17 -08:00
ericrius1
81ed89531d whiteboard surface parented to whiteboard 2016-02-23 10:11:13 -08:00
ericrius1
b5ec79fd6d marker only draws when equipped and held down 2016-02-23 09:53:20 -08:00
ericrius1
69dc9ef68f added lifetime 2016-02-23 09:06:35 -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
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
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
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
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
Chris Collins
f24e4bc6b1 Merge pull request #7152 from sethalves/fix-touch 
fix grab-script touch
 2016-02-22 09:58:29 -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
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
Brad Hefta-Gaub
dd558f0656 Merge pull request #7147 from jherico/too_many_webs 
Too many (or too large) web views crash Interface
 2016-02-21 10:03:16 -08:00
Brad Hefta-Gaub
32a7179c62 CR feedback 2016-02-21 09:59:19 -08:00
Seth Alves
5f79500e4d fix grab-script touch 2016-02-21 09:37:43 -08:00
Brad Hefta-Gaub
1a4591db58 Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking 2016-02-21 09:30:41 -08:00
Brad Davis
4aec42893f Merge pull request #7150 from thoys/smooth_particle_trail 
Smooth particle trails
 2016-02-20 20:19:43 -08:00
Thijs Wenker
58539171a3 give particle trails a nice smooth path between frames 2016-02-20 22:46:19 +01:00
Brad Davis
786747c2d7 Properly preserve and restore the GL context after building a web entity 2016-02-20 12:01:34 -08:00
Brad Hefta-Gaub
9c3abd3eb7 some cleanup and standardization in how headPose is gathered 2016-02-20 11:40:30 -08:00
Brad Hefta-Gaub
9066fb0622 Merge pull request #7145 from howard-stearns/lod-pid-removal 
Lod pid removal
 2016-02-20 10:29:42 -08:00
Brad Hefta-Gaub
e6614fb9e5 Merge pull request #7141 from sethalves/fix-avatar-fade 
Fix avatar fade
 2016-02-20 10:26:07 -08:00
Brad Hefta-Gaub
db448c240f Merge pull request #7122 from howard-stearns/audio-output-buffer 
Audio output buffer
 2016-02-20 09:40:06 -08:00
Brad Hefta-Gaub
28638f19e3 Merge pull request #7148 from hyperlogic/tony/smooth-vive-controllers 
Vive: smoother updates for IK driven by vive controllers
 2016-02-20 09:37:37 -08:00
Brad Hefta-Gaub
4e2c514eb1 fix mac warning 2016-02-19 18:27:25 -08:00
Brad Hefta-Gaub
04fa37324f tweak to virtual desktop size, to make text more readable, 240d horz FOV 2016-02-19 18:24:32 -08:00
Brad Hefta-Gaub
2810be8787 fix scripts to use new API 2016-02-19 17:57:49 -08:00
Brad Hefta-Gaub
1fa6e294e7 allow mouse to move outside of the overlay extents 2016-02-19 17:49:33 -08:00