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

36617 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
James B. Pollack
52e6b84968 Update lightBall.js 
zeroes
 2015-12-22 12:09:16 -08:00
James B. Pollack
5e0a428dec Update hiddenEntityReset.js 
add zeroes
 2015-12-22 12:07:57 -08:00
James B. Pollack
51630734df Update masterReset.js 
add initial zeroes
 2015-12-22 12:07:02 -08:00
ericrius1
6fc98bd577 fixed ravestick, merged 2015-12-22 12:03:03 -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
Eric Levin
e8803ad9ae Lightsaber looks way better now 2015-12-22 11:35:04 -08:00
Brad Hefta-Gaub
298e4d0f83 Merge pull request #6726 from jherico/legacy_oculus 
Legacy oculus work
 2015-12-22 11:02:37 -08:00
Eric Levin
653e3ecdcc fixed offset issue with lightsaber 2015-12-22 11:02:36 -08:00
Brad Hefta-Gaub
22bc6f861a Merge pull request #6722 from jherico/server_only_build 
Add CMake flag for building only server components
 2015-12-22 10:53:26 -08:00
Bradley Austin Davis
79d8b20637 Simulating Oculus interaction on legacy platforms 2015-12-22 10:09:45 -08:00
ericrius1
fdb909ca31 merged 2015-12-22 09:40:42 -08:00
Brad Davis
7fdeb66cf4 Merge pull request #6723 from ZappoMan/macHydraCrash 
fix crash on mac when sixense DLL can't be loaded
 2015-12-22 09:32:23 -08:00
Bradley Austin Davis
e0e1ae43f5 Fixing legacy oculus plugin 2015-12-22 09:28:38 -08:00
Brad Davis
243fba461d Add CMake flag for building only server components 2015-12-22 09:19:07 -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
Brad Hefta-Gaub
eff830ad4b fix crash on mac when sixense DLL can't be loaded 2015-12-22 01:03:23 -08:00