Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-23 11:20:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61951 commits 73 branches 59 tags 1.2 GiB
Commit graph

61951 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
03977334a0 near-trigger works? 2017-08-15 14:50:39 -07:00
Seth Alves
3b61e8518f near-trigger works? equip calls its entity methods now 2017-08-15 14:46:48 -07:00
Seth Alves
ddca25672f trying to get near-triggering working 2017-08-15 14:14:28 -07:00
vladest
273261ee57 Reworked WindowScriptingInterface browse method for async methods 2017-08-15 23:12:35 +02:00
Liv
aea5f170f2 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup 2017-08-15 13:58:22 -07:00
Liv
49eab847fd Refactor handleOctreeFileReplacement, style changes, align with handler for other file types 2017-08-15 13:58:02 -07:00
vladest
8afdb27c1b Reworked WindowScriptingInterface save method for async methods 2017-08-15 22:55:44 +02:00
Liv
c0fa446b75 Remove domain management scripting interface 2017-08-15 13:49:13 -07:00
Anthony J. Thibault
f46198c2fd Simplified/Improved avatar capsule calculation 
IK is no longer performed during capsule calculation, This fixes an issue with the mannequin avatar in the marketplace.
Specifically, it was causing the hips to rise during IK which would result in an incorrectly sized and offset capsule.
 2017-08-15 13:48:10 -07:00
Zach Fox
b7282cc776 Lots of fixes 2017-08-15 13:46:20 -07:00
Anthony Thibault
342f8acff5 Merge pull request #11176 from hyperlogic/feature/improve-hand-body-collision 
Improve avatar hand vs body collision
 2017-08-15 13:43:21 -07:00
SamGondelman
9bb7e66859 separate raypickscriptinginterface, cleanup 2017-08-15 13:36:41 -07:00
Seth Alves
1d24523be9 equip drop gesture works 2017-08-15 13:09:17 -07:00
Zach Fox
528d2072f9 Bugfixes and improvements 2017-08-15 12:14:32 -07:00
Seth Alves
e6ac07d43d equipping mostly works 2017-08-15 11:45:45 -07:00
Anthony J. Thibault
6e0ddadb29 Fix for array size. 2017-08-15 11:45:22 -07:00
David Kelly
0f7db74ef1 missed a couple warnings 2017-08-15 11:44:15 -07:00
Dante Ruiz
84738f51c2 fixed tab issue 2017-08-15 11:21:43 -07:00
Dante Ruiz
3a8856fae6 fix selection issue for TreeView.qml 2017-08-15 11:21:34 -07:00
Anthony J. Thibault
04006a9f76 code review feedback 2017-08-15 11:19:41 -07:00
Zach Fox
bddce9328b V1 2017-08-15 11:08:03 -07:00
Seth Alves
b2d7eefc97 equip highlight works now 2017-08-15 10:30:47 -07:00
Elisa Lupin-Jimenez
072f3dfb03 removed commented out code, removed blocks from default scripts 2017-08-15 10:25:14 -07:00
David Kelly
a6390edf46 ugh 2017-08-15 10:10:48 -07:00
Elisa Lupin-Jimenez
3d7995da34 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-15 10:01:24 -07:00
Sam Gateau
2a75cde48a Merge pull request #11185 from samcake/blue 
Fixing the graphics setting for Ambient Occlusion
 2017-08-15 09:26:45 -07:00
Sam Gateau
d624413c14 Merge pull request #11189 from SamGondelman/line3DFix 
Fix drawInFront overlays only rendering in left eye
 2017-08-15 09:26:18 -07:00
Seth Alves
774cb33303 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-15 09:17:52 -07:00
David Kelly
c08fce967f forgot a warning 2017-08-15 08:58:16 -07:00
vladest
51a5c30353 Reimplement asset browsing for async 2017-08-15 17:05:55 +02:00
vladest
e9ed05c3ba Reimplement snapshot dir browser for async 2017-08-15 15:55:36 +02:00
vladest
9aace9e67d Merge branch 'master' into modal_dialogs_async 2017-08-15 14:57:13 +02:00
vladest
757af1e2e5 Added Save, Directory and Assets async methods 2017-08-15 14:44:01 +02:00
David Rowe
cb53ad43e0 Tidying 2017-08-15 18:16:21 +12:00
David Rowe
8d01c02c29 Tidy clearing color swatches 2017-08-15 17:54:21 +12:00
David Rowe
8cf18c1b03 Tidy applying color swatches 2017-08-15 17:47:59 +12:00
David Rowe
3a1fc1f11c Remember Physics slider values 2017-08-15 17:44:42 +12:00
Seth Alves
b52a406ff1 trying to get equipping working 2017-08-14 18:25:57 -07:00
SamGondelman
1c27335193 a couple logging fixes 2017-08-14 17:34:32 -07:00
Seth Alves
21cef482a5 Merge pull request #11190 from druiz17/fix-table-dialog 
Fixed unable to select items in a TreeView
 2017-08-14 17:05:42 -07:00
David Kelly
ef5863d169 warnings squashed 2017-08-14 16:24:50 -07:00
SamGondelman
194b7d6655 warning 2017-08-14 16:08:07 -07:00
Dante Ruiz
459f2c5cdc fixed tab issue 2017-08-14 16:03:12 -07:00
Dante Ruiz
99617600c4 fix selection issue for TreeView.qml 2017-08-14 15:58:28 -07:00
David Rowe
504857a1b8 Set up Physics sliders 2017-08-15 10:23:36 +12:00
Zach Fox
823f2fb252 Merge pull request #11181 from cain-kilgore/skybox-changer 
WL 21447 - Create a Skybox Changer
 2017-08-14 15:08:03 -07:00
Zach Fox
ee4a07b10d Merge pull request #11187 from zfox23/context_removeWhenDeleting 
Remove context overlay (if present) when removing entity
 2017-08-14 15:06:20 -07:00
SamGondelman
8163430282 fix depth buffer issue that was messing with drawInFront, plus some small fixes to line3ds 2017-08-14 15:03:14 -07:00
Cain Kilgore
e7a4bff705 Made Changes per Review, added js 2017-08-14 22:47:18 +01:00
Anthony Thibault
9af6f2683a Merge pull request #11083 from Menithal/experimental-face-expressions 
Opened up setForceFaceTrackerConnected
 2017-08-14 14:19:08 -07:00