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

5387 commits

Author SHA1 Message Date
Zach Pomerantz
c2ed5e5474 Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity 2016-02-24 16:24:09 -08:00
Brad Hefta-Gaub
9273238b53 Merge pull request #7178 from Nex-Pro/20807 
CR for Job #20807 - Fix vertically mirrored particles.
 2016-02-24 13:43:40 -08:00
Clément Brisset
8e8e23452f Merge pull request #7156 from ZappoMan/depthReticleWork 
Depth reticle work
 2016-02-23 17:54:35 -08:00
Nex Pro
6403bb60a5 added particleOrientationTest.js for testing. 2016-02-24 01:20:49 +00:00
Clément Brisset
f82e5e2cd6 Merge pull request #7166 from ericrius1/editFix 
Fixed bug with parsing numbers for edit js
 2016-02-23 11:57:19 -08:00
Brad Hefta-Gaub
a71a78b2d3 add comments and license header to reticleDepth.js 2016-02-23 11:22:24 -08:00
Brad Hefta-Gaub
8117d51324 Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork 2016-02-23 10:21:10 -08:00
ericrius1
749f4478ab Fixed bug with parsing numbers for editjs 2016-02-23 09:33:37 -08:00
Zach Pomerantz
2534bb14f3 Amend entityProperties for fixed-dec light values 2016-02-22 19:27:36 -08:00
Seth Alves
23b204c0c6 fix logic that checks getEntityProperties return value 2016-02-22 19:03:12 -08:00
Zach Pomerantz
dacf9f7123 Rm extra " in entityProperties 2016-02-22 15:18:45 -08:00
Zach Pomerantz
77ad4039bc Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity 2016-02-22 15:11:12 -08:00
Zach Pomerantz
868e2ec961 Use "number" in entityProperties 2016-02-22 15:07:10 -08:00
Zach Pomerantz
1506686b79 Expose light surface to entityProperties 2016-02-22 15:07:09 -08:00
Seth Alves
f113a83c5b merge from upstream 2016-02-22 14:02:38 -08:00
Seth Alves
c470649076 don't crash if entity vanishes while doing touch test 2016-02-22 14:00:01 -08:00
Seth Alves
8a3b233659 don't crash if entity vanishes while doing touch test 2016-02-22 13:58:07 -08:00
Brad Hefta-Gaub
3f7a2eb10a add support in depthReticle.js to set depth to overlay depth when you're over a 2D overlay 2016-02-22 13:54:46 -08:00
Brad Hefta-Gaub
54b21abf02 remove editWithHacks and move to more generic depthReticle 2016-02-22 13:32:19 -08:00
Brad Hefta-Gaub
fc002df5e7 implement Reticle.depth using the apparent 3D look at logic instead 2016-02-22 13:24:14 -08:00
Ryan Huffman
e6ccf501fa Merge pull request #7135 from zzmp/fix/grid 
Update renderGrid to use a shader, and fix grid edit tools
 2016-02-22 12:58:23 -08:00
Brad Hefta-Gaub
715355464f Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork 2016-02-22 12:52:56 -08:00
Chris Collins
f24e4bc6b1 Merge pull request #7152 from sethalves/fix-touch 
fix grab-script touch
 2016-02-22 09:58:29 -08:00
Brad Hefta-Gaub
3f03678d02 add version of edit that sets reticle depth 2016-02-22 09:27:27 -08:00
Brad Hefta-Gaub
cbe80bffd6 go into away mode if you the HMD loses mouse capture 2016-02-21 12:57:14 -08:00
Seth Alves
5f79500e4d fix grab-script touch 2016-02-21 09:37:43 -08:00
Brad Hefta-Gaub
1a4591db58 Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking 2016-02-21 09:30:41 -08:00
Brad Hefta-Gaub
2810be8787 fix scripts to use new API 2016-02-19 17:57:49 -08:00
Zach Pomerantz
c9362a4073 Set grid major div min to 1 2016-02-19 15:58:08 -08:00
Zach Pomerantz
5d78867197 Set grid height via global y-coord 2016-02-19 15:41:38 -08:00
Zach Pomerantz
d74aa4f14d Rm extra , in gridControls 2016-02-19 14:54:19 -08:00
Howard Stearns
1d84bd17da Merge pull request #7134 from ericrius1/acInjectors 
Injector Load Test script
 2016-02-19 14:41:11 -08:00
Zach Pomerantz
fd6aa9a78b Add layering to renderGrid, draw edit grid not layered 2016-02-19 13:57:32 -08:00
ericrius1
e4508e1d34 added comment and name 2016-02-19 12:06:08 -08:00
samcake
04543e7b0e Merge pull request #7138 from zzmp/fix/render-debug 
Update render/debug.js
 2016-02-19 10:10:43 -08:00
Ryan Huffman
69a953725e Merge pull request #7132 from imgntn/edit-precision-things 
Revert step size change in edit.js
 2016-02-19 08:20:04 -08:00
Brad Hefta-Gaub
d1e1067e5a allow hydra mouse to know the correct size of screen to target 2016-02-18 22:30:31 -08:00
Zach Pomerantz
2dd1cf2f15 Update Render.fromJSON to Render.load 2016-02-18 18:21:26 -08:00
ericrius1
33a232edde got rid of magic numbers 2016-02-18 18:17:37 -08:00
Zach Pomerantz
981d4d37ca Update render/debug.js 
- Add a toggle for the entire UI
- Set items sliders minimums to -1
- Fix off-by-one with debug buffer radios
 2016-02-18 17:45:55 -08:00
ericrius1
d0660fc90a logging 2016-02-18 16:17:22 -08:00
ericrius1
bc0216633e more logging 2016-02-18 16:10:12 -08:00
ericrius1
c3a687e294 ac test 2016-02-18 16:06:53 -08:00
Zach Pomerantz
b68213f9bf Reintroduce grid to edit.js 2016-02-18 15:48:25 -08:00
ericrius1
b0664b587f bumped injector count 2016-02-18 15:39:38 -08:00
ericrius1
efbb5ec967 updated test 2016-02-18 12:14:30 -08:00
ericrius1
ec1c7925c0 updated logging 2016-02-18 12:02:22 -08:00
ericrius1
1d9b3fadaf more logging 2016-02-18 12:00:24 -08:00
ericrius1
eabeb98076 injector load 2016-02-18 11:50:26 -08:00
Brad Hefta-Gaub
0467930c57 Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking 
Conflicts:
	examples/controllers/handControllerGrab.js
 2016-02-18 10:30:43 -08:00