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

70348 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thijs Wenker
c562a6945d
Merge pull request #13671 from huffman/fix/create-copy-follows-user 
Fix duplication not working as expected on grabbed entities
 2018-08-01 19:25:33 +02:00
Simon Walton
b18c1f0e1e Use defined value for invalid sequence number 2018-08-01 10:10:45 -07:00
David Back
1b031ff065
Merge pull request #13703 from dback2/editHandleTriggerValues 
Edit handles trigger fixes
 2018-08-01 10:00:16 -07:00
Ryan Huffman
6369cee0d1 Fix added entities not being undoable in Create 2018-08-01 09:40:29 -07:00
Simon Walton
ed75fe673e Replace int+bool with single atomic int 2018-07-31 18:28:14 -07:00
Anthony J. Thibault
fd780845bb Code review feedback 2018-07-31 18:25:04 -07:00
Simon Walton
6f61642cb0 Call setFinished() if script engine hasn't started up 2018-07-31 18:10:49 -07:00
David Back
e8068fea0a block selecting overlays with other hand 2018-07-31 17:18:35 -07:00
Simon Walton
5a92032bdd ThreadedAssignment::stop no longer deprecated 2018-07-31 16:14:00 -07:00
Simon Walton
ecfba312ef Merge remote-tracking branch 'upstream/master' into script-engine-thread-agent 2018-07-31 15:54:54 -07:00
Simon Walton
33a46a6a82 Make ThreadedAssignment::setFinished() protected 2018-07-31 15:46:43 -07:00
Liv Erickson
acf1afea01 fix audio files playing swapped input, trying to amplify audio playback 2018-07-31 15:41:59 -07:00
Simon Walton
d991dd230f Remove call to aboutToFinish from AssetServer 2018-07-31 15:39:38 -07:00
Simon Walton
64fc3e1091 ThreadedAssignment calls virtual stop() upon domain disconnect 2018-07-31 15:30:33 -07:00
Thijs Wenker
003e826d60 move over definition so it could be linked in the assignment-client too 2018-08-01 00:23:34 +02:00
Zach Fox
4b41804326 Fix MS17168: Filter My Purchases when clicking View link on Confirmation 2018-07-31 14:52:01 -07:00
Ryan Huffman
bbdc7ba380 Fix Uuid null comparison and dangling comma in Create tool 2018-07-31 13:57:27 -07:00
Simon Walton
a320308eaf Fix sequence number encoding issue 
Don't mix QDataStream and readPrimitive. Also fix logic
issues in completion check; move new packet type; don't
reset known sent entities upon initial completion;
other reviewer recommendations.
 2018-07-31 13:54:22 -07:00
Thijs Wenker
74343c71d8 CR fixes 2018-07-31 22:29:53 +02:00
Alexander Ivash
6e6eae2160 Avatarapp: base 'SquareLabel' on button from Uit 2018-07-31 22:03:34 +03:00
David Back
ad9ec26781 print 2018-07-31 11:53:17 -07:00
David Back
7bf7663f09 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues 2018-07-31 11:51:26 -07:00
David Back
4a722a62f7 use click handler only, remove triggerClicked 2018-07-31 11:51:16 -07:00
Cristian Luis Duarte
cdca20101b Not an accountManager in AndroidHelper anymore 2018-07-31 14:37:51 -03:00
Ryan Huffman
431cbf2694
Merge pull request #13699 from thoys/fix/create/triggerable 
MS16809: handle both triggerable and wantsTrigger in CreateApp
 2018-07-31 10:34:31 -07:00
John Conklin II
09d1964f1d
Merge pull request #13670 from ElderOrb/animate_get_more_avatars 
Avatarapp: hover animation for 'get more avatars' button
 2018-07-31 09:51:58 -07:00
John Conklin II
16940cc9b7
Merge pull request #13716 from r3tk0n/17170-flying-crash 
Remove deprecated flying setting from MyAvatar.cpp saveData()
 2018-07-31 09:48:01 -07:00
David Back
93335feba1 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues 2018-07-31 09:46:57 -07:00
John Conklin II
8e277758ad
Merge pull request #13700 from danteruiz/fix-grabbing-problem 
Impove the way we checkForChildTooFarAway in nearParentGrabEntity.js
 2018-07-31 09:46:57 -07:00
Seth Alves
4ff9252b47
Merge pull request #13718 from jherico/fix/fb15963 
Support rendering of 'about' URLs in web entities
 2018-07-31 09:44:31 -07:00
John Conklin II
221dd3ee88
Merge pull request #13673 from ElderOrb/avatarapp-update-messageboxes 
FB16992 - Layout changes to the two lightboxes in the Avatar app
 2018-07-31 09:36:16 -07:00
David Back
03f0116b79 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues 2018-07-31 09:28:14 -07:00
Simon Walton
8c512ec19b Send spherical view from Interface rather than creating in ES 2018-07-30 18:03:45 -07:00
Liv Erickson
9ec14c1f0d update bubble context for RC 71 2018-07-30 18:03:26 -07:00
Seth Alves
1b47d3f274
Merge pull request #13717 from highfidelity/revert-13577-invisibleWebEntities 
Revert "Allow empty web entities to be rendered"
 2018-07-30 15:24:17 -07:00
Cristian Luis Duarte
a572af1df2 Merge remote-tracking branch 'hifi/master' into android_friends_main 2018-07-30 19:01:41 -03:00
John Conklin II
bd2ab38bfe
Merge pull request #13701 from ElderOrb/FB16702 
FB16702 - Avatar App does not save Animation JSON Override URL
 2018-07-30 14:51:32 -07:00
John Conklin II
6d7116fad7
Merge pull request #13676 from thoys/fix/api/agent 
MS15184: Remove deprecated functions in Agent API
 2018-07-30 14:48:10 -07:00
John Conklin II
200292c18e
Merge pull request #13675 from howard-stearns/forget-you 
pal refresh fixes
 2018-07-30 14:38:24 -07:00
David Rowe
b36b981b55 Merge branch 'master' into M19690 
# Conflicts:
#	libraries/entities/src/EntityItemProperties.cpp
 2018-07-31 08:41:32 +12:00
David Back
b420ef8cf2 fix trigger clicks on vive 2018-07-30 13:21:09 -07:00
Anthony J. Thibault
58f95bd07b assert fix 2018-07-30 13:14:32 -07:00
David Back
bec54cc182 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues 2018-07-30 12:26:48 -07:00
Brad Davis
c991053c93 Support rendering of 'about' URLs in web entities 2018-07-30 11:56:31 -07:00
Seth Alves
a6aaa71d02
Revert "Allow empty web entities to be rendered" 2018-07-30 11:54:52 -07:00
Anthony J. Thibault
6a6ece8910 Warning fixes and whitespace cleanup 2018-07-30 11:49:44 -07:00
r3tk0n
63de16bac5 Remove deprecated flying setting from MyAvatar.cpp saveData() 2018-07-30 11:40:15 -07:00
Anthony J. Thibault
401995fb06 Leg IK fixes 
Fixes for raising legs and sometimes squatting while in HMD mode.
 2018-07-30 10:55:52 -07:00
Sam Gondelman
8201997a16
Merge pull request #13660 from SamGondelman/parabolic 
Parabolic Picking + Pointers
 2018-07-30 10:49:02 -07:00
Thijs Wenker
d486a0721d
Merge pull request #13698 from dback2/resetPropertiesNoSelection 
Reset entity property fields when no selection
 2018-07-30 19:37:12 +02:00