Anthony Thibault
0d46b78bff
Merge pull request #10541 from Menithal/21324
...
Reworked Particle Editor UI
2017-06-13 13:00:54 -07:00
Matti Lahtinen
35f83afd09
Removed unneccessary print
2017-06-13 20:43:14 +03:00
Menithal
c2c1e607c0
Formating
2017-06-13 20:31:41 +03:00
Menithal
395cc55fb2
Fixed formatting
2017-06-13 20:20:54 +03:00
Menithal
020760cc97
21324: Fixed accidental inccorect bracket
2017-06-13 20:16:56 +03:00
Menithal
00701eb5c7
Merge remote-tracking branch 'origin/master' into 21324
2017-06-13 19:08:37 +03:00
Menithal
0edb763dac
21324: Formatting and PR Feedback Changes
2017-06-13 19:06:47 +03:00
Bradley Austin Davis
1968ecbc8f
Simplify eventBridge mechanism exposing functionality to web pages
2017-06-12 14:46:37 -07:00
Andrew Meadows
321e307c9f
Merge pull request #10609 from 1P-Cusack/21317
...
WL21317 helper functions for getting into avatar coordinate space
2017-06-12 11:18:29 -07:00
Seth Alves
92fe8145be
Merge pull request #10616 from vladest/create_button_sticked
...
Set active button property isActive before Home menu redraw. Makes su…
2017-06-11 13:43:41 -07:00
Seth Alves
eb049c8c6e
Merge pull request #10624 from misslivirose/feat/add-primitive-shapes
...
Add additional primitive shapes
2017-06-09 19:02:54 -07:00
Clément Brisset
8e62bdea40
Merge pull request #10538 from ctrlaltdavid/21345
...
Position tablet relative to hand
2017-06-09 17:01:37 -07:00
David Rowe
fff8876b21
Code review
2017-06-10 09:33:45 +12:00
Chris Howe
08d93173f0
Minor code feedback changes, moving test scripts to developer/tests.
2017-06-09 11:07:56 -04:00
Seth Alves
759a87c27e
Merge pull request #10647 from misslivirose/feat/move-chat-defaultscripts
...
Move chat app to run with default scripts
2017-06-08 20:26:34 -07:00
Liv Erickson
6657c4d997
Update chat.js
...
remove stray semicolon
2017-06-08 17:22:18 -07:00
Seth Alves
d87b858c0a
Merge pull request #10619 from NeetBhagat/4869-Entity-resize-issue
...
4869 entity resize issue
2017-06-08 16:34:07 -07:00
Seth Alves
9fa74029c7
Merge pull request #10633 from mnafees/21299
...
CR for Job #21299 - Save category on Marketplace when using back button
2017-06-08 16:10:56 -07:00
Vladyslav Stelmakhovskyi
b7f8cc7f0b
Fix intendantion
2017-06-08 22:58:40 +02:00
Liv
03edb06ecb
change design to run chat separately so it can be removed if users prefer to not use it
2017-06-08 13:46:33 -07:00
Liv
0e27ad767c
Move chat app to be included as part of the default scripts
2017-06-08 13:07:01 -07:00
Vladyslav Stelmakhovskyi
dc2c79baab
Merge with master
2017-06-08 21:10:30 +02:00
seefo
8d5b90afe7
Merge pull request #10600 from seefo/snapshot
...
Added Polaroid Feature to Snapshot
2017-06-07 17:05:29 -07:00
seefo
26bd6b67ae
Final touches to polaroid feature
2017-06-07 16:52:16 -07:00
Mohammed Nafees
608becef7d
Make the back button work again, uses the browser history directly now.
2017-06-07 15:52:06 +05:30
Andrew Meadows
f1dd5fbb14
Merge pull request #10613 from hyperlogic/bugfix/teleport-with-no-feet
...
teleport.js should still function on avatars with no feet.
2017-06-06 09:33:00 -07:00
Liv Erickson
6e5cb63d4f
Add z-index fix for dropped down list
2017-06-06 09:15:41 -07:00
Chris Howe
8166fec0e0
Minor changes based on code review feedback
...
See https://worklist.net/21317 ,
https://github.com/highfidelity/hifi/pull/10609 and
https://github.com/highfidelity/hifi/pull/10609#pullrequestreview-42090197
2017-06-06 12:11:57 -04:00
Anthony J. Thibault
90d241ca3c
Account for avatar scale
2017-06-06 09:10:46 -07:00
seefo
b729707ce7
Removed old comments in SnapshotReview.js
2017-06-06 09:10:25 -07:00
Liv
e4963e076a
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/add-primitive-shapes
2017-06-05 17:38:28 -07:00
Liv
9248715b21
Fixing z-index for Shape drop down
2017-06-05 17:37:32 -07:00
Seth Alves
dcbd279bd8
Merge pull request #10589 from vladest/create_in_landscape
...
Implements landscape mode for tablet as rotation instead of stretching [DO NOT MERGE]
2017-06-05 12:46:03 -07:00
Liv
6cecac36d5
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/add-primitive-shapes
2017-06-05 12:23:23 -07:00
Andrew Meadows
85a1e1d691
Merge pull request #10608 from ctrlaltdavid/21379
...
Fix icon for polylines in entities editor properties page
2017-06-05 11:06:23 -07:00
NeetBhagat
2ce72d554b
Resolve 2 issues:
...
1) Entity can grow/shrink if it is grabbed by first right hand then left hand.
2) Stop unwanted grow/shrink of an entity.
2017-06-05 14:13:51 +05:30
NeetBhagat
967c50ab93
Merge branch 'master' into 4869-Entity-resize-issue
2017-06-05 11:08:51 +05:30
Menithal
4842de8f07
Fixed issue with orientation
2017-06-04 00:03:14 +03:00
Vladyslav Stelmakhovskyi
4dbe646c17
Set ective button property isActive before Home menu redraw. Makes sure redraw will read proper value of isActive property
2017-06-03 15:40:25 +02:00
Anthony J. Thibault
7da73d0ff1
teleport.js should still function on avatars with no feet.
2017-06-02 18:01:40 -07:00
Clément Brisset
0a864a7ce9
Merge pull request #10570 from ctrlaltdavid/21376
...
Move record script files to unpublishedScripts directory
2017-06-02 16:25:56 -07:00
manapa01
8e1577d3d3
Merge pull request #10596 from manapa01/Snapshot-Sound
...
Snapshot sound
2017-06-02 16:07:05 -07:00
Patrick Manalich
0b2de18e8e
Volume Change
2017-06-02 16:04:03 -07:00
Clément Brisset
5f91d2dcb7
Merge pull request #10569 from ctrlaltdavid/21312
...
Improve positioning of assets when added / imported
2017-06-02 15:45:18 -07:00
seefo
fa726f43a6
Fixed a bug in Polaroid canRez listener
2017-06-02 13:47:58 -07:00
seefo
7ade5b07a6
Final touches to Polaroids
2017-06-02 11:35:56 -07:00
David Rowe
58c4a2f12a
Fix icon for polylines in entities editor properties page
2017-06-03 06:26:13 +12:00
seefo
655a411865
Cleaned up Polaroid code
2017-06-02 11:02:01 -07:00
Patrick Manalich
a705e722f1
Ctrl-S sound feature added
2017-06-02 10:35:57 -07:00
NeetBhagat
580c2548e9
Initial Commit :
...
1) Resolve a bug when 2 different entity is grabbed in 2 hands. And move your left hand and entity of left hand grow/shrink when you move right/left hand.
2) Resolve right hand-left hand grow-shrink functionality
2017-06-02 23:04:58 +05:30
