Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 22:57:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
59746 commits 75 branches 59 tags 1.2 GiB
Commit graph

24502 commits

Author SHA1 Message Date
Nissim Hadar
97f775f6f1 Clean-up. 2017-10-04 21:36:42 -07:00
Nissim Hadar
eef778a463 Replaced uint8_t with uint32_t in server packet. 2017-10-04 13:47:13 -07:00
Nissim Hadar
62cfaaaf38 Sam's corrections. 2017-10-04 12:56:14 -07:00
Nissim Hadar
2ce86ebfae WIP - working on byte order in server messages. 2017-10-04 11:56:35 -07:00
Nissim Hadar
3f677ec7c9 WIP - working on byte order in server messages. 2017-10-04 10:23:59 -07:00
Nissim Hadar
8c430d36fa WIP - working on byte order in server messages. 2017-10-03 21:59:40 -07:00
Nissim Hadar
76f843c741 WIP - working on byte order in server messages. 2017-10-03 21:46:50 -07:00
Nissim Hadar
75509b9ecb WIP - working on byte order in server messages. 2017-10-03 21:39:41 -07:00
Nissim Hadar
4019c3bc10 WIP - working on byte order in server messages. 2017-10-03 21:36:20 -07:00
Nissim Hadar
3505fedc00 WIP - working on byte order in server messages. 2017-10-03 21:34:21 -07:00
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
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
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
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
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
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
Nissim Hadar
93a2776cb5 Changes for debug 2017-10-02 18:13:23 -07:00
Nissim Hadar
999c3201c3 Merge branch 'master' into hazeZone 2017-10-02 16:54:45 -07:00
Nissim Hadar
cdbf067a24 Rename (haze)getParametersBuffer to getHazeParametersBuffer. 
Add corrections from Sam
 2017-10-02 16:54:02 -07:00
druiz17
8a0ecf4e6f propertly determine is laser intersects with HUD UI 2017-10-02 16:46:43 -07:00
Howard Stearns
9b0ebf0e07 doh! string not boolean 2017-10-02 16:18:28 -07:00
Howard Stearns
0b7af66016 more linux warnings 2017-10-02 15:38:59 -07:00
Nissim Hadar
ca4c5969d9 Clean-up. 2017-10-02 14:36:45 -07:00
druiz17
68780f56b7 Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module 2017-10-02 14:06:26 -07:00
Howard Stearns
136381adb9 fatal compiler warning on mac/linux 2017-10-02 13:56:15 -07:00
Andrew Meadows
8d2153d2f3 cleanup debug stats, use more correct names 2017-10-02 13:08:17 -07:00
Andrew Meadows
e9d48a2713 fix warning about double-to-float conversion 2017-10-02 13:08:17 -07:00
Andrew Meadows
7df8816a81 faster rate counting 2017-10-02 13:08:17 -07:00
Nissim Hadar
29d5e772d4 Removed "..Is.." from various methods. 2017-10-02 12:42:46 -07:00
Howard Stearns
7b0321c1e1 guess for mac/linux openssl 2017-10-02 12:30:25 -07:00
beholder
cc8f1352da 7951 Reload button in Running Scripts dialog stops script 2017-10-02 22:18:03 +03:00
Nissim Hadar
93bc3bec52 Removed (unused) _haze. 2017-10-02 12:14:21 -07:00
Nissim Hadar
48fb7522c0 Removed blank line 2017-10-02 11:42:04 -07:00
Howard Stearns
5c5f052bc2 explicit free, and remove header that isn't available on mac/linux 2017-10-02 10:28:47 -07:00
Nissim Hadar
20a42d6fbd Fixed model name string 2017-10-02 10:11:34 -07:00
Howard Stearns
0f6884dd80 fix mac/linux compiler error 2017-10-02 09:44:10 -07:00
Zach Fox
1ec0f5d9a0 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2 2017-10-02 09:26:59 -07:00
Nissim Hadar
97756146b1 Attempt to add qml configuration 2017-10-02 09:09:36 -07:00
Nissim Hadar
bdd469cec4 Integrated haze shader into this branch. 2017-10-01 21:52:34 -07:00
Nissim Hadar
ffecf42ebb Some clean-up. 2017-10-01 21:12:29 -07:00
Nissim Hadar
5a7fed022c Merging haze branch. 2017-09-30 00:04:28 -07:00
Nissim Hadar
95f8f1ffc5 Added Varying8 2017-09-29 18:05:48 -07:00
Nissim Hadar
951ce247a2 Working on adding zone to haze. 2017-09-29 17:36:14 -07:00