Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-06 11:38:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
53143 commits 25 branches 0 tags 1.1 GiB
Commit graph

265 commits

Author SHA1 Message Date
Seth Alves
d1827cf12c Merge pull request #10002 from fayeli/tablet-photobooth 
Photobooth Improvements: Using Tablet & Ability to Rotate Model
 2017-04-03 16:05:13 -07:00
Faye Li
2ca4203d85 fix for submerge in floor issue 2017-04-03 12:57:51 -07:00
Faye Li
d726bd352d fix for locked camera state issue 2017-04-03 12:14:29 -07:00
samcake
a03d3a1ca8 Clean up the utilities scrips of the render folder 2017-03-28 16:00:18 -07:00
Seth Alves
9e675d4c93 Merge pull request #9990 from hyperlogic/bug-fix/sliders 
Added inputMode property to Web3DOverlay
 2017-03-28 10:07:37 -07:00
Seth Alves
f1470e34f9 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-24 15:17:52 -07:00
Faye Li
8cb771d9a8 fix conflict 2017-03-24 14:46:24 -07:00
Faye Li
405be471c3 button state change 2017-03-24 13:47:19 -07:00
Brad Hefta-Gaub
9b26e8ee95 Merge pull request #9871 from Triplelexx/21208 
21208 - Muted microphone indicator
 2017-03-24 13:07:43 -07:00
Faye Li
ccd4fdb540 naming 2017-03-24 10:46:52 -07:00
Faye Li
067faad9cd Fix careless math mistake 2017-03-24 10:22:08 -07:00
Seth Alves
902e3d41d6 merge from upstream 2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub
9a38b36f59 Merge pull request #9970 from Triplelexx/21223 
21223 - Quat functions have naming inconsistencies
 2017-03-24 08:12:11 -07:00
Anthony J. Thibault
bab9890fea Added inputMode property to Web3DOverlay. 
This allows user to switch between Touch messages and Mouse messages.
Added a sliderTestMain.js script which demonstrates this behavior.
 2017-03-23 13:54:18 -07:00
Seth Alves
ff3fc244d1 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-23 09:50:53 -07:00
Triplelexx
c7b9492620 revert removing rightUnitVec 
.....
 2017-03-22 19:14:20 +00:00
Triplelexx
2fc8dd48de change testFront to testForward 2017-03-22 17:13:45 +00:00
Triplelexx
2d1ca99e2e change variable names that use Quat.getForward 2017-03-22 17:00:12 +00:00
Triplelexx
6e740a5fbb change Mat4 getFront to getForward 2017-03-21 22:33:37 +00:00
Triplelexx
66d697873f change mat4test back to getFront 
premature, including in seperate commit
 2017-03-21 22:31:06 +00:00
Triplelexx
a964edee91 change all references of Quat.getFront to Quat.getForward in scripts directory 2017-03-21 22:25:30 +00:00
Brad Davis
e482eac437 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-20 16:22:13 -07:00
Chris Collins
308c134119 Merge pull request #9686 from humbletim/21114-part3 
CR 21114 -- Implement modules/require support into hifi
 2017-03-20 06:22:35 -07:00
Seth Alves
424af2255b Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-19 21:17:30 -08:00
Seth Alves
a5d19439f9 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-16 16:32:07 -07:00
humbletim
758c07c7d4 Merge branch 'master' into 21114-part3 2017-03-16 14:29:17 -04:00
samcake
4ef7fc61f0 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2017-03-16 10:43:07 -07:00
Seth Alves
31e0cfe296 Merge pull request #9825 from thoys/record-fixes 
Avatar Recorder and Playback Fixes
 2017-03-16 07:27:42 -08:00
humbletim
52a571558c * changes per CR feedback 
* revert JSON content-type workaround
* add specific error check / advice for unanchored module ids
* update unit tests
 2017-03-16 01:23:23 -04:00
samcake
ea2f1359bc Expose rendering in wireframe mode 2017-03-15 12:23:44 -07:00
Triplelexx
9e0091ebe0 use utils.js, move easing function, use mixes 
some cleanup
 2017-03-15 11:08:54 +00:00
Brad Davis
e94f803b84 Merge remote-tracking branch 'upstream/master' into HEAD 2017-03-08 09:03:21 -08:00
Seth Alves
509ce3f2d2 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-07 18:41:36 -08:00
Thijs Wenker
097db9a7f9 - debug message removal (oops) 
- smaller timer textbox, allows you to grab around the edges and still drag the toolbar
 2017-03-08 01:41:20 +01:00
Thijs Wenker
b21bd3afa9 Make the time and slider follow the record.js toolbar 2017-03-08 01:14:11 +01:00
Thijs Wenker
6b26f5f3a3 Fix the timer display 2017-03-08 00:09:56 +01:00
humbletim
c559838dbb Add a few more .resolvePath characterization tests 2017-03-07 16:41:20 -05:00
humbletim
fa0d3a1845 unit test cleanup pass 2017-03-07 16:36:10 -05:00
humbletim
143b67e47d Add require/module unit tests 2017-03-07 16:36:10 -05:00
Ryan Huffman
a744e0d11c Merge pull request #9685 from humbletim/21114-part2 
CR-2 21114 -- BaseScriptEngine.cpp, order-of-operations fixes, reworked JS Exceptions
 2017-03-07 13:25:25 -08:00
Seth Alves
f594689fa8 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-07 09:24:50 -08:00
Brad Davis
8782fe1d93 Merge branch 'master' into smarter_textures 
Conflicts:
	libraries/model-networking/src/model-networking/TextureCache.cpp
 2017-03-06 15:29:41 -08:00
David Rowe
55963c4418 Style audio stats dialog button 2017-03-03 17:46:12 +13:00
David Rowe
3285816fca Fix up audio stats displayed in tablet 2017-03-03 16:45:35 +13:00
David Rowe
02a2bb6fc3 Rename QML file 2017-03-03 16:25:15 +13:00
David Rowe
2b53cb4722 Display audio stats in tablet 2017-03-03 11:31:41 +13:00
Faye Li
dae3d55985 rotate model by the slider 2017-02-28 14:43:51 -08:00
Faye Li
dedadd0aea created slider ui 2017-02-28 13:22:32 -08:00
Faye Li
bd10b5d48f fix camera drop down issue 2017-02-28 11:34:07 -08:00
sam
709c2e4240 Fixing the emissive on overlayfor models 2017-02-27 02:52:00 -08:00