Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-15 00:47:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
74908 commits 25 branches 28 tags 1.2 GiB
Commit graph

30717 commits

Author SHA1 Message Date
Thijs Wenker
c95da0a595 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 
# Conflicts:
#	interface/src/Application.cpp
 2019-01-03 22:17:54 +01:00
Seth Alves
ad1235ce94 also bump entity protocol version 2019-01-03 08:19:13 -08:00
Seth Alves
a7515a4bde include owningAvatarID in entityPropertyFlagsFromScriptValue 2019-01-03 08:18:34 -08:00
Seth Alves
3ccbd0bc7b disable positionand velocity script edits on grabbed entities 2019-01-03 08:17:52 -08:00
Seth Alves
3c0243419b trying again on avatar-entity grab releases 2019-01-03 08:17:52 -08:00
Seth Alves
54a5805b5c add final edit when dropping an avatar-entity. don't allow grabbing of other's avatar entities 2019-01-03 08:17:52 -08:00
Seth Alves
05a80ae0e4 don't bootstrap with a traits-based grab 2019-01-03 08:17:52 -08:00
Seth Alves
9bf9e379a3 fix far-grab initial rotation and entity-method call 2019-01-03 08:17:52 -08:00
Seth Alves
895e8cdba1 fix off-hand adjustment of equipped entities. make traits-based grabbing be enabled by default, again 2019-01-03 08:17:52 -08:00
Seth Alves
bc5079e5d7 fix flawed logic in updateEntityQueryAACubeWorker 2019-01-03 08:17:52 -08:00
Seth Alves
38cc2205ec dimensions is a simulation restricted change 2019-01-03 08:17:52 -08:00
Seth Alves
fc128b49de don't crash when releasing an entity that has expired 2019-01-03 08:17:52 -08:00
Seth Alves
78aff6e95c grab js api; send grab information through trait system 2019-01-03 08:17:52 -08:00
Thijs Wenker
725a14ce80 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2019-01-03 11:06:19 +01:00
Sam Gondelman
aeafb3c9a7
Merge pull request #14569 from SamGondelman/NOverlays6 
Case 20281: Add missing Text Entity properties
 2019-01-02 18:07:37 -08:00
Thijs Wenker
cb91a4bc6d Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2019-01-03 00:10:22 +01:00
Antonina Savinova
4838a9107a
Merge pull request #14624 from davidkelly/dk/17207 
ACs don't need to call into flagtimeForConnecitonStep
 2019-01-02 13:41:30 -08:00
SamGondelman
32bec57cfe Merge remote-tracking branch 'upstream/master' into NOverlays6 2019-01-02 09:53:29 -08:00
Jeff Clinton
bb27acf934
Merge pull request #14530 from SamGondelman/NOverlays4 
Case 20134: Grid Entities
 2019-01-02 09:12:34 -08:00
Jeff Clinton
032178673a
Merge pull request #14634 from SamGondelman/NOverlays5 
Case 20200: Update EntityScriptingInterface to not find local entities (#2)
 2019-01-02 09:00:56 -08:00
Thijs Wenker
20c169bd39 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2019-01-02 14:03:13 +01:00
Thijs Wenker
cb33a91a34 - rename functionality 
- avatar packager works in tablet now
 2018-12-29 03:31:56 +01:00
Adam Smith
52980559b8
Merge pull request #14491 from SamGondelman/v3 
Case 20080: v3 + v4 procedurals and misc shader fixes
 2018-12-28 15:17:50 -08:00
Thijs Wenker
1ec8aa8fa5 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2018-12-28 17:13:05 +01:00
Ryan Huffman
c21d037800 Fix marketplace uploader not working with projects larger than 128MB 2018-12-27 17:51:27 -08:00
Adam Smith
0d27cb65ca
Merge pull request #14576 from sabrina-shanman/hfm_prep_graphics 
(case 20297) Move graphics preparation from Serializers to runtime preparation step
 2018-12-27 15:46:21 -08:00
Brad Hefta-Gaub
440f517b88
Merge pull request #14602 from samcake/punk 
Case 20303 : Cleaning up the render view tasks and jobs for better 2ndary camera
 2018-12-27 15:43:17 -08:00
Thijs Wenker
1a38abe230 - add jointIndexes to new 
- attempt to fix OSX / linux build
- ability to actually load a recent project (previously was only able to load the top recent project)
 2018-12-27 21:47:10 +01:00
Thijs Wenker
b6359a6cb4 Merge branch 'feat/avatarTools/avatarPackager' of github.com:huffman/hifi into feat/avatarTools/avatarPackager 2018-12-27 14:25:13 +01:00
Ryan Huffman
1da179dc04 Update avatar packager styling 2018-12-27 00:13:45 -08:00
SamGondelman
87947a7165 try to fix grid color issue 2018-12-25 02:17:37 -05:00
SamGondelman
a25c9395b3 glsl initializer lists are 4.2 2018-12-25 00:46:42 -05:00
Thijs Wenker
a1ef1b4447 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2018-12-24 16:48:40 +01:00
Ryan Huffman
b717188ed0 Update avatar project styling 2018-12-22 21:57:09 -08:00
SamGondelman
8dae2502ee fix overlay picking 2018-12-22 02:21:29 -05:00
SamGondelman
64b461274b remove new API 
(cherry picked from commit 5eccaad135)
 2018-12-22 01:45:56 -05:00
SamGondelman
43bc184254 different entity flags for domain/avatar 
(cherry picked from commit 7054188f21)
 2018-12-22 00:55:27 -05:00
SamGondelman
b5a2642b6a updated entityscriptinginterface API and related functions 
(cherry picked from commit 6aac596698)
 2018-12-22 00:55:10 -05:00
Thijs Wenker
ad2d9bc79a - fst read/write should work 
- images are being copied into the correct directory
- scripts are added to fst upon project load
- modal overlay fix
 2018-12-21 19:34:54 +01:00
Adam Smith
a9f59fae71
Merge pull request #14631 from highfidelity/revert-14547-NOverlays5 
Revert "Case 20200: Update EntityScriptingInterface to not find local entities"
 2018-12-21 10:32:59 -08:00
Thijs Wenker
ea901aa179 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2018-12-21 14:11:57 +01:00
Thijs Wenker
dab4a621a3 Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2018-12-21 01:59:11 +01:00
Adam Smith
3c89d51994
Merge pull request #14626 from luiscuenca/gltfEmbeddedBinCrashFix 
Case 20391: Fix crash when importing a glTF model that contains embedded buffers
 2018-12-20 16:55:37 -08:00
Sam Gondelman
097d2d9503
Revert "Case 20200: Update EntityScriptingInterface to not find local entities" 2018-12-20 16:53:33 -08:00
SamGondelman
835615fbbd separate out v3 and v4 2018-12-20 16:33:13 -08:00
Ryan Huffman
556f516be6 Update uploader screen 2018-12-20 16:30:08 -08:00
SamGondelman
9fc7813e24 Merge remote-tracking branch 'upstream/master' into v3 2018-12-20 16:05:06 -08:00
SamGondelman
bb030660bd Merge remote-tracking branch 'upstream/master' into NOverlays4 2018-12-20 13:26:23 -08:00
sam gateau
26c9d7a94e Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-20 13:22:19 -08:00
Shannon Romano
21ec4e0c53
Merge pull request #14524 from SamGondelman/NOverlays3 
Case 20132, Case 16928: First class Image Entities
 2018-12-20 21:20:49 +00:00