Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-27 21:55:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
60520 commits 71 branches 56 tags 1.2 GiB
Commit graph

420 commits

Author SHA1 Message Date
Seth Alves
8a88b30da7 Merge pull request #10468 from AndrewMeadows/cleanup-actions 
cleanup Actions and Constraints part-1
 2017-05-17 11:33:53 -07:00
Sam Gateau
0f250e693d Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-17 09:49:20 -07:00
samcake
b466964817 REvisiting the stats counter for the gpu context in the hope of better understanding the gpu texture streaming behavior 2017-05-16 18:21:24 -07:00
Andrew Meadows
d705f529a0 use 'tractor' instead of 'spring' in JS files 2017-05-16 08:35:54 -07:00
ZappoMan
9c81a89ac3 add test script 2017-05-14 08:37:26 -07:00
Sam Gateau
ff3cf7801a Merge branch 'master' into 21274 2017-05-09 11:48:57 -07:00
samcake
c36035d3eb Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-09 10:46:38 -07:00
Chris Collins
4bfb23b5d2 Merge pull request #10388 from humbletim/21308 
CR #21308 Fix Script.print
 2017-05-08 10:46:49 -07:00
Chris Collins
d88d52cd2e Merge pull request #9735 from humbletim/21190-fix-unit-tests 
CR 21190 unit_tests: add support for jasmine.done() and pending
 2017-05-08 09:19:01 -07:00
samcake
df2c5b8c23 adding the notification for keyLight changes modifying the KeyLIghtPayoad 2017-05-04 18:28:12 -07:00
samcake
64317f5fd0 Adding a light item per zone 2017-05-04 16:47:03 -07:00
humbletim
f9d29256e0 use an actual Uuid value for the Uuid.print test 2017-05-04 18:58:30 -04:00
humbletim
f71552c648 * update Vec3.print, Quat.print, Mat4.print, ScriptUUID.print to work with JSConsole and HMD-friendly script log 
* add test output for Quat-euler and Mat4-row/col prints
 2017-05-04 18:33:49 -04:00
humbletim
deeb9c367a update test to reflect support for scriptWarningMessage and scriptInfoMessage 2017-05-04 17:46:28 -04:00
humbletim
8cea7f6a62 add test for print/Script.print behavior 2017-05-04 16:54:16 -04:00
Seth Alves
a259d00b63 Merge pull request #10332 from sethalves/bullet-constraints-5 
Bullet constraints
 2017-05-03 16:30:34 -07:00
Seth Alves
cc586b7c6d make ragdoll test honor lifetime from UI 2017-05-02 14:12:55 -07:00
Anshuman Dewangan
a22be93d69 Move old recorder.js script to script-archive 2017-05-02 12:15:06 -07:00
Seth Alves
45a50f9a46 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-5 2017-05-01 15:32:29 -07:00
Seth Alves
1b67a8b251 cleanups 2017-04-30 12:23:34 -07:00
Seth Alves
41663c58b8 test app for bullet dynamics 2017-04-30 12:09:37 -07:00
Olivier Prat
111f0762ea Added debug scripts and fade position is now stable 2017-04-30 14:42:27 +02:00
Anthony J. Thibault
f3cc1c2d86 Added hipsContorllerTest.js for QA Testing 2017-04-28 11:30:06 -07:00
Anthony J. Thibault
b80270400f Merge branch 'master' into feature/hips-ik-target 2017-04-27 18:15:12 -07:00
Anthony J. Thibault
2120e63e3a Merge branch 'master' into feature/head-standard-action 2017-04-27 17:51:13 -07:00
Anthony J. Thibault
764f6c69ea Head input action will override the HMD for IK. 2017-04-27 17:39:25 -07:00
Dante Ruiz
79d827c6be added requested features 2017-04-26 16:52:51 +01:00
Anthony J. Thibault
1b9e609447 viveMotionCapture.js: updated to route pucks through input system 
Removed use of animationStateHandler() to set IK targets.
 2017-04-25 17:23:15 -07:00
Anthony J. Thibault
1931a8d1f6 viveMotionCapture.js: can now disable puck control, with a second controller squeeze 2017-04-25 15:13:23 -07:00
Anthony J. Thibault
ce8b71ff94 viveMotionCapture.js: can now disable puck control, with a second controller squeeze 2017-04-25 15:07:16 -07:00
Dante Ruiz
8c020a0ec2 saving work 2017-04-25 18:01:19 +01:00
Anthony J. Thibault
8b16a7c7e1 Added hipsIkTest.js test script 2017-04-24 16:40:24 -07:00
Dante Ruiz
b023356fb7 added javascript file 2017-04-24 22:29:13 +01:00
Anthony J. Thibault
d3b4a2c08d better "auto" configuration 2017-04-14 17:00:47 -07:00
Anthony J. Thibault
0ebaba7cf8 Now supports sensorConfig with hips and chest sensors 2017-04-14 17:00:46 -07:00
Anthony J. Thibault
adaf7dda7c Check in viveMotionCapture test script. 2017-04-14 17:00:45 -07:00
Sam Gateau
3519a72f8a Merge pull request #10190 from samcake/ambient-bis 
Introducing a tool to debug the current Zone Stack
 2017-04-14 13:28:59 -07:00
Thijs Wenker
6f58e91d76 Merge pull request #10121 from birarda/bug/recording-cache 
cleanup Agent RSI handling, make loadRecording async
 2017-04-14 21:35:51 +02:00
Stephen Birarda
7b48feca66 address code review comments 2017-04-14 11:53:53 -07:00
samcake
4a47737d0b REfining the Config behavior, trying to pr next 2017-04-10 19:01:49 -07:00
humbletim
4c0f6a65b4 Merge branch 'master' into 21190-fix-unit-tests 2017-04-10 14:15:47 -04:00
Sam Cake
b65448bcbe Trying to improve the Job/Task classes and testing it with the ZoneRenderer 2017-04-09 11:08:35 -07:00
samcake
f82310545c Revert "Revert "Fixing the rendering bug triggered with Nvidia driver 381.65"" 2017-04-07 02:03:58 -07:00
samcake
ab3d39951e Revert "Fixing the rendering bug triggered with Nvidia driver 381.65" 2017-04-07 02:03:31 -07:00
Sam Cake
b1a4bc329b Introducing a fix to the graphics bug 2017-04-07 01:10:18 -07:00
Sam Cake
da1355dc32 Introducing a fix to the graphics bug 2017-04-07 01:03:07 -07:00
Seth Alves
3c6429cdf3 Merge pull request #10103 from vladest/master-qml-bugfixes 
Master qml bugfixes
 2017-04-06 14:22:06 -07:00
Anthony Thibault
be2fdd9388 Merge pull request #10063 from hyperlogic/feature/vive-tracked-objects 
Vive: Expose all 16 tracked poses to the controller system
 2017-04-05 16:53:47 -07:00
Stephen Birarda
1b24538756 modify scripts to use new recording API 2017-04-05 11:18:52 -07:00
Seth Alves
b0b214012c Merge pull request #10118 from hyperlogic/bug-fix/tablet-restart-scripts 
Fix broken eventBridge on tablet after Reload All Scripts.
 2017-04-04 10:45:08 -07:00
Vladyslav Stelmakhovskyi
aa487faad1 Fixed No such signal QmlWindow_QMLTYPE_490::resized(QSizeF) and No such signal QmlWindow_QMLTYPE_490::moved(QVector2D) warnings 2017-04-04 16:59:09 +02:00
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
Anthony J. Thibault
8ff457a1b6 Fix broken eventBridge on tablet after Reload All Scripts. 
The main issue here was the "webEventReceived" connection between the OffscreenQMLSurface and the TabletProxy object.
For whatever reason, if this is not a direct Signal to Slot connection, the webEventReceived event does not propagate.
 2017-04-03 16:03:55 -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
Anthony J. Thibault
0e63f97f77 Test script that displays tracking data from Vive.TrackedObjects 2017-03-29 18:17:32 -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
humbletim
524806b2d9 Add initial eslint config comments 2017-03-08 14:01:21 -05:00
humbletim
24dd06b65e * address FIXME regarding jasmine.done() 
* support disabling tests / reporting as pending
 2017-03-08 14:01:21 -05: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
humbletim
3ac116545e * Switch trigger for deferred loads from timer to using leading entity completion 
* Bring back notion of tracking "bad scripts" to fail stampeding entities as a set
* Update stampede JS tests to highlight/troubleshoot preexisting unload issue
 2017-02-24 16:05:11 -05:00
humbletim
02827552ae Add EntityScriptServer version of the stampede test 2017-02-24 12:31:18 -05:00
Brad Davis
61e341db75 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-02-23 17:22:03 -08:00
humbletim
0b73cef252 Add stampede test. 2017-02-23 19:10:44 -05:00
humbletim
8ab7a8cad5 fix bracket 2017-02-23 18:16:41 -05:00
humbletim
e794b64c31 Add resolvePath and include characterization/unit tests 2017-02-23 18:13:24 -05:00
Brad Hefta-Gaub
1b7ec7d61e Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements 
Conflicts:
	libraries/avatars/src/AvatarData.cpp
 2017-02-23 13:50:16 -08:00
Brad Davis
81cee57bb1 Add gamma-aware scaling test image 2017-02-22 15:44:27 -08:00
Brad Davis
a2269f488f Add some testing / validation for KTX 2017-02-22 13:29:09 -08:00
Brad Hefta-Gaub
8cc0b383c4 wire up bandwidth buget to sorting 2017-02-21 16:22:22 -08:00
Thijs Wenker
15518e9aa1 remove debugger line 2017-02-21 20:20:23 +01:00
Thijs Wenker
13b2b6086f Fix recorder.js playback in interface 2017-02-21 19:47:26 +01:00
Faye Li
0e8d008b8c only have one instance of photobooth at a time 2017-02-17 13:38:23 -08:00
Faye Li
27b619030d ability to hide tablet and take picture 2017-02-17 11:32:53 -08:00
Faye Li
217ec46222 able to switch camera and clean up code 2017-02-17 10:54:40 -08:00
Faye Li
1e5090ad27 end of day commit 2017-02-15 16:47:06 -08:00
Faye Li
19bff20ebf event handling - can now load models 2017-02-15 16:19:56 -08:00
Faye Li
2c77580ee9 use the new tablet event bridge 2017-02-15 15:58:11 -08:00
Faye Li
f3fdb7c315 added top bar title 2017-02-15 15:02:10 -08:00
Faye Li
3149f02de6 display HTML in tablet instead of overlay web window 2017-02-15 14:25:57 -08:00
Faye Li
18db5f1724 add a tablet button for photobooth 2017-02-15 14:19:03 -08:00
Brad Hefta-Gaub
765500ebce remove debug and fix bug in test script 2017-02-10 10:09:03 -08:00
Brad Hefta-Gaub
f6d4dbb7a4 some debugging 2017-02-10 09:18:04 -08:00
Brad Hefta-Gaub
7fba30f0dd add a test script to show binary message passing 2017-02-09 22:21:51 -08:00
Atlante45
72ed1add94 CR log spam cleanup 2017-02-09 13:04:43 -08:00
Atlante45
6fbe3c9187 Windows specific changes 2017-02-09 13:04:43 -08:00
Atlante45
43d2501993 Add HMD friendly window for the ESS log 2017-02-09 13:04:43 -08:00
Brad Hefta-Gaub
ae071aec0d add a bunch more stats for avatar processing 2017-02-09 09:52:09 -08:00
Brad Hefta-Gaub
41dc498888 add inView simulation stats 2017-02-08 18:32:39 -08:00
Brad Hefta-Gaub
6c41a25032 more stats 2017-02-08 16:51:00 -08:00
Brad Hefta-Gaub
357cc052e1 first cut at simulation stats 2017-02-08 15:32:48 -08:00
howard-stearns
9a44f63b74 update crowd-agent and summon for bubble, avatar-mixin optimizations. 2017-02-07 13:14:15 -08:00
Brad Hefta-Gaub
cff49ea5f3 Merge pull request #9556 from samcake/blue 
Adding support for disabling texturing from the material
 2017-01-31 10:39:44 -08:00
samcake
3c56bd2960 Adding support for disabling texturing from the material 2017-01-30 15:03:04 -08:00
Seth Alves
fa61bbe2a6 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 18:21:39 -08:00
ZappoMan
7ba41c72ef cleanup debugAvatarMixer 2017-01-23 13:31:06 -08:00
ZappoMan
29fff2e556 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-23 13:09:59 -08:00
Seth Alves
eb25e1c12d Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-19 09:41:49 -08:00
samcake
05304c72e0 Merge branch 'master' of https://github.com/highfidelity/hifi into meta 2017-01-18 17:00:20 -08:00
Seth Alves
3517daaad2 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-18 15:49:12 -08:00
samcake
5ed3b48f9d adding the checkbox to show the meta bounds from the debugDeferredLighting.js 2017-01-17 12:15:09 -08:00
humbletim
7025ed5909 update test script to create a triggerable entity 2017-01-17 03:18:56 -05:00
humbletim
88b7f9ec9d add ambient sound test 2017-01-17 01:44:03 -05:00
ZappoMan
aed1b69ee0 make the avatar bounding box be avatar local and only change when it actually changes 2017-01-12 17:19:06 -08:00
Anthony J. Thibault
b251dc9ed6 Tablet springboard can now be scrolled 2017-01-12 13:11:27 -08:00