Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-08 11:43:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
64504 commits 6 branches 1 tag 1.1 GiB
Commit graph

64504 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Andrew Meadows
a5e968867e
Merge pull request #12302 from druiz17/fix-another-bootstrapping 
Fix another bootstrapping and rename entityItem _dirtyFlags
 2018-02-02 15:14:38 -08:00
John Conklin II
9f4820df3b
Merge pull request #12255 from Zvork/trnormalmap 
Normal map support on translucent objects
 2018-02-02 14:19:50 -08:00
Zach Fox
2a0d85a119
Merge pull request #12315 from zfox23/commerce_SendMoneyNearbyParticle 
Commerce: Send Money Nearby particle effect!
 2018-02-02 14:17:48 -08:00
Stephen Birarda
eb9d100fc8 reset count on conn refusal, soft reset DH in Interface on limit reached 2018-02-02 13:47:48 -08:00
Stephen Birarda
98d581acd1 fix debug lines in DomainGatekeeper with extra parens 2018-02-02 13:47:48 -08:00
Stephen Birarda
e16a3859c2 reset silent check in packet check on domain connection reset 2018-02-02 13:47:48 -08:00
Dante Ruiz
d593e7107c fix merge conflict 2018-02-02 13:29:31 -08:00
Zach Fox
28c9cd15a4
Merge pull request #12326 from zfox23/commerce_fixPopUpHover 
Fix a bug where hover events incorrectly propagate under popups
 2018-02-02 13:23:36 -08:00
Atlante45
8ebb3e52d8 Misc bug fixes 2018-02-02 13:10:49 -08:00
Seth Alves
00b184124d
Merge pull request #12308 from vladest/fix_progress_animation 
Image overlay uses bounds property
 2018-02-02 12:53:20 -08:00
Seth Alves
b3250ff4b6
Merge pull request #12158 from sethalves/cauterize-head-av-entities-1 
don't draw head-descendant entitys with 1st-person camera
 2018-02-02 11:57:49 -08:00
Elisa Lupin-Jimenez
d20ff0955c qml doesn't work, .js might not work on osx 2018-02-02 11:26:21 -08:00