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
36752 commits 2 branches 0 tags 1.1 GiB
Commit graph

4864 commits

Author SHA1 Message Date
James B. Pollack
c39f26ad72 new features 2015-12-22 16:31:49 -08:00
James B. Pollack
edd11a670a minor adjustments to particles 2015-12-22 14:38:53 -08:00
James B. Pollack
60f2314469 remove debugging print 2015-12-22 14:38:05 -08:00
Brad Davis
a6d9dbc5c4 Merge pull request #6728 from ZappoMan/rightClickMenu 
More Hand Reticle movement improvements
 2015-12-22 14:00:42 -08:00
Brad Hefta-Gaub
9a3d72c7b6 tweak sleep cycle slightly 2015-12-22 13:55:01 -08:00
Brad Hefta-Gaub
119f3e9895 make both hands and mouse work 2015-12-22 13:35:16 -08:00
James B. Pollack
52e6b84968 Update lightBall.js 
zeroes
 2015-12-22 12:09:16 -08:00
James B. Pollack
7bc7bddc3a set defaults 2015-12-22 12:00:45 -08:00
Brad Hefta-Gaub
cc00aa01fb Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu 2015-12-22 11:54:34 -08:00
James B. Pollack
80e8fcf502 Merge branch 'master' into particle_grab 2015-12-22 11:49:51 -08:00
ericrius1
bb28369dee Merge branch 'polylineOptimizations' of https://github.com/ericrius1/hifi into polylineOptimizations 2015-12-22 11:49:31 -08:00
James B. Pollack
56d654987c changing branches 2015-12-22 11:48:56 -08:00
Eric Levin
e8803ad9ae Lightsaber looks way better now 2015-12-22 11:35:04 -08:00
Eric Levin
653e3ecdcc fixed offset issue with lightsaber 2015-12-22 11:02:36 -08:00
ericrius1
fdb909ca31 merged 2015-12-22 09:40:42 -08:00
Thijs Wenker
6c34059061 (note to self, ctrl-s every 5 seconds in code editor) 2015-12-22 14:24:14 +01:00
Thijs Wenker
c62ff3e5be Merge branch 'master' of https://github.com/worklist/hifi into 20736 2015-12-22 14:14:04 +01:00
Thijs Wenker
b97f7ace66 path fix 2015-12-22 14:09:25 +01:00
Thijs Wenker
aefff1a59b script to trigger recording with an assignment-client using messages-mixer 2015-12-22 14:08:12 +01:00
Thijs Wenker
60e1c74fe9 winter games target Practice scripts 2015-12-22 13:58:18 +01:00
ericrius1
1031489ada changed dates 2015-12-21 19:08:34 -08:00
ericrius1
ba993eccd4 cleanup 2015-12-21 18:32:07 -08:00
ericrius1
8d80c06f02 updated ravestick model 2015-12-21 18:26:28 -08:00
Brad Hefta-Gaub
025e769a9f average both hands, enabled both mouse clicks, and detect base station resting hand 2015-12-21 18:25:30 -08:00
Brad Hefta-Gaub
3dfc48e205 Merge pull request #6687 from jherico/marketplace 
Support the marketplace in QML
 2015-12-21 17:55:55 -08:00
Brad Hefta-Gaub
da86686533 fix reticle drive 2015-12-21 17:10:01 -08:00
Zach Pomerantz
f146b207c4 Update JS debug scripts to use nested props 2015-12-21 15:27:37 -08:00
ericrius1
f19d1a3067 cleanup 2015-12-21 15:20:36 -08:00
ericrius1
876d8ab6b2 far grabbing arc balls 2015-12-21 13:59:00 -08:00
Brad Hefta-Gaub
111a8caa3c Merge pull request #6701 from highfidelity/graphics 
Graphics merge into Master: Adding Gamma correction, Tone Mapping and Debugging tool
 2015-12-21 13:54:50 -08:00
ericrius1
cabc47e7a9 lightsaber immediately turns off on release 2015-12-21 13:30:52 -08:00
ericrius1
4110630d1f fixed ravestick fargrab 2015-12-21 13:15:37 -08:00
ericrius1
1cdee11784 Merge branch 'master' into polylineOptimizations 2015-12-21 12:49:00 -08:00
Thijs Wenker
5d1e5b054a Merge branch 'master' of https://github.com/worklist/hifi into 20736 2015-12-21 21:48:55 +01:00
ericrius1
4b4fe96b64 tweaks 2015-12-21 12:47:31 -08:00
James B. Pollack
b59b8db5c9 set defaults 2015-12-21 12:09:18 -08:00
ericrius1
b89e25f8f7 correct file 2015-12-21 11:35:57 -08:00
Brad Davis
6ef77bc46a Support the marketplace in QML 2015-12-21 11:34:03 -08:00
ericrius1
ba3633710a name fixes 2015-12-21 11:29:59 -08:00
ericrius1
3c66e38268 test 2015-12-21 11:12:59 -08:00
ericrius1
48ab99c348 rotation fix 2015-12-21 11:00:10 -08:00
Brad Hefta-Gaub
248b3d09ac add absolute rotation based hand reticle movement 2015-12-21 10:49:49 -08:00
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
James B. Pollack
da57e29096 start options, cleanup 2015-12-20 16:40:41 -08:00
James B. Pollack
485bb4ee3f slider should stay with avatr 2015-12-19 19:14:56 -08:00
James B. Pollack
daa262af7d readme 2015-12-19 19:14:19 -08:00
James B. Pollack
9f0d254739 panel entity, readme 2015-12-19 19:11:17 -08:00
James B. Pollack
05467bd5e1 create panel entity and parent panel to it 2015-12-19 18:19:00 -08:00
James B. Pollack
378d50d8a3 update overlays when cutoff slider is used 2015-12-19 12:49:42 -08:00
James B. Pollack
eb03dcd821 keep parent of lights that already have parents 2015-12-19 12:47:44 -08:00
James B. Pollack
890f98b38b Merge branch 'master' into light_mod 2015-12-19 12:23:23 -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
James B. Pollack
b0da1773c2 have right rotation on sequential edits 2015-12-18 16:53:41 -08:00
James B. Pollack
4afdd0242b cleanup 2015-12-18 16:44:20 -08:00
James B. Pollack
f834765990 readme 2015-12-18 16:39:21 -08:00
James B. Pollack
e405311cc8 cleanup 2015-12-18 16:35:06 -08:00
James B. Pollack
0e530900d4 sequential editing 2015-12-18 16:22:20 -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
James B. Pollack
387c30d83f close button 2015-12-18 15:04:13 -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
James B. Pollack
f84a441c7d close button 2015-12-17 18:33:17 -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
James B. Pollack
7a542a678b prep for close button 2015-12-17 17:17:04 -08:00
James B. Pollack
a25feb5578 switching branches 2015-12-17 16:58:38 -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
James B. Pollack
8e2128c692 update light volume when you move light parent 2015-12-17 11:59:21 -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
James B. Pollack
5cc5a2ab33 working non kinematic release 2015-12-17 10:58:14 -08:00
ericrius1
d4481818b2 lightsaber oriented right 2015-12-17 10:50:58 -08:00