Seth Alves
|
04a334fd07
|
unmangle merge
|
2017-03-21 11:02:18 -08: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 |
|
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 |
|
Seth Alves
|
acdcb366b4
|
Merge pull request #9951 from sethalves/tablet-ui
Tablet ui -- merge from upstream
|
2017-03-20 08:23:15 -08:00 |
|
Chris Collins
|
ed27c550af
|
Merge pull request #9939 from ctrlaltdavid/21237
Disable Developer > Assets > ATP Asset Migration menu item
|
2017-03-20 06:29:33 -07:00 |
|
Chris Collins
|
2e6291f470
|
Merge pull request #9929 from ctrlaltdavid/21235
Replace Developer > Network > Disk cache editor with menu action
|
2017-03-20 06:26:36 -07:00 |
|
Chris Collins
|
308c134119
|
Merge pull request #9686 from humbletim/21114-part3
CR 21114 -- Implement modules/require support into hifi
|
2017-03-20 06:22:35 -07:00 |
|
Seth Alves
|
424af2255b
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-19 21:17:30 -08:00 |
|
Mohammed Nafees
|
c460523980
|
Remove related icon files for Scripts Editor
|
2017-03-20 00:25:50 -04:00 |
|
Mohammed Nafees
|
3612b9fccc
|
Remove Edit > Scripts Editor and all related source files
|
2017-03-20 00:25:50 -04:00 |
|
Ken Cooke
|
1723549850
|
Merge pull request #9950 from samcake/red
Fix the typo in the assert for isWireframe
|
2017-03-19 18:30:23 -07:00 |
|
Sam Cake
|
3a08611c26
|
Fix the typo in the assert for isWireframe
|
2017-03-19 17:33:28 -07:00 |
|
anshuman64
|
c430e0c9d6
|
Small changes based on Zach's recommendations
|
2017-03-19 12:07:45 -07:00 |
|
Seth Alves
|
b876d22e46
|
fix handling of normals. don't crash when extracting a mesh from a polyvox with no 'on' voxels
|
2017-03-18 22:36:24 -07:00 |
|
anshuman64
|
e6446b6913
|
New simplified, stand-alone build guide for Windows
Still throws this error after trying to build in Visual Studio:
Error 9 error MSB3073: The command "setlocal
"C:\Program Files\CMake\bin\cmake.exe" "-DBUNDLE_EXECUTABLE=C:/Users/Chris i5 AMD/Documents/GitHub/hifi/build/tests/render-perf/Release/render-perf-test.exe" "-DBUNDLE_PLUGIN_DIR=C:/Users/Chris i5 AMD/Documents/GitHub/hifi/build/tests/render-perf/Release/plugins" -P "C:/Users/Chris i5 AMD/Documents/GitHub/hifi/build/tests/render-perf/FixupBundlePostBuild.cmake"
if %errorlevel% neq 0 goto :cmEnd
:cmEnd
endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone
:cmErrorLevel
exit /b %1
:cmDone
if %errorlevel% neq 0 goto :VCEnd
setlocal
CMD /C "SET PATH=%PATH%;C:/Qt/Qt5.6.1/5.6/msvc2013_64/bin && C:/Qt/Qt5.6.1/5.6/msvc2013_64/bin/windeployqt.exe --release C:/Users/Chris i5 AMD/Documents/GitHub/hifi/build/tests/render-perf/Release/render-perf-test.exe"
if %errorlevel% neq 0 goto :cmEnd
:cmEnd
endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone
:cmErrorLevel
exit /b %1
:cmDone
if %errorlevel% neq 0 goto :VCEnd
setlocal
if exist "C:/Users/Chris i5 AMD/Documents/GitHub/hifi/build/tests/render-perf/Release/audio/qtaudio_windows.dll" ( "C:/Program Files/CMake/bin/cmake.exe" -E remove "C:/Users/Chris i5 AMD/Documents/GitHub/hifi/build/tests/render-perf/Release/audio/qtaudio_windows.dll" && "C:/Program Files/CMake/bin/cmake.exe" -E copy "C:/Users/Chris i5 AMD/Documents/GitHub/hifi/build/ext/vc12/wasapi/project/src/wasapi/qtaudio_wasapi.dll" "C:/Users/Chris i5 AMD/Documents/GitHub/hifi/build/tests/render-perf/Release/audio" && "C:/Program Files/CMake/bin/cmake.exe" -E copy "C:/Users/Chris i5 AMD/Documents/GitHub/hifi/build/ext/vc12/wasapi/project/src/wasapi/qtaudio_wasapi.pdb" "C:/Users/Chris i5 AMD/Documents/GitHub/hifi/build/tests/render-perf/Release/audio" )
if %errorlevel% neq 0 goto :cmEnd
if exist "C:/Users/Chris i5 AMD/Documents/GitHub/hifi/build/tests/render-perf/Release/audio/qtaudio_windowsd.dll" ( "C:/Program Files/CMake/bin/cmake.exe" -E remove "C:/Users/Chris i5 AMD/Documents/GitHub/hifi/build/tests/render-perf/Release/audio/qtaudio_windowsd.dll" && "C:/Program Files/CMake/bin/cmake.exe" -E copy "C:/Users/Chris i5 AMD/Documents/GitHub/hifi/build/ext/vc12/wasapi/project/src/wasapi/qtaudio_wasapid.dll" "C:/Users/Chris i5 AMD/Documents/GitHub/hifi/build/tests/render-perf/Release/audio" && "C:/Program Files/CMake/bin/cmake.exe" -E copy "C:/Users/Chris i5 AMD/Documents/GitHub/hifi/build/ext/vc12/wasapi/project/src/wasapi/qtaudio_wasapid.pdb" "C:/Users/Chris i5 AMD/Documents/GitHub/hifi/build/tests/render-perf/Release/audio" )
if %errorlevel% neq 0 goto :cmEnd
:cmEnd
endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone
:cmErrorLevel
exit /b %1
:cmDone
if %errorlevel% neq 0 goto :VCEnd
:VCEnd" exited with code 1. C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V120\Microsoft.CppCommon.targets 132 5 render-perf-test
|
2017-03-18 19:59:23 -07:00 |
|
Seth Alves
|
b945d9c4cb
|
fix a bug that caused obj models with no material to randomly use the materials of other things in the view
|
2017-03-18 14:34:19 -07:00 |
|
Seth Alves
|
f48557b06b
|
Merge pull request #9943 from vladest/tablet-ui-login-logout
Tablet ui login logout
|
2017-03-18 09:37:11 -08:00 |
|
Seth Alves
|
e945a290cd
|
Merge pull request #9944 from vladest/tablet-ui-wrap-menu
Menu items in Tablet UI now wrapped
|
2017-03-18 09:35:46 -08:00 |
|
Seth Alves
|
35c38b8130
|
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-1
|
2017-03-18 10:18:27 -07:00 |
|