Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
70488 commits 29 branches 0 tags 1.1 GiB
Commit graph

4711 commits

Author SHA1 Message Date
David Rowe
047ea0deaf Remove the post-teleport spot if a new teleport is started 2018-08-10 11:31:50 +12:00
David Rowe
a08bcd325d Merge branch 'master' into M17217-b 
# Conflicts:
#	interface/src/scripting/HMDScriptingInterface.h
 2018-08-10 11:25:39 +12:00
John Conklin II
6447bcab5b
Merge pull request #13765 from dback2/serverScriptStatus 
Fix server script status
 2018-08-09 14:51:17 -07:00
John Conklin II
f31776516b
Merge pull request #13791 from dback2/editHandlesAlpha 
Alpha 1 for edit handles
 2018-08-09 14:50:43 -07:00
John Conklin II
6481aea2f4
Merge pull request #13715 from SamGondelman/parabolic 
Enable parabolic teleport
 2018-08-09 13:12:17 -07:00
Dante Ruiz
9a8ebdd021
Merge pull request #13739 from dback2/cloneChildrenFix 
Fix cloning a parented entity
 2018-08-09 13:05:28 -07:00
John Conklin II
f4f0c5fcad
Merge pull request #13767 from ctrlaltdavid/M15772 
Fix entity stay highlighted after hand leaves when far grabbing another
 2018-08-09 12:53:41 -07:00
David Back
a6d944e034 use alpha 1 for edit handles 2018-08-09 10:32:34 -07:00
John Conklin II
34697b6b07
Merge pull request #13770 from huffman/fix/edit-duplicate-fix 
Fix duplicating multiple entities causing infinite looping
 2018-08-09 09:07:37 -07:00
Anthony Thibault
90b0bd333f
Merge pull request #13774 from danteruiz/revert-tablet-material-entity 
Revert to using overlays instead of material entities for button highlighting.
 2018-08-08 17:33:26 -07:00
David Rowe
71341cf700 Display teleport target after teleport 2018-08-09 10:51:12 +12:00
Ryan Huffman
544a6504f2
Merge pull request #13760 from ctrlaltdavid/M16932 
Render Touch controllers at physical hands's locations
 2018-08-08 13:11:21 -07:00
David Rowe
f7c17df6cc Float play area and sensors above the ground 2018-08-08 16:32:08 +12:00
David Rowe
fd977a758b Update teleport destination model 2018-08-08 10:49:34 +12:00
David Rowe
96767c1103 Merge branch 'master' into M17217-b 
# Conflicts:
#	plugins/openvr/src/OpenVrDisplayPlugin.cpp
 2018-08-08 10:43:58 +12:00
David Rowe
f65b1a26ae Merge remote-tracking branch 'SamGondelman/parabolic2' into M17217-b 2018-08-08 10:06:43 +12:00
David Back
3c5c5d8552
Merge pull request #13750 from dback2/editLogSpamFix 
Fix edit log spam with -1 hand
 2018-08-07 13:51:39 -07:00
David Rowe
a7170a5892 Fix typo 2018-08-08 08:49:29 +12:00
Dante Ruiz
269afb9a49 remove tablet material entities code remove create 2018-08-07 11:19:22 -07:00
Dante Ruiz
8c5eefcc95 some file and code cleanup 2018-08-07 10:58:45 -07:00
Dante Ruiz
d78c571df6 revert to use overlays instead of entities for tablet highlighting 2018-08-07 10:56:53 -07:00
David Back
d88615219c CR changes 2018-08-07 10:19:48 -07:00
Ryan Huffman
61fdce9c11 Fix duplicating multiple entities causing infinite looping 2018-08-07 09:52:14 -07:00
David Rowe
c9c23b8db3 Fix entity stay highlighted after hand leaves when far grabbing another 2018-08-07 15:34:17 +12:00
David Back
f9e25d36e7 use wrapper emitScriptEvent, change to Fetching 2018-08-06 17:52:27 -07:00
David Back
e5abd9d57d fix server script status event, use [ Getting status ] 2018-08-06 17:03:32 -07:00
David Back
112327a3c1
Merge pull request #13735 from dback2/entityCameraKeyFix 
Use key codes for entity camera keys
 2018-08-06 14:07:48 -07:00
David Rowe
83ed572a33 Render Touch controllers at physical hands's locations 2018-08-04 19:27:44 +12:00
David Rowe
e008f057eb Fade play area after teleport 2018-08-04 18:19:59 +12:00
David Rowe
c0dc70c076 Parent play area to teleport target unless underneath avatar 2018-08-04 17:26:18 +12:00
David Rowe
ed5e77df37 Scale-in teleport target from zero size 2018-08-04 15:11:53 +12:00
SamGondelman
f1ca0411c0 drawInFront parabolas 2018-08-03 16:43:13 -07:00
David Rowe
653a281482 Use new teleport destination FBX 2018-08-04 10:11:22 +12:00
David Rowe
11b85e30db Merge branch 'master' into M17217-a 2018-08-04 09:44:39 +12:00
David Rowe
1cd3869b2c Reinstate FBX file that original version or parabolic branch deleted 2018-08-04 09:42:52 +12:00
David Back
0565e0400c fix edit log spam with -1 hand 2018-08-03 11:08:56 -07:00
David Rowe
5be945715f Include the teleporter target in the occlusion 2018-08-03 08:22:36 +12:00
David Rowe
29dbc01361 Add alternative code to position Oculus sensors at correct elevation 2018-08-03 08:12:44 +12:00
David Rowe
57da0fef63 Show occluded parts of the play area overlays 2018-08-02 15:21:56 +12:00
David Rowe
eed0159b5e Scale-in play area from zero size 2018-08-02 14:45:09 +12:00
David Rowe
07049b9481 Update and tidy play area and Oculus sensor models 2018-08-02 11:08:21 +12:00
David Back
0b9e520b53 fix grab cloning parented entitiy 2018-08-01 16:00:25 -07:00
John Conklin II
f02e91806c
Merge pull request #13686 from huffman/fix/undo-create-entity 
Fix added entities not being undoable in Create
 2018-08-01 13:11:17 -07:00
David Back
cdbf75666f new line 2018-08-01 12:46:49 -07:00
David Back
f946bb73ef remove constants 2018-08-01 12:46:17 -07:00
David Back
97e45643b0 spacing 2018-08-01 12:44:40 -07:00
David Back
ca3151ae39 Merge branch 'master' of https://github.com/highfidelity/hifi into entityCameraKeyFix 2018-08-01 12:43:04 -07:00
David Back
3e9e00f1d6 use key codes for entity camera keys 2018-08-01 12:42:50 -07:00
Thijs Wenker
c562a6945d
Merge pull request #13671 from huffman/fix/create-copy-follows-user 
Fix duplication not working as expected on grabbed entities
 2018-08-01 19:25:33 +02:00
SamGondelman
e11030bbc3 mukul's changes, enable parabolic teleport 2018-08-01 09:46:17 -07:00