Dante Ruiz
|
af97c7275e
|
Use loadQMlSource if no stack is aviable
|
2017-03-23 17:03:24 +01:00 |
|
Seth Alves
|
93341556ff
|
Merge pull request #9973 from druiz17/tablet-misspelled-function-call
fix error from using a misspelled function
|
2017-03-21 13:30:37 -08:00 |
|
Dante Ruiz
|
d2c139ce6e
|
fix error from using a misspelled function
|
2017-03-21 22:25:45 +01:00 |
|
Seth Alves
|
a51c1e5a78
|
Merge pull request #9971 from sethalves/tablet-ui
Tablet ui
|
2017-03-21 13:05:38 -08:00 |
|
Seth Alves
|
a93fbc00b5
|
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-21 14:05:08 -07:00 |
|
Seth Alves
|
91cac892d2
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-21 14:04:58 -07:00 |
|
Chris Collins
|
4c789c44aa
|
Merge pull request #9922 from birarda/bug/stuck-ess
fix a couple of ESS issues during ES/ESS restart
|
2017-03-21 12:44:53 -07:00 |
|
Seth Alves
|
14027d4acb
|
Merge pull request #9968 from druiz17/tablet-xbox
Fixed the third eye for the xbox controller
|
2017-03-21 11:03:53 -08:00 |
|
Seth Alves
|
4c26bcd93e
|
Merge pull request #9969 from sethalves/tablet-ui
unmangle merge
|
2017-03-21 11:03:10 -08:00 |
|
Seth Alves
|
04a334fd07
|
unmangle merge
|
2017-03-21 11:02:18 -08:00 |
|
Dante Ruiz
|
bf3c5dbf0e
|
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-xbox
|
2017-03-21 19:47:16 +01:00 |
|
Dante Ruiz
|
1811a2edc7
|
fixed third eye laser
|
2017-03-21 19:45:00 +01:00 |
|
Seth Alves
|
c5a5c1c642
|
Merge pull request #9967 from sethalves/tablet-ui
Tablet ui -- merge from upstream
|
2017-03-21 09:26:57 -08:00 |
|
Seth Alves
|
1da6349505
|
merge from upstream
|
2017-03-21 10:26:02 -07:00 |
|
Ryan Huffman
|
13222468e3
|
Merge pull request #9712 from huffman/feat/edit-particle-icon
Add particle system overlay in edit.js
|
2017-03-21 10:02:52 -07:00 |
|
Seth Alves
|
ef026dd235
|
Merge pull request #9966 from sethalves/tablet-ui
Tablet ui - merge from upstream
|
2017-03-21 08:44:33 -08:00 |
|
Seth Alves
|
cc4ddd1387
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-21 08:43:35 -08:00 |
|
Seth Alves
|
b0b3fe2f2f
|
Merge pull request #9965 from vladest/tablet-ui-script-logs
Scripts debug window in Tablet UI
|
2017-03-21 08:35:12 -08:00 |
|
Andrew Meadows
|
b2abe5aa04
|
Merge pull request #9956 from mittens/master
Tweaks to the Physics Simulation Ownership Icon Rendering
|
2017-03-21 09:29:50 -07:00 |
|
Brad Hefta-Gaub
|
b7f48644af
|
Merge pull request #9955 from druiz17/tablet-edit-selecting
Fix edit.js from deselecting an object when trying to delete it
|
2017-03-21 09:27:30 -07:00 |
|
Brad Hefta-Gaub
|
ac309df3d1
|
Merge pull request #9946 from sethalves/model-scripting-1
Model scripting
|
2017-03-21 09:26:32 -07:00 |
|
Chris Collins
|
3f30909579
|
Merge pull request #9961 from Atlante45/feat/delete_dead_code
Delete old sitting points code
|
2017-03-21 08:03:46 -07:00 |
|
Chris Collins
|
ea13151d55
|
Merge pull request #9945 from mnafees/21233
21233: Remove Scripts Editor option from Edit menu and all related files
|
2017-03-21 08:01:36 -07:00 |
|
Vladyslav Stelmakhovskyi
|
fb0adae0b1
|
Scripts debug window in Tablet UI
|
2017-03-21 15:04:38 +01:00 |
|
Zach Pomerantz
|
b6d111369f
|
Merge pull request #9935 from zzmp/fix/audio-initialization
Fix data race in audio output initialization
|
2017-03-21 00:23:28 -04:00 |
|
Zach Pomerantz
|
20ea13e00a
|
Merge pull request #9897 from zzmp/record/noise-gate
Add AudioNoiseGate to recordings played through Interface
|
2017-03-21 00:21:20 -04:00 |
|
Atlante45
|
73dd2abdaf
|
Delete old sitting points code
|
2017-03-20 17:29:44 -07:00 |
|
Seth Alves
|
78f9655eb1
|
Merge pull request #9954 from vladest/tablet-ui-reopen-running-scripts
Make runningscripts able to open even if there is no scripts running
|
2017-03-20 15:09:44 -08:00 |
|
Seth Alves
|
bc90e9081b
|
Merge pull request #9957 from hyperlogic/bug-fix/tablet-scale
Tablet scale settings now take effect soon after they are changed.
|
2017-03-20 15:05:47 -08:00 |
|
Vladyslav Stelmakhovskyi
|
cedc3cf8b6
|
Fix naming. Move variable instantiation within scope
|
2017-03-20 23:43:01 +01:00 |
|
trent
|
3b8636b75c
|
Doubled-ish the size of the physics status icons, fixed texture coordinates to be right-side up.
|
2017-03-20 17:55:52 -04:00 |
|
Anthony J. Thibault
|
f5c3d41f2c
|
Tablet scale settings now take effect soon after they are changed.
|
2017-03-20 14:51:47 -07:00 |
|
Stephen Birarda
|
96cf6b8c04
|
fix clear check for missing other entity servers
|
2017-03-20 13:40:15 -07:00 |
|
Stephen Birarda
|
0a118bd268
|
add a guard for trading entity servers by checking node count
|
2017-03-20 13:40:15 -07:00 |
|
Stephen Birarda
|
c63a2c9cda
|
remove requirement of ScriptEngine in ScriptEngines slots
|
2017-03-20 13:40:15 -07:00 |
|
Stephen Birarda
|
a4d72c4e67
|
make AudioScriptingInterface a Dependency
|
2017-03-20 13:40:15 -07:00 |
|
Stephen Birarda
|
20022ebdc8
|
use deleteLater for ESS script engine on nodeKilled
|
2017-03-20 13:38:59 -07:00 |
|
Andrew Meadows
|
92e3f8768c
|
Merge pull request #9921 from jherico/menu_fix
Fix possible crash in Menu::removeSeparator
|
2017-03-20 13:38:36 -07:00 |
|
Vladyslav Stelmakhovskyi
|
13cd500c2e
|
Make runningscripts able to open even if there is no scripts running
|
2017-03-20 20:46:37 +01:00 |
|
Dante Ruiz
|
de24023a21
|
Fix edit.js from deselecting an object when trying to delete it
|
2017-03-20 20:43:32 +01:00 |
|
Seth Alves
|
8988110c3b
|
Merge pull request #9953 from fayeli/edit-export-entities
Adding Export Entities Functionality in Tablet Edit
|
2017-03-20 11:35:18 -08:00 |
|
Chris Collins
|
e7a90636d6
|
Merge pull request #9949 from anshuman64/patch-1
New simplified, stand-alone build guide for Windows
|
2017-03-20 11:41:07 -07:00 |
|
Faye Li
|
f57905fbb3
|
remove code for jump to selection
|
2017-03-20 10:23:55 -07:00 |
|
Brad Hefta-Gaub
|
bc5d7d8698
|
Merge pull request #9851 from AndrewMeadows/simulation-ownership-2
zero velocity of deactivated dynamic entities
|
2017-03-20 10:20:11 -07:00 |
|
Seth Alves
|
2e29ff3114
|
Merge pull request #9934 from fayeli/edit-import-entities
Adding Import Entities button on the Create tab of Edit
|
2017-03-20 09:13:08 -08:00 |
|
Brad Hefta-Gaub
|
ccce4b4d29
|
Merge pull request #9948 from sethalves/fix-obj-with-no-material
fix obj sans material
|
2017-03-20 10:09:36 -07:00 |
|
Brad Hefta-Gaub
|
af790d8474
|
Merge pull request #9875 from birarda/bug/spin-strafe
fix double snap turn strafing
|
2017-03-20 10:08:05 -07:00 |
|
Chris Collins
|
af2748410d
|
Merge pull request #9932 from Triplelexx/21231
21231 - Remove About Interface from File menu
|
2017-03-20 09:55:57 -07:00 |
|
Chris Collins
|
509057c6d8
|
Merge pull request #9941 from Triplelexx/21232
21232 - Remove Mini Mirror from View menu
|
2017-03-20 09:55:37 -07:00 |
|
Ryan Huffman
|
df644edde4
|
Fix hand controller not able to select light/particle icons
|
2017-03-20 09:45:50 -07:00 |
|