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

35915 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
06c8235b19 Merge pull request #6544 from sethalves/distance-grab-adjustment 
distance-hold adjustment
 2015-12-04 14:34:10 -08:00
Brad Hefta-Gaub
7faf9c2f22 bump protocol version 2015-12-04 14:33:45 -08:00
Brad Hefta-Gaub
46946212cf remove WANT_LOW_RES_MOVING_BIT from OctreeQuery always true 2015-12-04 14:24:31 -08:00
Stephen Birarda
ad4f818b21 only attempt to stop QTimer if active 2015-12-04 14:12:41 -08:00
Seth Alves
f940a5c1c5 Merge branch 'distance-grab-adjustment' of github.com:sethalves/hifi into parents 2015-12-04 14:11:58 -08:00
Brad Hefta-Gaub
f44a9daa21 remove WANT_DELTA from OctreeQuery 2015-12-04 14:04:57 -08:00
Stephen Birarda
d2fdf6a04b Merge branch 'master' of https://github.com/highfidelity/hifi into log-handler-crash 2015-12-04 13:55:57 -08:00
Brad Hefta-Gaub
f71d2d00d2 Merge pull request #6548 from jherico/threaded_present 
Threaded present
 2015-12-04 13:42:09 -08:00
Brad Hefta-Gaub
0d9d5375c7 remove optional WANT_COMPRESSION from OctreeQuery 2015-12-04 13:29:18 -08:00
Brad Davis
11917ca501 Fixing preview / vsync functionality 2015-12-04 12:46:19 -08:00
Ryan Downe Karpf
950d020d77 Merge pull request #6553 from ericrius1/noBlockCollisions 
Blocks dont collide when held
 2015-12-04 11:59:39 -08:00
Stephen Birarda
165db97cb2 cleanup double reset debug on assignment-client restart 2015-12-04 11:50:27 -08:00
Brad Hefta-Gaub
84b98c93a1 Merge pull request #6559 from birarda/log-handler-crash 
reset the NodeList on its own thread
 2015-12-04 11:44:06 -08:00
ericrius1
3bb1dedaf9 fixed syntax error 2015-12-04 11:41:23 -08:00
Brad Hefta-Gaub
79d60f74ba Merge pull request #6558 from sethalves/parents 
fix an AC race/crash
 2015-12-04 11:40:21 -08:00
Ryan Huffman
89c412c324 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-12-04 11:38:28 -08:00
Anthony Thibault
3118634df0 Merge pull request #6547 from howard-stearns/fix-anim-graph-preference-change 
Fix anim graph preference change
 2015-12-04 11:25:50 -08:00
Brad Hefta-Gaub
0ad4efeeb9 Merge pull request #6555 from howard-stearns/remove-unimplemented-collision-shapes-menu-item 
Remove unimplemented collision menu items
 2015-12-04 11:25:08 -08:00
Brad Hefta-Gaub
15c4dbfb11 Merge pull request #6554 from Atlante45/warnings 
Last of the OpenGL warnings on OS X
 2015-12-04 11:24:28 -08:00
Stephen Birarda
d5f79b84fc make the NodeList reset a blocking queued connection 2015-12-04 11:20:46 -08:00
Stephen Birarda
918342df5f make sure the NodeList is reset on its own thread 2015-12-04 11:18:46 -08:00
Brad Hefta-Gaub
d07629489c Merge pull request #6543 from Atlante45/pointer 
gpu::Shader::create* return shared_ptr
 2015-12-04 11:17:02 -08:00
Seth Alves
ea65ef964f fix an AC race/crash 2015-12-04 11:13:36 -08:00
Brad Hefta-Gaub
4452f03cfa Merge pull request #6557 from birarda/parents-crash 
Fix crash in QTimer::stop for node keepalive timer
 2015-12-04 11:12:45 -08:00
Howard Stearns
a0a4f7d177 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-anim-graph-preference-change 2015-12-04 11:08:44 -08:00
Stephen Birarda
ca84fcd7f4 parent the keepalive timer to the NL thread 2015-12-04 11:01:18 -08:00
Howard Stearns
cb67f05103 Remove unimplemented menu items Developer->Avatar->Show Skeleton/Head Collision Shapes. 2015-12-04 10:47:27 -08:00
Seth Alves
4246672813 enable head-moving of distance grabbing 2015-12-04 10:38:24 -08:00
Atlante45
528a17422d Last of the OpenGL warnings on OS X 2015-12-04 10:33:10 -08:00
Brad Davis
90ef7c6bf7 Disabling 0.5 Oculus plugin (Mac / Linux) for now 2015-12-04 10:28:20 -08:00
Brad Davis
c4514743d1 Fixing tests, moving some plugin container stuff to base class 2015-12-04 10:28:19 -08:00
Brad Davis
60aa93c38c Fixing menu items in display plugins 2015-12-04 10:28:19 -08:00
Brad Davis
7262a10e62 Refactoring present thread / GL base plugin for saner context management 2015-12-04 10:28:18 -08:00
Brad Davis
d8bb9f8d18 Fixing screenshot functionality 2015-12-04 10:28:17 -08:00
Brad Davis
b9ace94ff1 Prototyping threaded present 2015-12-04 10:28:16 -08:00
Brad Hefta-Gaub
d9a1563396 Merge pull request #6152 from sethalves/parents 
Parents
 2015-12-04 10:26:57 -08:00
Brad Hefta-Gaub
ab63f19b6a Merge pull request #6546 from kencooke/audio-reverb 
Reverb
 2015-12-04 10:19:56 -08:00
Brad Hefta-Gaub
49a7852d76 Merge pull request #6540 from Atlante45/warnings 
Fix warnings on OS X
 2015-12-04 10:19:25 -08:00
ericrius1
786e241a29 blocks dont collide when held 2015-12-04 10:14:40 -08:00
Brad Hefta-Gaub
8b58aa706a Merge pull request #6534 from jherico/homer 
Windows 64 bit updates
 2015-12-04 10:05:45 -08:00
Atlante45
07387ab8c0 Fix most OpenGL warnings 2015-12-04 10:01:43 -08:00
Brad Davis
a8f0de20a8 Merge pull request #6551 from ZappoMan/cruftRemovalRedux 
Cruft removal redux
 2015-12-04 09:45:22 -08:00
Atlante45
a455cb880f Fix typeid warning 2015-12-04 09:23:16 -08:00
Atlante45
cb758ca6b4 Fix override warnings on XCode 7 2015-12-04 08:55:43 -08:00
Atlante45
cd26422ca0 Fix warnings on OS X 2015-12-04 08:47:06 -08:00
Brad Hefta-Gaub
18e62290f3 fix warnings 2015-12-04 08:37:46 -08:00
Brad Hefta-Gaub
f472b515c3 remove wantsColor support since its always true and required for entities 2015-12-03 21:03:32 -08:00
Brad Hefta-Gaub
81fb4476bc remove coverage map and occulusion culling, since it was always disabled 2015-12-03 20:29:23 -08:00
Ken Cooke
aad4743bf0 Completely remove Gverb from cmake 2015-12-03 18:06:50 -08:00
Brad Hefta-Gaub
44e137ec01 Merge pull request #6550 from highfidelity/revert-6538-cruftRemoval 
Revert "Cruft removal"
 2015-12-03 17:40:54 -08:00