Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-06 02:09:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
64681 commits 25 branches 28 tags 1.2 GiB
Commit graph

64681 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dante Ruiz
365a1fcdab Merge branch 'master' of github.com:highfidelity/hifi into fix-lasers-going-to-origin 2018-02-06 13:45:14 -08:00
Dante Ruiz
4f0ca6a904 fix lasers going to origin 2018-02-06 13:44:59 -08:00
Andrew Meadows
672520f3bf quickfix for velocity spike for Tractor action 2018-02-06 12:06:27 -08:00
Brad Davis
7d5502eb92 Migrating QML rendering off the main thread 2018-02-06 11:53:09 -08:00
NissimHadar
faec9a62b6 Changed "" to QString() 2018-02-06 11:01:50 -08:00
Bradley Austin Davis
f291715f87 Merge remote-tracking branch 'zvork/scribe' into fix/shader_length 2018-02-06 10:36:15 -08:00
Alexander Ivash
151f20a92f define onWalletScreen in this marketplaces.js scope 2018-02-06 21:25:41 +03:00
David Back
22c0ca86ed Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab 2018-02-06 10:10:39 -08:00
Seth Alves
81f75925da
Merge pull request #12337 from druiz17/fix-sit-script 
fixing teleport module for sit script
 2018-02-06 09:40:36 -08:00
John Conklin II
0e3bcda859
Merge pull request #12336 from sethalves/bump-av-protocol-more 
try harder to bump avatar-mixer protocol version
 2018-02-06 09:12:03 -08:00
Olivier Prat
d248e1ed79 Merge branch 'master' of http://github.com/highfidelity/hifi into scripts 2018-02-06 18:00:38 +01:00
Seth Alves
d8ad3192fe
Merge pull request #12332 from sethalves/fix-tractor-action-initial-crazy 
Fix tractor action initial crazy
 2018-02-06 08:59:25 -08:00
Seth Alves
213dd61502
Merge pull request #12341 from sethalves/fix-polyvox-visible 
make polyvox entities visible again
 2018-02-06 08:59:01 -08:00
Olivier Prat
733d36df47 Fixed save / load of fade effect configurations 2018-02-06 17:57:04 +01:00
Olivier Prat
fc1d9319bd Finished correcting transition.qml layouts 2018-02-06 16:31:53 +01:00
Olivier Prat
8c12ab9b76 Used color selectors in transition.qml 2018-02-06 16:19:15 +01:00
Olivier Prat
51ea89ffea Renamed fade scripts to transition scripts and still working on layout 2018-02-06 15:16:50 +01:00
Olivier Prat
179aca2bf9 Shadow task now uses LOD culling from main view task 2018-02-06 11:47:39 +01:00
NissimHadar
cf87052b7f Added option to select snapshot filename in scripts. 2018-02-05 17:29:00 -08:00
Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets 
Remove some unneeded Qt dependencies
 2018-02-05 15:32:54 -08:00
Dante Ruiz
e87067f93d fix variable naming and edge case 2018-02-05 15:31:37 -08:00
Bradley Austin Davis
f611990b10 Fix overlimit shader char strings 2018-02-05 15:27:19 -08:00
Seth Alves
33ca1fd344 make polyvox entities visible again 2018-02-05 14:58:34 -08:00
Dante Ruiz
0c5c4679fb Merge branch 'master' of github.com:highfidelity/hifi into fix-camera-update 2018-02-05 14:25:54 -08:00
Bradley Austin Davis
b658d4add2
Merge pull request #12338 from vladest/fix_build_gcc7 
Add include with std::function
 2018-02-05 13:34:48 -08:00
vladest
0715a7cae5 Add include with std::function 2018-02-05 21:02:44 +01:00
Seth Alves
14d8259a5e try harder to bump avatar-mixer protocol version 2018-02-05 11:54:48 -08:00
Dante Ruiz
601914180d fixing teleport module for sit script 2018-02-05 11:52:35 -08:00
Stephen Birarda
52e63db70b
Merge pull request #12249 from birarda/bug/god-voice 
refuse to handle positional audio streams with NaN position
 2018-02-05 12:50:56 -07:00
John Conklin II
9c1cb60a43
Merge pull request #12333 from ctrlaltdavid/fix-spectator-camera 
Fix the spectator camera
 2018-02-05 11:06:59 -08:00
Stephen Birarda
761321875c
Merge pull request #12195 from birarda/bug/connection-refused 
clear silent connection attempt counter on DomainHandler soft reset
 2018-02-05 11:35:02 -07:00
Anthony Thibault
819af96fcc
Merge pull request #12331 from ctrlaltdavid/21732 
Fix scaling of avatar submeshes attached to joints
 2018-02-05 10:19:18 -08:00
Olivier Prat
92279b5939 Merged with master 2018-02-05 18:24:05 +01:00
Olivier Prat
2896c32bda Switched debug fade script to app but still working on broken layout 2018-02-05 17:49:31 +01:00
Olivier Prat
445ffbd82f Added tag bits to shadow octree query 2018-02-05 16:35:55 +01:00
David Rowe
22b33c7391 Update Overlays circle3d JSDoc per recent code changes 2018-02-05 11:22:40 +13:00
David Rowe
3af7701cac Fix the spectator camera 2018-02-04 12:06:20 +13:00
Olivier Prat
2940a67b3e Merged with master 2018-02-03 16:55:25 +01:00
Seth Alves
639f7a52d8 remove unneeded/repeated line 2018-02-02 18:24:38 -08:00
Seth Alves
a6978a6dec Merge branch 'make-your-branch' of github.com:AndrewMeadows/hifi into fix-tractor-action-initial-crazy 2018-02-02 18:15:59 -08:00
David Rowe
9818674549 Fix scaling of avatar submeshes attached to joints 2018-02-03 15:06:47 +13:00
David Back
ececd1c60f fix loop index change 2018-02-02 17:14:48 -08:00
David Back
7621ba180d Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab 2018-02-02 17:05:34 -08:00
David Back
ed4cbe2679 fix fill ring rotation 2018-02-02 17:05:25 -08:00
David Back
1e7717b491 remove debug line 2018-02-02 16:46:12 -08:00
David Back
900669d937 fix multi-selection rotation yay! 2018-02-02 16:44:59 -08:00
Andrew Meadows
83ab994181 avoid initial bad measure of tractor target's velocity 2018-02-02 16:42:51 -08:00
John Conklin II
c8bb26ae74
Merge pull request #12294 from samcake/pastel 
Improve startup time by optimizing shader bookkeeping
 2018-02-02 16:37:44 -08:00
Elisa Lupin-Jimenez
e2bf8ad231 reverted to S3 for model URL 2018-02-02 15:36:28 -08:00
Stephen Birarda
7a21ae8d89 re-send a connection token packet if the current one is null 2018-02-02 15:25:43 -08:00