Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 04:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
78843 commits 67 branches 56 tags 1.2 GiB
Commit graph

7817 commits

Author SHA1 Message Date
Angus Antley
c0da46453b made correction 2019-04-30 14:34:10 -07:00
Angus Antley
5c6ea082db changed away script to make you active if you turn on your mic 2019-04-30 14:06:18 -07:00
Simon Walton
ae68478aea Remove avatarTheftPrototype.js 2019-04-27 23:42:28 -07:00
Simon Walton
1fe8f4332f Fixes to banner; swap out avatar on client; reviewer comments; other WIP 2019-04-26 18:45:48 -07:00
Simon Walton
f3efee56c0 Merge remote-tracking branch 'upstream/master' into avatar-verification 2019-04-25 13:40:27 -07:00
Simon Walton
de97af5c02 Minimal working version for avatar's client 
Also merge of Wayne's proof-of-concept
 2019-04-24 17:42:51 -07:00
Sam Gondelman
1540c5d203
Merge pull request #15401 from SamGondelman/grid 
Case 22229: Create Grid ignorePickIntersection
 2019-04-24 12:24:27 -07:00
Shannon Romano
42fb23ed5d
Merge pull request #15435 from samcake/blackProp 
Case 22327: Add a qml library to represent and interact with the engine configs, enhance Luci
 2019-04-24 09:22:11 -07:00
Shannon Romano
a6ff19c4ee
Merge pull request #15377 from sethalves/remove-unwanted-view-menuitems 
case 22175: remove view/Independent-Mode and view/Entity-Mode menu items
 2019-04-24 09:13:59 -07:00
unknown
22c2bfc075 fix material target parentIDChanged 2019-04-22 15:03:12 -07:00
Sam Gateau
6539482cc2 Merge branch 'master' of github.com:highfidelity/hifi into blackProp 2019-04-22 08:46:34 -07:00
Sam Gateau
ba02aa7098 making luci2 better 2019-04-19 16:56:55 -07:00
Sam Gateau
af3d981ad1 Bringing the Luci interface into the new Prop framework and moving some tools there too 2019-04-18 17:44:08 -07:00
Thijs Wenker
386d392144 The step arrows are actually clickable, they were missing multi-diff behavior before this change. < = > 2019-04-18 19:05:40 +02:00
Sam Gateau
3d78592bb8 Adding more style widgets andbringing luci1 into the panels of luci2 2019-04-18 00:19:19 -07:00
Sam Gateau
9873c10353 Better canvas ICon qml and activation of the jobs 2019-04-17 17:58:48 -07:00
Thijs Wenker
dc9f8895f8 Merge branch 'master' of github.com:highfidelity/hifi into feat/create/editMultipleProperties 
# Conflicts:
#	scripts/system/html/js/entityProperties.js
 2019-04-18 00:21:11 +02:00
SamGondelman
54d7bde91a grid ignorePickIntersection 2019-04-17 10:56:55 -07:00
Sam Gateau
92c1fd69c1 Merge branch 'master' of github.com:highfidelity/hifi into blackProp 2019-04-17 10:09:20 -07:00
Sam Gateau
4ce7d75720 FInding a path 2019-04-16 23:38:40 -07:00
Sam Gateau
f6001c178d Merge branch 'master' of https://github.com/highfidelity/hifi into blackProp 2019-04-16 18:43:30 -07:00
Sam Gateau
f2b747a68d Adding indentation of the folder in the header and refining background color 2019-04-16 18:15:00 -07:00
unknown
2839879657 Merge branch 'master' of https://github.com/highfidelity/hifi into undoEditOrderFix 2019-04-16 15:26:47 -07:00
Shannon Romano
ec22f7847e
Merge pull request #15367 from dback2/editContinualTranslateRC82ToMaster 
Case 22130: PR 15366 changes from v82 to Master
 2019-04-16 15:17:08 -07:00
Sam Gateau
1fd88e8269 Merge branch 'master' of github.com:highfidelity/hifi into blackProp 2019-04-15 14:05:33 -07:00
Thijs Wenker
ef7c34eadd addressed more CR feedback 2019-04-15 19:04:24 +02:00
Sam Gateau
e7e9715e10 merging up 2019-04-15 09:16:59 -07:00
unknown
d342d93ec9 fix material targets when re-opening properties to same entity 2019-04-12 14:49:59 -07:00
Thijs Wenker
00a024fde2 fixing materialTargets, after the rebase 2019-04-12 20:06:32 +02:00
Thijs Wenker
c283c062c1 CR changes 2019-04-12 19:32:05 +02:00
Thijs Wenker
8b24cf51de enhance the multi editing experience 2019-04-12 19:32:05 +02:00
Thijs Wenker
8e97c4f3f2 multi-editing support for properties 2019-04-12 19:30:12 +02:00
Thijs Wenker
71770e3f4e move entity selection update code to its own function 2019-04-12 19:29:36 +02:00
Thijs Wenker
aef4f28194 unused variables / missing semi-colon 2019-04-12 19:26:03 +02:00
Seth Alves
feda884c71 remove view/Independent-Mode and view/Entity-Mode menu items and related code. Leave the modes available for scripts. 2019-04-12 09:21:48 -07:00
Shannon Romano
13fb3148a5
Merge pull request #15352 from dback2/materialTargetMasterFollowup 
Case 22082, 22101: PR 15325 follow up and PR 15351 RC82 > Master
 2019-04-11 17:53:05 -07:00
Ryan Huffman
f2474b4d2b Fix lack of ranges on numerical types in Create 2019-04-11 14:20:52 -07:00
Sam Gateau
081fdf14ef
Merge pull request #15283 from kitely/fix-script-warnings 
case 21978: Eliminated some JavaScript warnings due to missing commas
 2019-04-10 11:28:04 -07:00
unknown
ca7cfc0240 only call onMove on lastMouseEvent change 2019-04-10 09:56:35 -07:00
unknown
d63c733b85 move undo edits after creates/deletes 2019-04-08 16:05:13 -07:00
unknown
1537d4351d CR changes from PR 15325 2019-04-08 14:07:25 -07:00
unknown
b8b9035f9d fix avatar/shape material targets, refresh material target when parent changes 2019-04-08 13:43:22 -07:00
Thijs Wenker
98e0164964
Merge pull request #15281 from kitely/copy-grandchild-entities 
case 21980: Allow copying grandchild entities
 2019-04-08 19:59:46 +02:00
Ryan Huffman
aff80dec26
Merge pull request #15325 from dback2/dynamicMaterialTargetProperties 
Case 20738: add dynamic multiselect for material target property
 2019-04-05 17:55:26 -07:00
Shannon Romano
7e354a953b
Merge pull request #15276 from huffman/fix/new-properties-in-create 
Case 20739: Add new web and base properties to Create
 2019-04-05 16:55:19 -07:00
Ryan Huffman
a4919320b3
Merge pull request #15277 from dback2/editHandleContinualTranslateFix 
Case 20896: Fix continual edit handle translation when moving
 2019-04-05 15:40:57 -07:00
unknown
f2aa155e1e tweak style, add scrolling 2019-04-05 15:35:37 -07:00
unknown
4f4ec064e4 add dynamic multiselect for material targets 2019-04-05 15:35:37 -07:00
Ryan Huffman
9c4b3f017f
Remove min/max on web entity maxFPS 
Instead, let the C++ side enforce any limits. If we enforce a hard limit later on, we can get them via `Entities.getPropertyInfo`.
 2019-04-05 15:08:48 -07:00
Sam Gateau
9581f5c958 separating the group header container 2019-04-05 08:44:49 -07:00
Sam Gateau
3ddde35d8f Merge branch 'master' of https://github.com/highfidelity/hifi into blackProp 2019-04-03 16:56:17 -07:00
r3tk0n
874fb6b6d7 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-03 12:42:33 -07:00
Sam Gondelman
1cc2cd3194
Merge pull request #15237 from SamGondelman/particleShapes 
Case 21859: Particle Entity emitter shapes, including model
 2019-04-03 11:03:33 -07:00
unknown
8dbdee4262 better fix for trailing key events 2019-04-03 09:08:29 -07:00
David Back
93fc8e2e18 fix continual translation when moving 2019-04-02 15:11:32 -07:00
Ryan Huffman
ea2e62c1ca
Merge pull request #15293 from huffman/fix/damping-on-new-dynamic-entities 
Case 20826: Add damping to new dynamic entities in Create
 2019-04-02 14:28:35 -07:00
Sam Gondelman
414a39bd8a
Merge branch 'master' into particleShapes 2019-04-01 22:20:13 -07:00
r3tk0n
4fb7bbabe1 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-01 14:52:21 -07:00
Wayne Chen
abe5748e60
Merge branch 'master' into newAudioMuteStates 2019-04-01 12:24:46 -07:00
Saracen
90e979bda7 Add option to disable triggering an away state when interface 
focus is lost.
 2019-03-31 18:44:16 +01:00
Shannon Romano
c5e7c63d38
Merge pull request #15289 from roxanneskelly/Case20499 
Case 20499 - Scripts that use AppUI don't call `that.onClosed()` if the script is restarted while the app is open
 2019-03-29 17:05:21 -07:00
Shannon Romano
a83b90cdc6
Merge pull request #15044 from sethalves/lock-wearables 
case 21149: add a button to Avatar panel to lock or unlock wearables; allow others to grab unlocked wearables
 2019-03-29 10:41:21 -07:00
Wayne Chen
3c65b92ff5 moving text position higher 2019-03-29 10:41:16 -07:00
Wayne Chen
248f9ba375 adding mute overlay back into HMD and have warn when muted disable in desktop 2019-03-29 10:32:13 -07:00
Ryan Huffman
bcb38b6626 Add damping to new dynamic entities in Create 2019-03-29 09:01:42 -07:00
Roxanne Skelly
44b92c542b Case 20499 - Scripts that use AppUI don't call that.onClosed() if the 
script is restarted while the app is open
 2019-03-28 16:05:24 -07:00
Roxanne Skelly
73cf51182e
Merge pull request #15262 from roxanneskelly/Case20832 
Case20832- Inventory app Login and Cancel buttons do not respond if user logs out while Inventory is open.
 2019-03-28 12:01:24 -07:00
Oren Hurvitz
a00c9893a1 Eliminated some JavaScript warnings due to missing commas 2019-03-28 16:06:31 +02:00
Oren Hurvitz
69ebf1629d Allow copying grandchild entities. 
Using Copy/Paste on entities only worked for one level of children, but not for grandchildren.
 2019-03-28 11:00:09 +02:00
Ryan Huffman
9abd0943ff Add new web and other properties to Create 2019-03-27 16:29:04 -07:00
Wayne Chen
f3708ba27b
Merge branch 'master' into newAudioMuteStates 2019-03-27 15:49:39 -07:00
Seth Alves
e085a00256 cause 'save' button to unghost if an attachment is adjusted via grab while the adjust-wearables page is open 2019-03-27 10:12:58 -07:00
Seth Alves
d25d290394 refer to ungrabbable wearables as 'frozen' rather than locked, because locked is such an overloaded term 2019-03-27 10:12:58 -07:00
Seth Alves
e6c279ee5b unlock, rather than lock entities when adjust-attachments window is open, because the windows says you can adjust with hand-controllers 2019-03-27 10:12:58 -07:00
Seth Alves
fa36f12145 lock wearables when adjust-wearables page is opened 2019-03-27 10:12:57 -07:00
Seth Alves
4fe94a4b32 when new wearables are added or removed, rerun getWearablesLocked() and update UI 2019-03-27 10:12:57 -07:00
Seth Alves
29af3b1612 add a button to Avatar panel to lock or unlock wearables. 
allow grabbing / adjusting others' wearables if they are unlocked.
 2019-03-27 10:12:57 -07:00
Seth Alves
84385e6061 work around fb-21767 with a timer 2019-03-26 09:40:22 -07:00
Seth Alves
4303dd589f make sure equip attachment-points pulled from settings are reasonable before using them 2019-03-26 09:40:22 -07:00
Seth Alves
195472bd43 make equipping of clonables more reliable 2019-03-26 09:40:22 -07:00
Wayne Chen
c54e8f5569 showing ptt text always + hmd mode switch fix 2019-03-25 17:32:03 -07:00
Roxanne Skelly
90b9de8623 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20832 2019-03-25 14:48:26 -07:00
Roxanne Skelly
1608b24be1 ase 20832 - Inventory app login and cancel buttons don't work on logout 2019-03-25 14:48:17 -07:00
r3tk0n
3ac42e69e3 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-03-25 11:27:31 -07:00
Wayne Chen
390ce9bb26 wip for getting AvatarInputsBar to switch accordingly 2019-03-22 15:34:06 -07:00
Wayne Chen
7b5deb692c fixing x value change 2019-03-22 14:54:18 -07:00
Wayne Chen
1f71a291a5 displaying offset values 2019-03-22 14:54:18 -07:00
Wayne Chen
554a144b0e adding tool to change avatar inputs properties 2019-03-22 14:54:17 -07:00
Wayne Chen
584fa1f17b more wip 2019-03-22 14:54:17 -07:00
Wayne Chen
6cf8b06c6d more wip on adding qml to adjusting ui position 2019-03-22 14:54:16 -07:00
Wayne Chen
cb715c3e55 fixing typos 2019-03-22 14:54:16 -07:00
Wayne Chen
b6ebdb5315 alpha to max value of detecting transparency 2019-03-22 14:54:16 -07:00
Wayne Chen
4cbe8cd4d1 Adding alpha to entities to enable transparency 2019-03-22 14:54:15 -07:00
Wayne Chen
ee1a14505a adding constants, removing entity creation in cpp 2019-03-22 14:54:15 -07:00
Wayne Chen
44ed9e607b cancelling out roll and pitch 2019-03-22 14:54:15 -07:00
Wayne Chen
87de95c63b adding test script for creating avatar input bar 2019-03-22 14:54:14 -07:00
Wayne Chen
d0116abc52 separating out bubble icon qml - adding support for transparency 2019-03-22 14:54:13 -07:00
Wayne Chen
d834c5aca1 adding test script for creating avatar input bar 2019-03-22 14:16:29 -07:00
Wayne Chen
77b7cc2457 separating out bubble icon qml - adding support for transparency 2019-03-22 14:16:29 -07:00
Wayne Chen
d382893e75 staging avatar inputs for ignore radius 2019-03-22 14:16:28 -07:00