Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 04:53:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
36640 commits 71 branches 56 tags 1.2 GiB
Commit graph

36640 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
e995b29712 can target without grabbing 2015-12-30 00:36:11 -08:00
Philip Rosedale
6d857296f9 show search sphere instead of beams, start at center of view 2015-12-29 23:37:10 -08:00
Philip Rosedale
36beea17fa Improved hand controller reticle movement 2015-12-28 14:59:43 -08:00
Eric Levin
890b39f04b Merge pull request #6740 from imgntn/blacklist_grab 
Add Raypick Blacklisting to handControllerGrab.js
 2015-12-28 13:39:23 -08:00
James B. Pollack
8eeae5ddf0 Merge pull request #6736 from ericrius1/handGrabCalcs 
Hand grab calcs
 2015-12-28 10:49:55 -08:00
James B. Pollack
e237f957a6 Merge branch 'master' into blacklist_grab 2015-12-28 10:24:27 -08:00
James B. Pollack
4b50a030e0 Update masterReset.js 2015-12-28 10:23:08 -08:00
James B. Pollack
4f80753d7b Update masterReset.js 2015-12-28 10:22:34 -08:00
James B. Pollack
679070ff6e Update hiddenEntityReset.js 2015-12-28 10:22:02 -08:00
James B. Pollack
c4d7b7b9bb Update utils.js 2015-12-28 10:21:23 -08:00
James B. Pollack
a133dfa8dd Merge pull request #6738 from ericrius1/rayBlacklist 
Ray-pick blacklisting
 2015-12-28 10:19:52 -08:00
James B. Pollack
0e30393c81 make sure theres something on the blacklist 2015-12-27 12:47:56 -08:00
James B. Pollack
546e908633 protect blacklisting to my id 2015-12-27 12:46:40 -08:00
James B. Pollack
28c53822b1 add raypick blacklisting to hand grab script 2015-12-27 12:37:33 -08:00
Brad Davis
8e2a79ba4c Merge pull request #6735 from ZappoMan/headPoseReticle 
add a test script for HMD.getHUDLookAtPositionXX()
 2015-12-27 13:19:18 -05:00
ericrius1
542d8a4b6c Fixed spelling mistakes 2015-12-24 12:06:29 -08:00
ericrius1
2e95ca7947 fixed syntax error 2015-12-24 12:05:11 -08:00
ericrius1
340c066b5c reverted whiteboard changes 2015-12-24 12:04:36 -08:00
ericrius1
8e7dfc07c0 Added logic to blacklist entities from raypicking 2015-12-24 11:59:47 -08:00
ericrius1
390dce4613 Adding blacklist 2015-12-24 11:48:40 -08:00
ericrius1
e8a6fd1f05 adding ray filters example/test 2015-12-24 11:00:24 -08:00
samcake
a8c5828eb3 Merge pull request #6737 from zzmp/refactor/final-blit 
Move final blit into RenderDeferredTask
 2015-12-24 10:43:52 -08:00
Zach Pomerantz
dfa2b8d453 Remove redundant clearColorBuffer from Blit 2015-12-24 10:39:29 -08:00
ericrius1
24796c1a1e updated ravestick spawner relative position 2015-12-24 10:14:36 -08:00
Zach Pomerantz
687eef37da Move final blit into RenderDeferredTask 
- Also changes color buffer clearing, such that
anything run through Blit will now clear BUFFER_COLOR0  to 0,0,1,0.
- Blit will always be added to RenderDeferredTask, but
will only run if renderArgs._blitFramebuffer is set.
 2015-12-23 18:21:08 -08:00
ericrius1
cd983db419 fixed merge conflicts 2015-12-23 15:13:45 -08:00
ericrius1
b4988b0998 Taking individual avatar hand size into consideration for grabbing objects 2015-12-23 15:09:10 -08:00
Brad Hefta-Gaub
f8a515de64 add a test script for HMD.getHUDLookAtPositionXX() 2015-12-23 14:46:18 -08:00
James B. Pollack
a023a7eebd Merge pull request #6734 from AlessandroSigna/branchJS 
Fix assignment
 2015-12-23 14:05:56 -08:00
AlessandroSigna
2c72e7964d Fix assignment 2015-12-23 13:54:06 -08:00
samcake
01a5f47070 Merge pull request #6733 from zzmp/feat/render-gui 
Simplify renderDebug GUI
 2015-12-23 13:40:53 -08:00
Zach Pomerantz
ea9f2e57ce Simplify renderDebug GUI 2015-12-23 13:09:45 -08:00
Brad Davis
dd17fa0058 Merge pull request #6730 from ZappoMan/fixWarning 
fix warning
 2015-12-23 12:59:38 -08:00
James B. Pollack
d8278459be Merge pull request #6724 from thoys/20736 
Winter Smash up Target Practice game
 2015-12-23 10:34:20 -08:00
Thijs Wenker
505f4ce7e4 Merge branch 'master' of https://github.com/worklist/hifi into 20736 
Conflicts:
	examples/controllers/handControllerGrab.js
 2015-12-23 02:37:38 +01:00
James B. Pollack
32b9f60bd5 Merge pull request #6731 from imgntn/grabhotfix1 
fix  handControllerGrab  merge problems
 2015-12-22 17:24:30 -08:00
James B. Pollack
4115138b5b fix merge problems 2015-12-22 17:22:55 -08:00
Brad Hefta-Gaub
68c6cae4f3 fix warning 2015-12-22 17:21:25 -08:00
Brad Hefta-Gaub
7a09582a65 Merge pull request #6729 from zzmp/fix/reorder 
Reorder RenderContext initializer to avoid -Wreorder
 2015-12-22 17:19:32 -08:00
Seth Alves
46233b24c0 Merge pull request #6630 from imgntn/particle_grab 
Add Various Grab Visualization Options
 2015-12-22 16:51:30 -08:00
James B. Pollack
64eb22bf22 merging 2015-12-22 16:34:01 -08:00
Brad Davis
88d36487f8 Merge pull request #6727 from samcake/hdr 
Clean up shaders removing  glowIntensity and alphaThreshold legacy
 2015-12-22 15:41:08 -08:00
Zach Pomerantz
df78f895a6 Reorder RenderContext initializer to avoid -Wreorder 2015-12-22 14:54:47 -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
samcake
f9070ee989 Cleanup cruft in the shaders, glowIntensity and alphaThreshold not needed anymore 2015-12-22 12:41:31 -08:00
James B. Pollack
88a5a0a35d Merge pull request #6685 from ericrius1/polylineOptimizations 
First pass at Flow Arts Hut
 2015-12-22 12:28:34 -08:00