Howard Stearns
e2dd00bdc4
unique message for exceeding poll limit
2017-05-02 13:12:24 -07:00
Howard Stearns
43f8467708
lint
2017-05-02 13:12:09 -07:00
Vladyslav Stelmakhovskyi
b3e078eb74
Trigger rebuild
2017-05-02 13:11:32 -07:00
Vladyslav Stelmakhovskyi
7f1db38390
Renamed EDIT to CREATE
2017-05-02 13:11:23 -07:00
volansystech
87ceebca82
Merge branch 'master' of https://github.com/highfidelity/hifi into 21200
...
# Conflicts:
# scripts/system/controllers/handControllerGrab.js
2017-04-27 12:58:18 +05:30
Seth Alves
60453f8748
Merge pull request #10294 from ctrlaltdavid/record-for-marketplace
...
Make record script able to be put on the marketplace
2017-04-26 19:34:39 -07:00
Thijs Wenker
2fd6786225
Merge pull request #10295 from PhilipRosedale/halfDuplex
...
Reduce log spam
2017-04-27 02:17:48 +02:00
Philip Rosedale
a880ca1262
Reduce log spam
2017-04-26 16:51:26 -07:00
David Rowe
9c7353deb2
Make record script able to be put on the marketplace
2017-04-27 11:22:25 +12:00
anshuman64
d146431e9b
Merge pull request #10268 from druiz17/input-recorder
...
Input recorder/ input playback system for all input actions
2017-04-26 16:20:20 -07:00
anshuman64
c088bd6891
Merge pull request #10271 from humbletim/21281
...
CR Job #21281 -- Doppleganger Mirror
2017-04-26 16:18:14 -07:00
Howard Stearns
7654823775
Merge pull request #10292 from thoys/make-connection-fix
...
makeUserConnection.js Fix for alternative skeletons
2017-04-26 16:02:16 -07:00
Zach Fox
9ace7a7488
Merge pull request #10279 from andrewd440/21174
...
21174 Make the Particle Emitter Easier to Use
2017-04-26 15:35:29 -07:00
humbletim
6e07933356
uncomment UserActivityLogger.logAction
2017-04-26 18:28:54 -04:00
humbletim
f8bbd9174c
Merge remote-tracking branch 'upstream/master' into 21281
2017-04-26 18:26:15 -04:00
anshuman64
5bd9b2e631
Merge pull request #10130 from ctrlaltdavid/21249
...
New avatar record and playback script
2017-04-26 15:18:30 -07:00
humbletim
cabeced66e
* changes per feedback and testing
...
* add support for UserActivityLogger.logAction (commented-out, pending #10130 )
* autodisable doppleganger when avatar changes model
* autodisable doppleganger when user moves to a different domain
* use ModelCache.prefetch for detecting model load status
* expose new signals to help keep activity logging and debugging decoupled
2017-04-26 17:51:21 -04:00
Thijs Wenker
26173700b8
Merge pull request #10267 from Triplelexx/21287
...
21287 - Newly created entities in Edit.js should be grabbable
2017-04-26 23:16:04 +02:00
Thijs Wenker
bf81ae78b9
Merge branch 'master' of https://github.com/highfidelity/hifi into make-connection-fix
...
# Conflicts:
# scripts/system/makeUserConnection.js
2017-04-26 22:52:57 +02:00
David Rowe
a68ee02e8d
Log script start-up
2017-04-27 08:41:29 +12:00
Brad Hefta-Gaub
f1bd371fbe
Merge pull request #10175 from PhilipRosedale/springHold
...
New Tutorial and entity scripts
2017-04-26 13:16:17 -07:00
Triplelexx
e295ab2778
change location of menu item Create Entities As Grabbable
2017-04-26 21:13:39 +01:00
Thijs Wenker
d05229d3b4
fix conversion
2017-04-26 22:11:56 +02:00
Thijs Wenker
20a9b60e7b
this might make it work
2017-04-26 21:42:36 +02:00
Triplelexx
06b3b84145
changes from CR
2017-04-26 18:50:15 +01:00
Thijs Wenker
0363e96f34
Allow skeletons with different bone structures to become friends (still requires hands)
2017-04-26 18:55:50 +02:00
Thijs Wenker
a25584c90f
ESLINT, style and spelling fixes
2017-04-26 18:51:55 +02:00
Zach Fox
3e24296996
Swap the two lines
2017-04-26 09:10:05 -07:00
Dante Ruiz
d8e6e8e7d0
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-26 16:53:02 +01:00
Dante Ruiz
79d827c6be
added requested features
2017-04-26 16:52:51 +01:00
David Rowe
4581b9a0df
Refresh countdown number upon reopening dialog
2017-04-26 20:13:21 +12:00
Triplelexx
01b11022e3
add menu item to control grabbable setting on newly created entites
2017-04-26 07:26:00 +01:00
humbletim
84c8b2945a
detect and update doppleganger when user changes skeletonModelURLs; cleanup
2017-04-26 01:58:51 -04:00
Philip Rosedale
8826dbef78
removed old gravity example
2017-04-25 22:37:20 -07:00
Philip Rosedale
c69d064cc3
code review fixes
2017-04-25 22:14:03 -07:00
David Rowe
06f56f024b
Increase delay of checking a recording loaded to reduce false positives
2017-04-26 15:55:59 +12:00
David Rowe
c5f384d8fb
Don't fade playback avatar when approaches observer
2017-04-26 14:02:45 +12:00
David Rowe
4a5f84f4b9
Merge branch 'master' into 21249
...
# Conflicts:
# libraries/audio-client/src/AudioClient.cpp
2017-04-26 13:24:18 +12:00
Thijs Wenker
5457b8d214
Merge pull request #10260 from PhilipRosedale/halfDuplex
...
Half Duplex script
2017-04-26 01:47:16 +02:00
Dante Ruiz
5a9cf554e7
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-25 23:57:48 +01:00
Philip Rosedale
16dd6a2ce1
Code review / lint
2017-04-25 15:37:39 -07:00
David Rowe
c83f82f5da
Delay start of recording until after beep finishes
2017-04-26 08:59:50 +12:00
Brad Hefta-Gaub
1962a49f3b
Merge pull request #10225 from sethalves/bullet-constraints-1
...
Bullet constraints + far-grab bootstrap fix
2017-04-25 13:36:47 -07:00
humbletim
a833912399
cleanup and documentation
2017-04-25 16:30:05 -04:00
Brad Hefta-Gaub
0783433d75
Merge pull request #10251 from birarda/edit-baked-column
...
add a column to edit.js to identity baked models
2017-04-25 13:04:48 -07:00
Dante Ruiz
8c020a0ec2
saving work
2017-04-25 18:01:19 +01:00
Philip Rosedale
eaa2102d3f
Code review fixes
2017-04-24 21:03:17 -07:00
Philip Rosedale
663e682f23
Merge branch 'halfDuplex' of https://github.com/PhilipRosedale/hifi into springHold
2017-04-24 20:46:48 -07:00
David Rowe
79346673ed
Log user activity events in record and playback scripts
2017-04-25 13:43:28 +12:00
Andrew Lowry
5ffb8eba86
Initialize background color for color picker correctly.
2017-04-24 20:37:43 -04:00
