Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
52042 commits 2 branches 0 tags 1.1 GiB
Commit graph

52042 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Thijs Wenker
b954d5b0e9 stop the playback after the clip stopped playing rather than pause. Allows you to click play again without having to move the position back. 2017-03-08 00:08:57 +01:00
Thijs Wenker
b54d6cb0e1 stop avatar controller while playing back a recording, which makes it not collide anymore 2017-03-08 00:07:49 +01:00
Brad Hefta-Gaub
1e51ae62b1 Merge pull request #9804 from jherico/oculus_update 
Update Oculus SDK to 1.11
 2017-03-07 15:00:44 -08:00
Seth Alves
71c2b4215d Merge pull request #9811 from ZappoMan/triangleSet 
Cleanup how Models do ray-picking and determination of point inside of convex hull
 2017-03-07 14:12:56 -08:00
humbletim
c559838dbb Add a few more .resolvePath characterization tests 2017-03-07 16:41:20 -05:00
humbletim
8582c7af7b Use specific debug name literal instead of __FUNCTION__ from within lambda 2017-03-07 16:41:20 -05:00
humbletim
6b927de9f1 Add example vec3 system module 2017-03-07 16:41:20 -05:00
humbletim
d93047f9e2 Switch to READONLY_PROP_FLAGS for require.cache/require.resolve properties 2017-03-07 16:41:19 -05:00
humbletim
5e5bba5aad Separate EntityPropertyMetadataRequest for easier documentation and testing 2017-03-07 16:41:19 -05:00
Thijs Wenker
d2c3b0b706 Fix coding standards link 2017-03-07 22:37:54 +01: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
humbletim
40ba8185a0 * Update per 21114-part2 changes. 
* Add explicit thread safety guards.
* Add Entities.queryPropertyMetdata for unit testing Entity script module support.
* Cleanup / commenting pass.
 2017-03-07 16:36:07 -05:00
humbletim
9b09651337 Move BaseScriptEngine from script-engine to shared. 2017-03-07 16:34:24 -05:00
humbletim
e91de1775e use a fully-qualified initializer when constructing BatchLoader 2017-03-07 16:34:24 -05:00
humbletim
32e450e6c2 * rework _requireResolve error throws (to avoid using lambda w/default args -- which vc++ didn't care for) 
* add ExceptionEmitters to require/resolve so errors get logged even if invoked indpendently from a script
 2017-03-07 16:34:24 -05:00
humbletim
efc61c25ad * use explicit int's for moduleId constants 
* maxTestConstructorValueSize was already limiting debug output size -- adopt its strategy, use shared MAX_DEBUG_VALUE_LENGTH const
 2017-03-07 16:34:24 -05:00
humbletim
9d860a8e81 merge require/module changes into clean branch 2017-03-07 16:34:24 -05:00
Seth Alves
cd91d6ff3c Merge pull request #9824 from sethalves/fix-tablet-qml-overlay-in-hmd 
fix -- restore missing shading pipeline for simple opaque in deferred
 2017-03-07 13:25:44 -08: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
Howard Stearns
2b117407d4 Merge pull request #9805 from howard-stearns/fix-ban-remove-from-pal 
fix 'banned user doesn't disappear from pal until refresh'
 2017-03-07 12:27:41 -08:00
Brad Hefta-Gaub
f7e824e47c Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet 2017-03-07 12:18:36 -08:00
howard-stearns
cb41b9135b fix broken merge 2017-03-07 12:10:52 -08:00
Seth Alves
694fc58374 restore missing shading pipeline for simple opaque in deferred 2017-03-07 12:07:24 -08:00
Chris Collins
bb03e08e16 Merge pull request #9801 from highfidelity/RC-35 
Beta Release 35 - Includes up to Developer Release 6106
 2017-03-07 11:04:21 -08:00
howard-stearns
8a489f36f4 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-ban-remove-from-pal 2017-03-07 10:49:53 -08:00
Andrew Meadows
1e9623e2f2 Merge pull request #9813 from druiz17/multipule-audio-fix 
removed duplicated audio devices
 2017-03-07 10:00:48 -08:00
Brad Hefta-Gaub
d8b7076a9e Merge pull request #9816 from AndrewMeadows/sphere-means-sphere 
ModelEntityItems that use 'sphere' for shapeType should collide as true spheres
 2017-03-07 09:53:52 -08:00
Howard Stearns
f0fd29abd3 Merge pull request #9815 from davidkelly/dk/3377 
Retain selection in PAL when sorting or reloading
 2017-03-07 09:38:07 -08:00
Brad Hefta-Gaub
69a8ea99ca Merge pull request #9823 from vladest/qml_js_in_qtcreator 
Adding ability for QML/JS file to be visible in QtCreator. Also chang…
 2017-03-07 09:20:51 -08:00
David Kelly
b760e86226 rest of cr feedback 2017-03-07 10:17:32 -07:00
David Kelly
c6dbfc85f0 cr feedback 2017-03-07 09:54:00 -07:00
Atlante45
c52c43e23d Remove weighted offset, special case downward pressure 2017-03-07 06:28:25 -08:00
Vladyslav Stelmakhovskyi
2d2b2094fd Adding ability for QML/JS file to be visible in QtCreator. Also changed files will be installed to destination 2017-03-07 10:11:09 +01:00
Andrew Meadows
8c773483cf Merge pull request #9820 from Atlante45/fix/avatar-lean 
Fix avatar lean
 2017-03-06 22:18:34 -08:00
Brad Hefta-Gaub
b111bcb826 Merge pull request #9818 from ctrlaltdavid/21205 
Remove Developer > Network > Bandwith Details dialog
 2017-03-06 22:02:33 -08:00
Brad Hefta-Gaub
87934ee82d fix bugs in some meshes 2017-03-06 21:50:32 -08:00
Atlante45
ff9d6d657c Remove weighted offset, special case downward pressure 2017-03-06 19:41:08 -08:00
David Rowe
51739f2f99 Remove Developer > Network > Bandwith Details dialog 2017-03-07 15:02:26 +13:00
Thijs Wenker
2f51e63554 Since the deck is currently only capable of handling one clip, add temporary _length reset in FIXME section 2017-03-07 01:29:20 +01:00
Brad Davis
f9dcfa54aa Add debug/release builds to oculus lib 2017-03-06 16:08:21 -08:00
Andrew Meadows
d749c0c8be use fabsf() rather than fabs() 2017-03-06 15:50:32 -08:00
Andrew Meadows
10b3e7fc67 sphere shapeType for models means 'sphere' 2017-03-06 15:14:51 -08:00
David Kelly
3d39aae35b minor tweak - just in case 2017-03-06 15:52:33 -07:00
David Kelly
f23f882595 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3377 2017-03-06 15:26:21 -07:00
David Kelly
e14a1ad1af minor cleanup 2017-03-06 15:26:03 -07:00
David Kelly
db036d997c first pass 2017-03-06 15:18:35 -07:00
Dante Ruiz
fc65723d68 corrected removing duplicate devices 2017-03-06 22:14:20 +00:00