Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 12:09:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
36624 commits 75 branches 59 tags 1.2 GiB
Commit graph

4777 commits

Author SHA1 Message Date
samcake
6bbc94badc Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-21 10:48:55 -08:00
ericrius1
45ba7a3d35 merged 2015-12-21 10:46:54 -08:00
ericrius1
0dd7287e61 mergedq 2015-12-21 10:46:45 -08:00
ericrius1
7a7befafb9 arc balls working 2015-12-21 10:43:59 -08:00
Brad Davis
46a4a469e9 Merge pull request #6689 from ZappoMan/rightClickMenu 
Some early work to support hand driven reticle
 2015-12-20 17:49:50 -08:00
samcake
1e8e3fec87 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-19 11:38:20 -08:00
Brad Hefta-Gaub
e929e3f789 more work on angular velocity tests 2015-12-18 19:20:32 -08:00
ericrius1
1beec0dbe7 balls 2015-12-18 18:15:05 -08:00
Brad Davis
6098c4a1d6 Revert "Revert "Migrate QML based web views to Qt WebEngine"" 
This reverts commit 1f3adeb666.
 2015-12-18 17:18:46 -08:00
samcake
7e66515beb Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-18 17:13:48 -08:00
Brad Davis
1f3adeb666 Revert "Migrate QML based web views to Qt WebEngine" 2015-12-18 17:09:38 -08:00
samcake
41525a7c4d Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-18 16:20:41 -08:00
Brad Hefta-Gaub
a621579f17 add philips version of hand movement 2015-12-18 15:44:21 -08:00
Brad Hefta-Gaub
4075f355a3 more work on hand movement 2015-12-18 15:44:01 -08:00
ericrius1
fffe6dbb9b relative rotation 2015-12-18 15:38:01 -08:00
samcake
f24800cf10 Change the default tone curve to jusimple gamma correct and fix the renaming in the renderENgineDebug script 2015-12-18 15:35:01 -08:00
ericrius1
514cb7a329 Beams arc to each other. BAM 2015-12-18 15:26:21 -08:00
ericrius1
2dbb3bd84a Added grab offsets to createPingPongGun.js 2015-12-18 15:12:46 -08:00
Brad Hefta-Gaub
868d10651a Merge pull request #6651 from jherico/webengine 
Migrate QML based web views to Qt WebEngine
 2015-12-18 14:56:35 -08:00
ericrius1
77264b3f99 Ping pong gun lines up with hand 2015-12-18 14:52:39 -08:00
Brad Hefta-Gaub
42764426ce Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu 2015-12-18 14:30:16 -08:00
Brad Hefta-Gaub
5701ad2e8c update to new angular velocity 2015-12-18 12:38:50 -08:00
David Rowe
c3e3af7c8c Document effect of Bezier interpolation on particle radius simulation 2015-12-18 15:11:43 +13:00
David Rowe
e2ecc388ca Indicate particle properties that (temporarily) aren't working 2015-12-18 15:10:47 +13:00
David Rowe
5aef309b8a Get particles in particlesTest.js emitting again 2015-12-18 15:09:36 +13:00
Brad Hefta-Gaub
762aefbbca add hand driven reticle 2015-12-17 17:38:20 -08:00
ericrius1
aa1f77ab1c adding ravestick to toybox demo room 2015-12-17 15:42:52 -08:00
Atlante45
9d6618c341 Cleanup DebugDeferredBuffer code 2015-12-17 15:18:23 -08:00
Atlante45
b271542b73 Save DebugMode to setting, restore on script start 2015-12-17 15:18:23 -08:00
ericrius1
3e6ae7c571 added lightball back 2015-12-17 15:02:25 -08:00
ericrius1
035ca25b48 arc ball finds other balls 2015-12-17 13:31:27 -08:00
ericrius1
6f82d680b9 removed unwanted file 2015-12-17 12:38:25 -08:00
Brad Davis
5088eec2a2 Move directory web UI into the overlay 2015-12-17 12:23:39 -08:00
Brad Davis
82c865af2c Rename QmlWebWindow to OverlayWebWindow, move ctor registration to script engine 2015-12-17 12:20:38 -08:00
ericrius1
5b52b5e5e7 Merge branch 'master' into polylineOptimizations 2015-12-17 11:41:34 -08:00
ericrius1
8d25a666d1 fixed bug where trail would remain after user released rave stick 2015-12-17 11:40:06 -08:00
ericrius1
2aaefbcfcb refactoring, adding headers 2015-12-17 11:32:48 -08:00
Brad Hefta-Gaub
63a63152a4 add procedural hand pose example 2015-12-17 11:10:49 -08:00
ericrius1
d4481818b2 lightsaber oriented right 2015-12-17 10:50:58 -08:00
ericrius1
57e51afd46 light stick 2015-12-17 10:35:20 -08:00
ericrius1
f7811cf5dc light trails from rave stick 2015-12-17 10:25:51 -08:00
ericrius1
064c05e98c light trails 2015-12-17 10:04:51 -08:00
ericrius1
b127b6a9e8 separating out rave stick 2015-12-17 08:55:57 -08:00
Brad Hefta-Gaub
24dde9ea92 Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu 2015-12-16 21:28:42 -08:00
Brad Hefta-Gaub
0b9bd858a7 implement support for pose ScriptEndpoints 2015-12-16 21:28:27 -08:00
ericrius1
bb67ca87e2 lightsabers 2015-12-16 17:52:39 -08:00
ericrius1
f9f496ef5a adding beam effect 2015-12-16 17:32:30 -08:00
ericrius1
d8c8778316 rave stick in right orientation 2015-12-16 16:50:27 -08:00
Brad Davis
fa5bab08b1 Support web content inside QML 2015-12-16 16:25:38 -08:00
ericrius1
263557cc1a setting dimensions for rave stick 2015-12-16 16:18:57 -08:00
ericrius1
6a77ae5db2 adding rave stick 2015-12-16 15:47:34 -08:00
ericrius1
4155e3af71 refactoring 2015-12-16 15:22:56 -08:00
ericrius1
b29a6b16a9 modularizing flow art tools 2015-12-16 14:40:56 -08:00
ericrius1
fcfa396912 syntax tweak 2015-12-16 13:58:55 -08:00
Clément Brisset
48429eddc8 Merge pull request #6666 from samcake/hdr 
Graphics: Adding a simple manual exposure for configuring the tone mapping
 2015-12-16 12:09:52 -08:00
samcake
b4b541178d Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-16 09:42:06 -08:00
Clément Brisset
7c8f019507 Merge pull request #6663 from birarda/baseball 
update link to bat script in createBatButton.js
 2015-12-15 19:26:33 -08:00
ericrius1
61bad36d5c tweaks 2015-12-15 18:49:04 -08:00
samcake
d2ebaef69e Adding a simple manual exposure control to configure the tonemapping and expose it to js. Add a convenient way to access the Job._concept._data with template 2015-12-15 18:18:42 -08:00
ericrius1
d9c93130e5 In a state where non uniform random vals are clear 2015-12-15 18:02:11 -08:00
Stephen Birarda
13c83bb262 update link to bat script in createBatButton.js 2015-12-15 17:23:29 -08:00
Brad Davis
29516619ee Merge pull request #6661 from ZappoMan/rightClickMenu 
first cut at simulating mouse/reticle behavior with input contorllers
 2015-12-15 16:08:59 -08:00
Brad Hefta-Gaub
3dcdfbc0f1 first cut at simulating mouse/reticle behavior with input contorllers 2015-12-15 13:59:22 -08:00
ericrius1
dca83a054e Changed additiveBlending to emitterShouldTrail 2015-12-15 10:30:57 -08:00
ericrius1
c561a53f7c Going to change additive blending to world position prop 2015-12-15 09:56:28 -08:00
samcake
3554f54e17 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-14 17:38:56 -08:00
ericrius1
761dfeaccd 2 balls 2015-12-14 14:53:08 -08:00
James B. Pollack
e3e1bc1dc6 updates 2015-12-14 13:01:44 -08:00
James B. Pollack
76487bca7a updates 2015-12-14 13:01:03 -08:00
ericrius1
8d691f2132 light ball 2015-12-14 11:44:42 -08:00
James B. Pollack
4d9cb6a6df other variations 2015-12-14 11:41:34 -08:00
James B. Pollack
e43b60f9f5 other variations 2015-12-14 11:40:47 -08:00
Anthony J. Thibault
3f0cdb3c02 Merge branch 'master' into tony/js-avatar-default-pose 2015-12-14 11:19:24 -08:00
ericrius1
3d782f1307 fixed merge conflicts 2015-12-14 10:11:49 -08:00
ericrius1
ab5b783cb7 zone tweal 2015-12-14 09:01:45 -08:00
Brad Hefta-Gaub
2815cb0fef first cut at adding advanced and developer menu groupings 2015-12-12 18:12:36 -08:00
James B. Pollack
a0b698c028 reorg props 2015-12-12 17:33:54 -08:00
James B. Pollack
0ddc2ba76e rename lasers to lines 2015-12-12 16:18:15 -08:00
James B. Pollack
fe05542440 more vis 2015-12-12 14:30:34 -08:00
Thijs Wenker
cfd2c2785c Merge branch 'master' of https://github.com/worklist/hifi into 20736 2015-12-12 21:16:02 +01:00
Thijs Wenker
cb948e0608 allow entity scripts to attach entities to a hand with handControllerGrab.js 2015-12-12 21:15:06 +01:00
James B. Pollack
70a0e51cc9 back to default state 2015-12-11 17:59:03 -08:00
samcake
b3acde4462 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-11 17:49:00 -08:00
James B. Pollack
1b1edf6f7a actually delete lights now that it doesnt crash 2015-12-11 17:23:35 -08:00
James B. Pollack
11aaeb1ec0 only create particle beams if set 2015-12-11 14:48:07 -08:00
Brad Hefta-Gaub
64dd36d140 Merge pull request #6503 from imgntn/ratsteer 
Add rats to Drylake environment
 2015-12-11 13:08:03 -08:00
James B. Pollack
35da54fc6c dead code and print statements 2015-12-11 11:51:32 -08:00
James B. Pollack
a31ba089c1 semicolons and print statements 2015-12-11 11:49:00 -08:00
James B. Pollack
4e9d81f187 add support for various beam visualizations 2015-12-11 11:38:16 -08:00
Howard Stearns
e8ffa598a2 Merge branch 'master' of https://github.com/highfidelity/hifi into scriptable-anim-var-triggers 2015-12-10 20:40:42 -08:00
Howard Stearns
dfec222c81 Report animation triggers to normal javascript animationStateHandlers, and update away.js as an example. 2015-12-10 20:39:01 -08:00
James B. Pollack
99bc47867a cleanup 2015-12-10 18:16:01 -08:00
samcake
5d395ae54f Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-10 18:06:43 -08:00
James B. Pollack
2acc0df1f0 beams with spotlights 2015-12-10 17:39:29 -08:00
James B. Pollack
16ab7e74de cleanup spotlights 2015-12-10 16:53:13 -08:00
James B. Pollack
efaa30a509 rotatable light 2015-12-10 16:18:40 -08:00
James B. Pollack
9fc456697e merge 2015-12-10 14:30:55 -08:00
James B. Pollack
c463e36ce6 make particle explorer visible 2015-12-10 14:02:52 -08:00
Anthony J. Thibault
020836f536 Fixed date on tPose.js 2015-12-10 14:00:22 -08:00
Anthony J. Thibault
652ce5501f Expose Avatar default pose to JavaScript 
New JavaScript API to get the avatar's default pose.

   MyAvatar.getDefaultJointRotation(index);
   MyAvatar.getDefaultJointTranslation(index);

See `examples/tPose.js` for example usage
 2015-12-10 13:57:31 -08:00