Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 13:27:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
39307 commits 69 branches 56 tags 1.2 GiB
Commit graph

39307 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
39a7852979 MOving forward with PBR rendering, cleaning up the lighting shaders and the packi/unpack deferredBuffer shaders 2016-02-19 18:43:07 -08:00
samcake
d7b3945c4a Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-19 09:29:23 -08:00
samcake
e103fd364e USing metallic and not gloss map 2016-02-19 09:24:22 -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
3a5ee1db8c Merge pull request #7140 from jherico/qml_mm 
Add a QML document referencing the QML multimedia types
 2016-02-18 19:08:24 -08:00
Brad Davis
6f364de062 Add a QML document referencing the QML multimedia types to force inclusion in the build 2016-02-18 18:39:25 -08:00
samcake
903824809c trying to have better support for the materials 2016-02-18 18:33:32 -08:00
samcake
5c877560fe Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-18 09:25:26 -08:00
Chris Collins
e3ae2baa7b Merge pull request #7123 from ericrius1/editProps 
added collidesWith property to entities list
 2016-02-18 09:11:18 -08:00
James B. Pollack
acaa824cb5 but only position 2016-02-18 09:00:39 -08:00
James B. Pollack
e6662edcb4 revert step size change 2016-02-18 08:57:06 -08:00
Brad Hefta-Gaub
a3766a93ea Merge pull request #7128 from sethalves/fix-energy 
minor adjustments to avatar-energy code
 2016-02-17 20:04:35 -08:00
Brad Hefta-Gaub
39592a583f Merge pull request #7130 from ericrius1/editFix 
fixed edit bug
 2016-02-17 20:02:36 -08:00
samcake
b88501784c Making progress toward the PBR material 2016-02-17 18:47:52 -08:00
ericrius1
5f5af9c6a0 fixed edit bug 2016-02-17 17:45:57 -08:00
James B. Pollack
5aa2979a86 Merge pull request #7127 from sethalves/BUGS 
fix far-trigger
 2016-02-17 16:29:44 -08:00
James B. Pollack
89039747a2 Update entityProperties.html 
lowercase 'static' like other props
 2016-02-17 16:22:14 -08:00
samcake
d7edc8c2ba Adding more fields ready for the PBR stingray materials 2016-02-17 16:06:30 -08:00
Anthony Thibault
e863da5a68 Merge pull request #7118 from jherico/hmd_mono 
Remove distortion on HMD previews, both mono and stereo
 2016-02-17 15:39:48 -08:00
Brad Davis
8289c39a2a Removing flicker from OpenVR mirror 2016-02-17 14:48:24 -08:00
Seth Alves
af1640ac4e adjust avatar-energy code to avoid editing local tree and then not telling the entity-server about it 2016-02-17 14:36:18 -08:00
ericrius1
19cd3ec152 checkboxes working 2016-02-17 13:12:17 -08:00
Seth Alves
64e50c5329 keep search-line from freezing during a far-trigger 2016-02-17 12:35:23 -08:00
Seth Alves
784dc2b538 Merge pull request #7124 from samcake/red 
Fixing the disappearing avatars maybe ?
 2016-02-17 12:05:04 -08:00
Seth Alves
69caf1df4d fix far-trigger 2016-02-17 12:04:25 -08:00
ericrius1
94fdf6b091 checkboxes working 2016-02-17 11:59:14 -08:00
samcake
2ed7f997e3 A few changes in the material call back 2016-02-17 10:44:15 -08:00
ericrius1
f85916e808 checkbox keeps getting checked... 2016-02-17 10:27:53 -08:00
Brad Hefta-Gaub
38430d8d2c Merge pull request #7112 from howard-stearns/snap-turn-preference 
Snap turn preference
 2016-02-17 09:19:38 -08:00
Brad Hefta-Gaub
d5c349abec Merge pull request #7114 from samcake/hdr 
Adding Ambient lighting to transparent surfaces
 2016-02-17 09:08:38 -08:00
Andrew Meadows
07df96b6b3 Merge pull request #7125 from hyperlogic/tony/ik-bugfix 
AnimInverseKinematics: fix for extra twist in lowerSpine joints.
 2016-02-17 08:56:16 -08:00
ericrius1
0f8f67ef0b removing dynamic. need to add others 2016-02-16 19:34:32 -08:00
James B. Pollack
f2445e81e0 Merge pull request #7110 from ericrius1/particlesInEdit2 
Particles in edit
 2016-02-16 18:33:01 -08:00
ericrius1
168fb67d67 making collidesWith a checkbox 2016-02-16 18:19:12 -08:00
Howard Stearns
6d70584b5a Change name and use only when in HMD. 2016-02-16 18:09:56 -08:00
Anthony J. Thibault
2d1304e070 AnimInverseKinematics: use glm::clamp for clarity. 2016-02-16 18:00:45 -08:00
ericrius1
ce2d76d3f3 made export settings a text area 2016-02-16 17:57:09 -08:00
Anthony J. Thibault
b5a72225db AnimInverseKinematics: renamed variable for extra style points 2016-02-16 17:42:51 -08:00
Anthony J. Thibault
df21fffa4a AnimInverseKinematics: fix for extra twist in lowerSpine joints. 
* When computing tipPosition, for the next iteration of the CCD,
  use the leverArm before it's projected onto the lowerSpine twist axis.
* fix for acos() that was going outside of valid domain. (-1.0, 1.0)
 2016-02-16 17:31:39 -08:00
samcake
b03f639e2c Renaming and rearranging the material fields to support PBR fbx materials 2016-02-16 17:20:23 -08:00
samcake
640bf81339 Forcing an update from teh avatar manager to the avatar renderItems when beeing updated 2016-02-16 17:19:31 -08:00
Brad Davis
d1583e8cbe Fixing warnings 2016-02-16 17:00:00 -08:00
Brad Davis
d61f4fbb25 PR feedback 2016-02-16 16:44:16 -08:00
ericrius1
7a3443968d added collides with property 2016-02-16 15:55:11 -08:00
ericrius1
c43500f38a added textures field to particle explorer 2016-02-16 15:36:03 -08:00
ericrius1
023fd0607d added alpha start 2016-02-16 15:29:42 -08:00
ericrius1
d9d0e78dc5 button close 2016-02-16 15:21:18 -08:00
Chris Collins
05b9d88f08 Merge pull request #7108 from imgntn/moreprecision 
More precision for edit.js
 2016-02-16 15:03:10 -08:00
ericrius1
bf21bc2d48 reworked exporting properties 2016-02-16 14:06:02 -08:00
Andrew Meadows
80aee563fc Merge pull request #7119 from sethalves/fix-linux-local-scriptnames 
filenames on Linux are case-sensitive
 2016-02-16 13:27:14 -08:00