Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 05:23:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
70289 commits 76 branches 59 tags 1.2 GiB
Commit graph

26188 commits

Author SHA1 Message Date
Alexia Mandeville
38973f0840 Adding icon states to emote app, active state 2018-08-09 16:00:36 -07:00
Alexia Mandeville
b3426f695b Making icon bigger 2018-08-03 15:12:18 -07:00
Alexia Mandeville
c58322387a Increase stroke width on icon 2018-08-03 13:05:20 -07:00
Alexia Mandeville
eda80fb36f updating emote app icon 2018-08-02 13:26:08 -07:00
Zach Fox
41b804a5dd
Merge pull request #13738 from zfox23/MS17215_newEarlyFetchLogic 
Fix MS17215: Auto-show Confirmed txns in Recent Activity when many Pending txns present
 2018-08-02 09:39:37 -07:00
Simon Walton
88fafc7a1f
Merge pull request #13704 from SimonWalton-HiFi/delay-physics 
Enable physics after ES indicates all nearby entities received
 2018-08-01 18:15:00 -07:00
Zach Fox
67528cb646 Fix MS17215: Auto-show Confirmed txns in Recent Activity when many Pending txns present 2018-08-01 15:49:53 -07:00
Zach Fox
7905c91289
Merge pull request #13727 from zfox23/MS17168_filterWhenViewing 
Fix MS17168: Filter My Purchases when clicking View link on Confirmation
 2018-08-01 14:23:26 -07:00
John Conklin II
c444bb11ba
Merge pull request #13668 from ElderOrb/base_bluebuttons_on_uit 
Avatarapp: base 'SquareLabel' on button from Uit
 2018-08-01 13:10:33 -07:00
John Conklin II
fd1a431729
Merge pull request #13689 from ctrlaltdavid/M15244 
Move scriptable caches' APIs into scripting interfaces
 2018-08-01 11:50:13 -07:00
John Conklin II
082a3bca89
Merge pull request #13679 from ElderOrb/FB16840 
FB16840 - Qml spinboxes in UI toolkit should focus the underlying fie…
 2018-08-01 11:46:59 -07:00
John Conklin II
fcf32dbc6b
Merge pull request #13642 from ctrlaltdavid/M13352 
Fix HMD.mountedChanged() API signal
 2018-08-01 11:28:11 -07:00
John Conklin II
bda9ed7f1a
Merge pull request #13680 from ElderOrb/adjust_wearables_button_fix 
use 'light' color scheme
 2018-08-01 11:23:10 -07:00
John Conklin II
c67ef57ad3
Merge pull request #13713 from hyperlogic/bug-fix/leg-ik-bug-fixes-master 
Leg IK fixes
 2018-08-01 11:17:10 -07:00
Simon Walton
b18c1f0e1e Use defined value for invalid sequence number 2018-08-01 10:10:45 -07:00
Simon Walton
ed75fe673e Replace int+bool with single atomic int 2018-07-31 18:28:14 -07:00
Zach Fox
4b41804326 Fix MS17168: Filter My Purchases when clicking View link on Confirmation 2018-07-31 14:52:01 -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
Alexander Ivash
6e6eae2160 Avatarapp: base 'SquareLabel' on button from Uit 2018-07-31 22:03:34 +03: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
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
Simon Walton
8c512ec19b Send spherical view from Interface rather than creating in ES 2018-07-30 18:03:45 -07: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
200292c18e
Merge pull request #13675 from howard-stearns/forget-you 
pal refresh fixes
 2018-07-30 14:38:24 -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
Simon Walton
be1bbc07c2 Don't wait for (nonexistant) ES when in serverless mode 2018-07-30 10:20:55 -07:00
Simon Walton
2ac6ca3291 Remove old physics-enabling code 2018-07-27 17:32:35 -07:00
SamGondelman
3d4639bfdd CR 2018-07-27 16:36:22 -07:00
SamGondelman
1ef54b2fe6 back to ray teleport 2018-07-27 14:58:56 -07:00
John Conklin II
9c37e30fe6
Merge pull request #13678 from ElderOrb/FB17023 
FB17023 - Make visible avatar url in the avatar app
 2018-07-27 14:57:25 -07:00
Simon Walton
5315b020ec Use locking for the OctreePacketProcessor additions 2018-07-27 14:51:24 -07:00
John Conklin II
021e09d083
Merge pull request #13708 from sethalves/fix-grab-entity-w-child-overlay-crash 
fix a crash when grabbing a non-dynamic entity with an overlay child
 2018-07-27 12:49:14 -07:00
John Conklin II
9770331259
Merge pull request #13687 from danteruiz/fix-script-memory-issue 
Fix ScriptEngine begin held onto after script stopped runnning
 2018-07-27 12:31:31 -07:00
John Conklin II
d4cbbfe4c1
Merge pull request #13692 from amantley/leanBackSittingFix 
Fix For Unnatural Hips Behaviour When Sitting In HMD
 2018-07-27 12:30:31 -07:00
Simon Walton
3d390203e2 More fixes for clang & gcc 
C++14 issues, I think.
 2018-07-27 11:34:08 -07:00
Seth Alves
91d509f5a4 fix a crash when grabbing a non-dynamic entity with an overlay child 2018-07-27 10:35:26 -07:00
Seth Alves
41af82a7f6
Merge pull request #13702 from r3tk0n/17016-flying-settings 
17016 flying settings
 2018-07-27 10:07:13 -07:00
Sam Gondelman
3284f7b9d6
Merge pull request #13654 from huffman/fix/mirror-mode-create 
Fix computePickRay when in mirror mode
 2018-07-27 09:05:58 -07:00
Simon Walton
0cec9a72d6 Implement client-side enable physics once indicated EntityData has arrived 
Also now use Entity Server Protocol sequence numbers.
 2018-07-26 18:10:38 -07:00
SamGondelman
f5364f752f fix scaling 2018-07-26 18:01:24 -07:00
Alexander Ivash
29f7cab7df FB16702 - Avatar App does not save Animation JSON Override URL 
note: PR also changes logic of 'hint' - previously it showed hard-coded senseless text, now - current value of 'animation URL'
 2018-07-27 02:08:44 +03:00
r3tk0n
f3d0d9b4a0 Clean up garbage comments. 2018-07-26 15:37:42 -07:00
r3tk0n
f8c611b1d0 Divorce HMD and Desktop flying settings, implement setters and getters, change loadData and saveData in MyAvatar.cpp 2018-07-26 15:35:12 -07:00
SamGondelman
6a52b7b8f3 CR improvements 2018-07-26 12:15:12 -07:00
amantley
12cb212dc7 used avatar constants from AvatarConstants.h to initialize tpposehips and tposerightfoot, and added space between multiplication to meet coding standards 2018-07-26 12:05:17 -07:00
Anthony Thibault
6c92949aed
Merge pull request #13672 from luiscuenca/fixElbowPoleVector 
Redesign and enable hand's Pole Vectors for elbow simulation
 2018-07-26 11:51:33 -07:00
howard-stearns
9b61e8c4ad Merge branch 'master' of github.com:highfidelity/hifi into forget-you 2018-07-26 11:50:15 -07:00