Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 16:20:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
52466 commits 25 branches 0 tags 1.1 GiB
Commit graph

52466 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Seth Alves
488ed081dd Mesh::forEach and Mesh::map 2017-03-18 10:18:04 -07:00
Vladyslav Stelmakhovskyi
5335bf8862 Menu items in Tablet UI now wrapped 2017-03-18 15:58:16 +01:00
Vladyslav Stelmakhovskyi
696825580e Merge branch 'tablet-ui' into tablet-ui-login-logout 2017-03-18 14:42:11 +01:00
Vladyslav Stelmakhovskyi
5e162a6447 Implemented login facility for tablet UI 2017-03-18 14:38:49 +01:00
Triplelexx
8b845658e2 remove redundant declarations 2017-03-18 05:00:05 +00:00
Triplelexx
8e086a8fc8 fix build error 2017-03-18 03:51:55 +00:00
Triplelexx
a9b1a38665 remove Mini Mirror from View menu 
Avatar inputs only contains the audio meter now.
 2017-03-18 00:53:13 +00:00
samcake
e1a0984fed Merge pull request #9906 from samcake/red 
Expose rendering in wireframe mode
 2017-03-17 17:09:44 -07:00
David Rowe
ab7d82edb6 Use #ifdef instead of comment 2017-03-18 12:56:34 +13:00
Seth Alves
b3603ce8b3 Entities.voxelsToMesh, Model.transformMesh, Model.appendMeshes, Model.meshToOBJ appear to work now 2017-03-17 16:52:56 -07:00
Faye Li
197a06c423 changes in TWO entityList.js to register the export event 2017-03-17 16:17:21 -07:00
David Rowe
38bb48e72c Disable Developer > Assets > ATP Asset Migration menu item 2017-03-18 12:13:13 +13:00
Faye Li
1a46f18aa3 adding export button + hiding jump to selection 2017-03-17 15:56:55 -07:00
David Rowe
e3b9d588ec Merge branch 'master' into 21235 
# Conflicts:
#	interface/src/Menu.cpp
#	interface/src/ui/DialogsManager.h
 2017-03-18 09:42:36 +13:00
Brad Hefta-Gaub
a75acd139b Merge pull request #9885 from sethalves/model-scripting 
Model scripting
 2017-03-17 13:13:17 -07:00
Zach Pomerantz
a68146e7d9 mv audio output init to output thread 2017-03-17 15:31:00 -04:00
Faye Li
33a7ff825e indicate expecting json file on button text 2017-03-17 11:37:38 -07:00
Ken Cooke
652c80057e Merge pull request #9924 from zzmp/fix/noise-delay 
Use single frame buffer for local audio injectors
 2017-03-17 11:24:02 -07:00
Faye Li
6531efffbc hook up qml button to edit.js 2017-03-17 11:22:07 -07:00
Triplelexx
eba6c8de5e remove About Interface from File menu 2017-03-17 17:37:19 +00:00
Andrew Meadows
60e0eb0cf9 Merge pull request #9917 from Atlante45/fix/sit 
Cancel Avatar velocity when sitting down.
 2017-03-17 10:04:25 -07:00
Chris Collins
303a11a3e4 Merge pull request #9928 from ctrlaltdavid/21234 
Delete Developer > Network > RAM Caches Size menu item and dialog
 2017-03-17 09:13:25 -07:00
Seth Alves
16c3eb62b1 Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-1 2017-03-17 08:54:32 -07:00
Seth Alves
d45266f28b Merge pull request #9931 from sethalves/tablet-ui 
Tablet ui -- merge from upstream
 2017-03-17 06:54:10 -08:00
Seth Alves
df84ff27e9 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-03-17 07:52:22 -07:00
Seth Alves
9292cabe10 Merge pull request #9904 from druiz17/tablet-notifcation 
Added tablet notifications.
 2017-03-17 06:50:24 -08:00
Seth Alves
5aacc13429 Merge pull request #9925 from ctrlaltdavid/21230 
Fix tablet settings dialogs' titles
 2017-03-17 06:44:23 -08:00
Atlante45
698791295a Expose DriveKeys enum to JS 2017-03-16 20:03:27 -07:00
David Rowe
939b4f1612 Remove Developer > Network > Disk Cache Editor menu item and dialog 2017-03-17 13:49:09 +13:00
Atlante45
5a1ce4bb05 CR 2017-03-16 17:46:47 -07:00
Atlante45
9155cc6334 Fix windows warnings 2017-03-16 17:44:56 -07:00
David Rowe
e21d7d9edf Add Developer > Network > Clear Disk Cache menu action 2017-03-17 13:34:11 +13:00
Seth Alves
bbad6a0eb7 mesh-append works, mesh-transform doesn't? 2017-03-16 17:26:07 -07:00
David Rowe
dc71f502f0 Delete Developer > Network > RAM Caches Size menu item and dialog 2017-03-17 13:09:06 +13:00