Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-18 23:00:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61951 commits 72 branches 59 tags 1.2 GiB
Commit graph

61951 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nissim Hadar
16a10a8a0c WIP - working on byte order in server messages. 2017-10-03 20:57:56 -07:00
Nissim Hadar
89381e7c8e Moved _hazeProperties.getProperties(properties); into the ReadLock 2017-10-03 19:43:35 -07:00
Nissim Hadar
c1f4735468 Replaced HazeMode with uint8_t in transport protocol. 2017-10-03 19:39:34 -07:00
Brad Hefta-Gaub
a1979a2600 Merge branch 'master' into RC-56 2017-10-03 18:16:21 -07:00
Nissim Hadar
d4acb00aa5 Merge branch 'master' into hazeZone 2017-10-03 17:44:31 -07:00
Nissim Hadar
48e5b9d1bc Haze enable/disable from UI works. 2017-10-03 17:42:04 -07:00
anshuman64
d6f31369ee Merge pull request #11519 from druiz17/rc-equip 
RC- fixing grabbing and tablet bugs
 2017-10-03 17:27:11 -07:00
Zach Fox
ed40e41b94 Potential progress? Not totally sure 2017-10-03 16:18:29 -07:00
druiz17
13feec89c2 remove update stylus 2017-10-03 16:12:37 -07:00
druiz17
ad9677f63e fixing grabbing and tablet bugs 2017-10-03 16:11:51 -07:00
Seth Alves
75d2a2bd47 Merge pull request #11517 from SamGondelman/registration 
Fix entities with registration points rendering in the wrong place
 2017-10-03 16:09:27 -07:00
anshuman64
1a49b11821 Merge pull request #11514 from druiz17/rc-grab-attachment 
Allow the ability to grab attachments
 2017-10-03 16:01:20 -07:00
SamGondelman
fa838e4715 merge from master 2017-10-03 15:53:33 -07:00
SamGondelman
0614fd9b4f fix AvatarManger::findRayIntersection from script thread 2017-10-03 15:31:49 -07:00
SamGondelman
fc6e5df2cb fix text/web registration point usage 2017-10-03 15:02:21 -07:00
SamGondelman
c9d2d40e1e possibly fix registration offset issue 2017-10-03 14:44:11 -07:00
Zach Fox
9c4b02c659 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-03 14:37:07 -07:00
Zach Fox
b7e50c5b73 First steps 2017-10-03 14:36:22 -07:00
druiz17
6b3d89d18f fix hudlaser module 2017-10-03 14:13:37 -07:00
Seth Alves
6040c4a3e8 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-03 14:06:01 -07:00
Sam Gondelman
10e85e7ab0 Merge pull request #11515 from SamGondelman/threePose3 
Fix Local T-Pose
 2017-10-03 13:52:38 -07:00
Anthony Thibault
2dc080479c Merge pull request #11513 from hyperlogic/bug-fix/set-compund-shape-url-deadlock 
Bug fix for deadlock in ModelEntityItem::setCompundShapeURL()
 2017-10-03 13:31:01 -07:00
Seth Alves
05e173a1d0 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-03 13:11:03 -07:00
Seth Alves
ea4068f1f9 Merge pull request #11478 from vladest/fix_menu_linux 
Added workaround to enable menu bar under Linux
 2017-10-03 13:10:34 -07:00
druiz17
33e9a71000 grab attachments 2017-10-03 12:51:51 -07:00
SamGondelman
a6f2545511 fix local t pose 2017-10-03 12:51:37 -07:00
vladest
6fddf49988 Merge branch 'master' into login_dialog_rework 2017-10-03 21:39:38 +02:00
Andrew Meadows
46e809bbb2 use a better variable name 2017-10-03 12:35:03 -07:00
Andrew Meadows
ef326a3851 expose performance hot spot in stats details 2017-10-03 12:35:02 -07:00
Anthony J. Thibault
1389c2e31d Bug fix for deadlock in ModelEntityItem::setCompundShapeURL() 
The fix was to prevent ModelEntityItem::hasCompoundShapeURL() from taking
a readlock on the entity, instead a finer grained lock (ThreadSafeValueCache)
is made around the _compoundShapeURL QString.
 2017-10-03 12:15:23 -07:00
Zach Fox
ea3da6c9dd Merge pull request #11495 from zfox23/pop_interfaceChanges2 
Commerce: One step closer!
 2017-10-03 11:56:00 -07:00
Sam Gateau
ab8757eeb2 Merge pull request #11504 from AndrewMeadows/main-loop-stats-audit 
Tweak debug stats for more clarity
 2017-10-03 11:23:16 -07:00
Zach Fox
409360e55d Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-03 11:17:38 -07:00
Zach Fox
e64b0861a1 Change passphrase working 2017-10-03 10:53:10 -07:00
Nissim Hadar
86c497a12f Merge branch 'master' into hazeZone 
# Conflicts:
#	libraries/networking/src/udt/PacketHeaders.cpp
#	libraries/networking/src/udt/PacketHeaders.h
 2017-10-03 10:34:33 -07:00
Andrew Meadows
cd4be1473f put more of Application::update() under time measurement 2017-10-03 10:34:12 -07:00
Andrew Meadows
773c48bbc9 use floating point for game loop stats values 2017-10-03 10:32:19 -07:00
Howard Stearns
22f0ef33ed Merge pull request #11496 from howard-stearns/certificate-properties 
Certificate properties
 2017-10-03 10:06:48 -07:00
Nissim Hadar
1cf7f5a732 For testing. 2017-10-03 09:54:44 -07:00
Seth Alves
41dfdf4d82 Merge pull request #11509 from druiz17/fix-hud-module 
Hud module. check if laser is pointing at UI element without moving the reticle first
 2017-10-03 09:44:45 -07:00
Luis Cuenca
7cbf50e000 Minor change 
Minor change to rebuild in order to generate a new error log
 2017-10-03 08:52:52 -07:00
Daniela
b55e416ccf Remove fingerpaint app from scripts/system. 2017-10-03 15:28:05 +01:00
Daniela
2b18296cfd Merge remote-tracking branch 'upstream/master' 
# the commit.
 2017-10-03 15:26:22 +01:00
Daniela
1d6985a9eb Fix Animation hue bug. 2017-10-03 15:25:54 +01:00
David Rowe
f52df6667a Merge branch 'master' into vr-edit-a 2017-10-03 21:50:49 +13:00
David Rowe
06f0e23bf9 There no longer is a handControllerGrab.js 2017-10-03 21:44:56 +13:00
David Rowe
5145107f8c 2D overlays can no longer be lasered 2017-10-03 21:36:40 +13:00
Sam Gateau
64f70f1ebb more cleanups 2017-10-02 22:00:41 -07:00
Sam Gateau
895e3d0430 more cleanups 2017-10-02 21:46:52 -07:00
Sam Gateau
316156db46 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-02 21:31:59 -07:00