Philip Rosedale
|
fe92d38b60
|
Fixed scaling of self
|
2017-02-08 15:42:10 -08:00 |
|
Brad Hefta-Gaub
|
357cc052e1
|
first cut at simulation stats
|
2017-02-08 15:32:48 -08:00 |
|
David Kelly
|
ff7c9d3546
|
Working like before
Single entity script running properly. Now, need to add the zone
filters and execute them.
|
2017-02-08 15:36:16 -07:00 |
|
Ryan Huffman
|
58e3351b25
|
Update stopwatch to use relative paths to models + sounds
|
2017-02-08 14:27:06 -08:00 |
|
Andrew Meadows
|
e02810458b
|
clear old avatarEntityData when saving settings
|
2017-02-08 14:14:48 -08:00 |
|
Ryan Huffman
|
40bd7d9475
|
Update the stopwatch spawn script to exit when done
|
2017-02-08 14:10:04 -08:00 |
|
Ryan Huffman
|
bc11bf0a69
|
Update position and orientation of stopwatch
|
2017-02-08 14:09:50 -08:00 |
|
Brad Hefta-Gaub
|
07cf87749f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into betterBots
|
2017-02-08 13:41:33 -08:00 |
|
Brad Hefta-Gaub
|
82e4b1c690
|
only recordings with audio
|
2017-02-08 13:41:20 -08:00 |
|
Brad Hefta-Gaub
|
9d3c674271
|
fix warning
|
2017-02-08 13:41:09 -08:00 |
|
Brad Hefta-Gaub
|
202e430adb
|
added 4 more recordings to the script
|
2017-02-08 13:38:55 -08:00 |
|
Ryan Huffman
|
f75eceda65
|
Add entity PPS per script configuration
|
2017-02-08 13:11:18 -08:00 |
|
Brad Hefta-Gaub
|
89368afd68
|
add back accidentally removed line
|
2017-02-08 12:52:17 -08:00 |
|
Brad Hefta-Gaub
|
42e9fed64a
|
improved version of random recording bot script
|
2017-02-08 12:36:13 -08:00 |
|
Brad Hefta-Gaub
|
eedfc4fd38
|
fix various bot related bugs
|
2017-02-08 12:35:00 -08:00 |
|
samcake
|
363db8a834
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
|
2017-02-08 11:52:18 -08:00 |
|
Andrew Meadows
|
cc301d1c1a
|
remove legacy empty avatarEntityData settings
|
2017-02-08 11:50:15 -08:00 |
|
Andrew Meadows
|
a871613f84
|
make Settings::remove() work for groups
|
2017-02-08 11:49:40 -08:00 |
|
samcake
|
267d553c26
|
Cleaning comments and pixel format assignments
|
2017-02-08 11:42:23 -08:00 |
|
samcake
|
9e95944195
|
clean the usage of glCopyImageSubData and provide a fall back for 4.2)
|
2017-02-08 11:36:34 -08:00 |
|
samcake
|
8a40e951ac
|
clean the usage of glCopyImageSubData and provide a fall back for 4.2)
|
2017-02-08 11:35:50 -08:00 |
|
samcake
|
a137659a35
|
Cleaning up pr for simpler merge
|
2017-02-08 11:13:55 -08:00 |
|
Clément Brisset
|
91bfa65fe2
|
Merge pull request #9586 from Triplelexx/21146
21146
|
2017-02-08 11:07:27 -08:00 |
|
Dante Ruiz
|
7db86204d1
|
general function to load QML for javascript for tablet
(cherry picked from commit b50e20c545 )
|
2017-02-08 10:25:11 -08:00 |
|
David Kelly
|
c08adc9faa
|
and the new filter class
|
2017-02-08 10:51:28 -07:00 |
|
David Kelly
|
4821180dd3
|
Just add a pointer to the filter class
but do nothing with it
|
2017-02-08 10:48:26 -07:00 |
|
David Kelly
|
61e558e568
|
Entity Edit Filters for zones
Part 1 - just put them in the zones entities. Next I'll hook them
up and actually filter...
|
2017-02-08 09:53:25 -07:00 |
|
Philip Rosedale
|
4554d8ba68
|
Merge pull request #9630 from TopRamenGod/21138
CR for Job #21138 Make jumping easier in the Vive
|
2017-02-08 08:11:04 -08:00 |
|
Seth Alves
|
47976406fc
|
Merge pull request #9607 from hyperlogic/bug-fix/better-haptics
More consistent haptics on web overlays and entities
|
2017-02-08 05:47:05 -08:00 |
|
Anthony J. Thibault
|
244437d971
|
set WANT_DEBUG_STATE back to false
|
2017-02-07 23:50:06 -08:00 |
|
Seth Alves
|
e1a3b0c551
|
Merge pull request #9629 from hyperlogic/feature/tablet-2d-window-pos
In desktop mode create tablet near mouse click location.
|
2017-02-07 19:51:05 -08:00 |
|
mike
|
6cba2049dd
|
Made jumping easier on the Vive
|
2017-02-07 19:46:16 -08:00 |
|
Anthony J. Thibault
|
cb58c567b8
|
In desktop mode create tablet near mouse click location.
But prevent the tablet from being displayed off screen.
|
2017-02-07 18:18:34 -08:00 |
|
samcake
|
7b49f548ed
|
trying to remove the 24bits formats
|
2017-02-07 18:06:49 -08:00 |
|
Howard Stearns
|
811f8d9c1d
|
Merge pull request #9627 from howard-stearns/pal-performance
PAL performance
|
2017-02-07 16:54:22 -08:00 |
|
howard-stearns
|
2e88f1ab1f
|
conserving audio interval
|
2017-02-07 16:21:14 -08:00 |
|
howard-stearns
|
23fc9b6fb3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into pal-performance
|
2017-02-07 16:00:08 -08:00 |
|
howard-stearns
|
3bd11978aa
|
low-hanging fruit on pal performance
|
2017-02-07 15:59:38 -08:00 |
|
Seth Alves
|
d75512f680
|
Merge pull request #9619 from birarda/bug/domain-settings-save-row
fix for default value insertion in domain server settings
|
2017-02-07 15:40:30 -08:00 |
|
Seth Alves
|
90fa8bf572
|
Merge pull request #9612 from druiz17/users
some tweaks to users and menus got tablet
|
2017-02-07 15:38:43 -08:00 |
|
Clément Brisset
|
eb0a316b6f
|
Merge pull request #9604 from hyperlogic/feature/allow-multiple-instances
Allow multiple instances to run if environment variable is set
|
2017-02-07 15:32:31 -08:00 |
|
Howard Stearns
|
628ce1cf4f
|
Merge pull request #9624 from howard-stearns/update-summon-crowd
update crowd-agent and summon for bubble, avatar-mixer optimizations.
|
2017-02-07 14:05:24 -08:00 |
|
Triplelexx
|
e7244b47a9
|
increase LETTER_OFFSET value
allow more room for characters, could be improved by detecting each one
|
2017-02-07 21:55:55 +00:00 |
|
Zach Pomerantz
|
553fffd8ae
|
time mix instead of throttle with HIFI_AUDIO_MIXER_DEBUG
|
2017-02-07 21:49:23 +00:00 |
|
howard-stearns
|
9a44f63b74
|
update crowd-agent and summon for bubble, avatar-mixin optimizations.
|
2017-02-07 13:14:15 -08:00 |
|
samcake
|
2975f73fc9
|
merging
|
2017-02-07 13:13:21 -08:00 |
|
samcake
|
24a3a514a4
|
Merge pull request #9594 from AndrewMeadows/cap-fbx-texture-size
Cap fbx texture size
|
2017-02-07 12:46:22 -08:00 |
|
Zach Pomerantz
|
ee699d3fa6
|
Revert 'use tbb::atomic for cp'
|
2017-02-07 20:40:06 +00:00 |
|
Anthony J. Thibault
|
7d630f6c9a
|
Added Mat4.createFromColumns
|
2017-02-07 12:03:28 -08:00 |
|
Anthony J. Thibault
|
2952be5fc8
|
Added MouseX and MouseY axes to Keyboard device.
|
2017-02-07 12:02:41 -08:00 |
|