Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 13:13:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
52126 commits 71 branches 56 tags 1.2 GiB
Commit graph

52126 commits

This branch
This branch
All branches
Author SHA1 Message Date
Triplelexx
c7b9492620 revert removing rightUnitVec 
.....
 2017-03-22 19:14:20 +00:00
Triplelexx
216f20ed2c rename fronts to forwards 2017-03-22 19:03:39 +00:00
Triplelexx
d1db04f93a fix lost forwardOffset declaration 2017-03-22 18:57:00 +00:00
Triplelexx
fd312f6bf8 rename fronts to forwards 2017-03-22 18:49:34 +00:00
Triplelexx
31ec9b832f rename fronts to forwards 2017-03-22 18:43:30 +00:00
Triplelexx
c2cff55427 rename fronts to forwards 2017-03-22 18:41:06 +00:00
Triplelexx
2fc8dd48de change testFront to testForward 2017-03-22 17:13:45 +00:00
Triplelexx
2d1ca99e2e change variable names that use Quat.getForward 2017-03-22 17:00:12 +00:00
Triplelexx
2515563a0b change getFront to getForward 2017-03-21 22:35:07 +00:00
Triplelexx
6e740a5fbb change Mat4 getFront to getForward 2017-03-21 22:33:37 +00:00
Triplelexx
66d697873f change mat4test back to getFront 
premature, including in seperate commit
 2017-03-21 22:31:06 +00:00
Triplelexx
8df0395754 change getFrontDirection to getForwardDirection 2017-03-21 22:28:12 +00:00
Triplelexx
a964edee91 change all references of Quat.getFront to Quat.getForward in scripts directory 2017-03-21 22:25:30 +00:00
Triplelexx
b7980569cc change all references of IDENTITY_FRONT to IDENTITY_FORWARD 2017-03-21 22:13:33 +00:00
Triplelexx
248c932d50 inline getFront 2017-03-21 22:11:18 +00:00
Triplelexx
6d664fd668 add getForward, getFront returns getForward 
getForward better describes the returned vector as a direction
 2017-03-21 19:54:32 +00: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
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
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
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
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
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
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
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
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
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
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
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
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