Sam Gateau
|
0166d7748a
|
Merging with master around rc76 cut time
|
2018-11-15 22:52:37 -08:00 |
|
Jamil Akram
|
35ec0b60ab
|
Merge pull request #14251 from humbletim/fb18302-deprecated-package-model
FB18302 Remove deprecated Package Model functionality
|
2018-11-15 15:52:04 -08:00 |
|
John Conklin II
|
1ea2ab338e
|
Merge pull request #13975 from ElderOrb/FB16697
Fix multiple issues on 'Calibration' tab of 'Controls' dialog
|
2018-11-15 14:54:26 -08:00 |
|
John Conklin II
|
60c538309a
|
Merge pull request #14411 from SamGondelman/fading
Fix for avatar flashing on fade out
|
2018-11-15 13:58:43 -08:00 |
|
John Conklin II
|
83660ab8e1
|
Merge pull request #14128 from Zvork/ao
Improved Ambient Occlusion
|
2018-11-15 13:57:13 -08:00 |
|
John Conklin II
|
8177d5bbcd
|
Merge pull request #14275 from Atlante45/fix/injector-crash
Rework audio data memory ownership model to fix injector crashes
|
2018-11-15 13:25:42 -08:00 |
|
SamGondelman
|
597ff773e1
|
fix for avatar flashing
|
2018-11-15 10:52:22 -08:00 |
|
Brad Hefta-Gaub
|
20766da624
|
Merge pull request #14382 from dback2/newPropertySliders
Entity properties - new draggable numbers
|
2018-11-15 10:01:07 -08:00 |
|
Jeff Clinton
|
c72dd3d690
|
Merge pull request #14395 from ctrlaltdavid/M19859
Fix Goto app clicks not working
|
2018-11-15 09:56:56 -08:00 |
|
Olivier Prat
|
0401858129
|
Cleaned up do_draw in GLESBackend
|
2018-11-15 18:34:41 +01:00 |
|
Jamil Akram
|
60b58977cd
|
Merge pull request #14267 from humbletim/fb17479-fix-handshake-keyrelease
FB17479 - Fix scripted key release events for handshakes.
|
2018-11-15 09:21:32 -08:00 |
|
Olivier Prat
|
ed42c94772
|
Merge branch 'master' of http://github.com/highfidelity/hifi into ao
|
2018-11-15 17:55:29 +01:00 |
|
humbletim
|
d0e4c62978
|
fix merge conflict
|
2018-11-14 23:50:02 -05:00 |
|
humbletim
|
21030fbe5b
|
Merge remote-tracking branch 'upstream/master' into fb18302-deprecated-package-model
|
2018-11-14 23:40:04 -05:00 |
|
John Conklin II
|
ef3acae896
|
Merge pull request #14407 from jherico/fix/19876
Case 19876: Fix procedurals using the iGlobalTime input
|
2018-11-14 17:18:57 -08:00 |
|
David Back
|
dfed797682
|
set more min/max/steps
|
2018-11-14 15:44:30 -08:00 |
|
Atlante45
|
31033ad685
|
Update TTS audio API use
|
2018-11-14 15:42:39 -08:00 |
|
Brad Davis
|
b7c567af08
|
Fix procedurals using the iGlobalTime input
|
2018-11-14 15:28:22 -08:00 |
|
Clement
|
7f910a38e3
|
Update keyboard injector to new interface
|
2018-11-14 14:46:08 -08:00 |
|
Clement
|
d2a1bb4806
|
CR
|
2018-11-14 14:46:08 -08:00 |
|
Clement
|
7192aed131
|
Rework audio data memory ownership model
|
2018-11-14 14:45:18 -08:00 |
|
David Back
|
76d2519205
|
Merge pull request #14400 from dback2/missingTypeFilters
Add PolyLine/PolyVox to entity list/properties types
|
2018-11-14 14:39:26 -08:00 |
|
John Conklin II
|
b08283d9e9
|
Merge pull request #14401 from sethalves/rc76-revert-pr-14238
revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it.
|
2018-11-14 14:38:34 -08:00 |
|
David Back
|
d8f5e0f708
|
add min/max/step for some properties, remove duplicate createProperty, improve switch between states
|
2018-11-14 14:32:17 -08:00 |
|
David Rowe
|
9c5d318341
|
Fix highlighting
|
2018-11-15 10:15:30 +13:00 |
|
Brad Hefta-Gaub
|
6ffee02b4f
|
Merge pull request #14337 from thoys/feat/create/forwardWindowShortcuts
[CreateApp] make shortcuts work from windows
|
2018-11-14 12:56:27 -08:00 |
|
David Back
|
cff4c08e9f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders
|
2018-11-14 12:46:41 -08:00 |
|
Seth Alves
|
1593c1185a
|
revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it.
|
2018-11-14 12:29:09 -08:00 |
|
David Back
|
70493e3f29
|
add polyline/polyvox to entity list/properties types
|
2018-11-14 12:23:16 -08:00 |
|
John Conklin II
|
92a23ec0a9
|
Merge pull request #14294 from SimonWalton-HiFi/max-json-size
Allow for large Models.json file
|
2018-11-14 11:20:35 -08:00 |
|
Thijs Wenker
|
cd12dd8f6d
|
fix OSX shortcut inconsistencies
|
2018-11-14 19:28:57 +01:00 |
|
Olivier Prat
|
85a3938cbe
|
Switch to app for ambient occlusion debug script
|
2018-11-14 11:55:11 +01:00 |
|
Olivier Prat
|
45e0f65972
|
Merge branch 'ao' of http://github.com/Zvork/hifi into ao
|
2018-11-14 09:48:24 +01:00 |
|
David Rowe
|
010f7121a3
|
Fix Goto app clicks not working
Includes better card highlighting fix.
|
2018-11-14 15:27:18 +13:00 |
|
Simon Walton
|
452c212c4f
|
Add Paths entry parsing to json parser
|
2018-11-13 17:58:12 -08:00 |
|
David Back
|
1aa048f4d6
|
style and decimal fixes
|
2018-11-13 17:56:31 -08:00 |
|
Brad Hefta-Gaub
|
f1dd778310
|
Merge pull request #14389 from SimonWalton-HiFi/oven-resourcerequestobserver
Add newly-introduced dependency class to Oven
|
2018-11-13 17:35:29 -08:00 |
|
Simon Walton
|
82e21e89e4
|
Merge remote-tracking branch 'upstream/master' into max-json-size
|
2018-11-13 17:26:20 -08:00 |
|
David Back
|
a349bac01c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders
|
2018-11-13 16:32:15 -08:00 |
|
Thijs Wenker
|
2c715bf592
|
make window shortcuts work on OSX
|
2018-11-14 01:05:39 +01:00 |
|
Thijs Wenker
|
0248323bee
|
fix test path
|
2018-11-14 01:05:38 +01:00 |
|
Thijs Wenker
|
cc207537a3
|
Fix for unintended snapshots while parenting/un-parenting
|
2018-11-14 01:05:38 +01:00 |
|
Thijs Wenker
|
afd69d04dd
|
Make ctrl+shift shortcuts work for create app
|
2018-11-14 01:05:37 +01:00 |
|
Thijs Wenker
|
e890228fc7
|
Make shortcuts work in edit windows
|
2018-11-14 01:05:36 +01:00 |
|
David Back
|
8db81d9ce6
|
restructure draggable numbers to be more like blender
|
2018-11-13 16:04:08 -08:00 |
|
John Conklin II
|
d7dd593a97
|
Merge pull request #14369 from dback2/entityListColumns
Entity list - dynamic columns
|
2018-11-13 16:01:06 -08:00 |
|
David Back
|
91db81cd94
|
merge fix
|
2018-11-13 15:10:53 -08:00 |
|
John Conklin II
|
79e67ad45f
|
Merge pull request #14238 from ElderOrb/FB19400
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' …
|
2018-11-13 15:07:21 -08:00 |
|
David Back
|
c73e737552
|
Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders
|
2018-11-13 15:04:12 -08:00 |
|
David Back
|
e88e131dca
|
Merge branch 'feat/ui-updates' of github.com:huffman/hifi into newPropertySliders
|
2018-11-13 15:04:02 -08:00 |
|