Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 09:33:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
43697 commits 25 branches 0 tags 1.1 GiB
Commit graph

43697 commits

This branch
This branch
All branches
Author SHA1 Message Date
Clément Brisset
cddf587d6b Merge pull request #7919 from zzmp/fix/osx-warnings 
Fix OSX warnings
 2016-05-19 11:11:30 -07:00
samcake
039bb3ac3c Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-05-19 10:21:38 -07:00
Seth Alves
7ea7bd3e1d set created-time for imported entities to 'now' 2016-05-19 10:21:04 -07:00
samcake
2d7118dacc clening up the code 2016-05-19 10:21:00 -07:00
samcake
d0c883f75a Merge pull request #7923 from jherico/gpu_breakup2 
breaking up OpenGL GPU backend
 2016-05-19 10:02:42 -07:00
Brad Hefta-Gaub
232bd475df Merge pull request #7927 from zzmp/fix/script-timer-crash 
fix crash on shutdown from script timers
 2016-05-19 09:52:04 -07:00
Seth Alves
74520f5c92 Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones 2016-05-19 09:49:44 -07:00
Seth Alves
419c744bd4 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-19 09:49:18 -07:00
Seth Alves
6c3c9f45d1 Merge branch 'master' of github.com:highfidelity/hifi into overlay-or-grab-not-both 2016-05-19 09:48:50 -07:00
Brad Hefta-Gaub
53956c8210 reduce log spam 2016-05-19 07:50:06 -07:00
Brad Davis
7efcad38d2 PR feedback 2016-05-18 23:11:36 -07:00
David Rowe
41311bc3df Finish decoupling FolderListModel 2016-05-19 17:13:07 +12:00
Brad Hefta-Gaub
ed3950c5d7 Merge pull request #7933 from Atlante45/remove-ac-avatar 
fix floating AC Avatar at 0,0,0
 2016-05-18 19:56:04 -07:00
David Rowe
585467094c Sort files case-insensitively, directories first 2016-05-19 14:16:00 +12:00
Atlante45
917fe2ae6a Give AC audio searcher invalid avatar URL 2016-05-18 19:10:59 -07:00
Zach Pomerantz
e1971f5ed3 Fix shadow bounds checking 2016-05-18 18:58:28 -07:00
Seth Alves
94ef12507b Merge pull request #7931 from zzmp/fix/unused-result 
fix -Wunused-variable
 2016-05-18 18:44:16 -07:00
Zach Pomerantz
87b102ae0f Fix -Wunused-result from invokeResult 2016-05-18 18:19:44 -07:00
Anthony J. Thibault
de1204c42d Enable transmission of jointIndices 2016-05-18 18:19:28 -07:00
Brad Hefta-Gaub
e0fd968216 Merge pull request #7928 from zzmp/fix/assert-vrmenu 
remove failed assertion in VrMenu
 2016-05-18 17:49:50 -07:00
Zach Pomerantz
107b1b830e Stop ScriptCache callbacks when scripts are stopped 2016-05-18 17:46:12 -07:00
Zach Pomerantz
2c9b0f7233 Rm failing VrMenu assertion 2016-05-18 17:31:47 -07:00
Zach Pomerantz
8025a3f14c Prevent crash from script timers on shutdown 2016-05-18 17:30:34 -07:00
Anthony J. Thibault
0294066668 Removed pupilData and translationRadix from AvatarData packet. 2016-05-18 16:41:50 -07:00
David Rowe
862a88cf29 Insert an intermediary ListModel suitable for sorting and drives 2016-05-19 11:29:21 +12:00
Zach Pomerantz
c480dcfddd Check thread validity after event processing 2016-05-18 16:26:54 -07:00
Seth Alves
b4df7cada7 don't mouse-grab things through an overlay 2016-05-18 16:16:31 -07:00
Anthony J. Thibault
eb80990c10 Another fix for avatarIdentity pong 2016-05-18 16:08:56 -07:00
Anthony J. Thibault
e792e8eecf Fix for identity packet pong 2016-05-18 16:05:16 -07:00
Anthony J. Thibault
135fa8c2aa Moved jointIndices transmission behind #ifdef 2016-05-18 15:41:21 -07:00
Ryan Huffman
64c89a5dde Fix AccountManager not compiling on Windows 2016-05-18 15:38:54 -07:00
Ryan Huffman
01944f5100 Remove unused DependencyManager include 2016-05-18 15:38:54 -07:00
Ryan Huffman
e622c17f6b Pull default UserAgentGetter out of func signature 2016-05-18 15:38:54 -07:00
Ryan Huffman
79ce64aa3a Fix compilation error in DomainServer.cpp 2016-05-18 15:38:54 -07:00
Ryan Huffman
ce6ae40432 Replace foreach use with for() 2016-05-18 15:38:54 -07:00
Ryan Huffman
bfb4bb0896 Add userAgentGetter to AccountManager for custom UserAgent 2016-05-18 15:38:54 -07:00
Ryan Huffman
dd093e3fcd Make AccountManager a DependencyManager singleton 2016-05-18 15:38:54 -07:00
Ryan Huffman
cf49c8e2bf Add getUserAgent function that includes plugin information 2016-05-18 15:35:29 -07:00
Anthony J. Thibault
c48fce4f5a WIP commit, socket errors when AvatarIdentity is larger then MTU 2016-05-18 15:24:10 -07:00
Ryan Huffman
1c5e1bb5ea Merge pull request #7875 from imgntn/toyboxFixes 
[Toybox] Fix utils paths
 2016-05-18 14:58:27 -07:00
Brad Davis
e431fd3d65 Merge pull request #7921 from howard-stearns/turn-off-hand-controller-pointer-when-no-focus 
turn off hand-controller pointer when Interface doesn't have focus
 2016-05-18 14:45:35 -07:00
Brad Davis
3cc08cdcfc Breaking up GL agnostic code from 4.1 specific code 2016-05-18 14:35:53 -07:00
David Rowe
551c669883 Move FolderListModel to be stand-alone 2016-05-19 09:24:15 +12:00
samcake
185f069441 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-05-18 13:16:14 -07:00
samcake
89f18aee3b Simplifying the deferredbuffer clear and enableing z test for lighting pass 2016-05-18 13:14:42 -07:00
howard-stearns
fa90d823d5 Turn off hand-controller pointer when Interface doesn't have focus. 2016-05-18 11:49:12 -07:00
Brad Hefta-Gaub
335d9abddd Merge pull request #7874 from AndrewMeadows/vertical-thrust 
allow MyAvatar.addThrust() to raise avatar from standing on ground
 2016-05-18 11:41:37 -07:00
Anthony J. Thibault
b48134e30c WIP commit testing for joint mapping transmission 2016-05-18 11:40:45 -07:00
Brad Hefta-Gaub
67891abf17 Merge pull request #7877 from Atlante45/fix/asset-client 
Fix Asset Client crash
 2016-05-18 11:37:34 -07:00
Atlante45
de36cd150e Move runnings scripts setting storage 
So that it doesn't conflict with the "Settings" menu setting
storage.
	Running script would clear those settings while storing its data
	This adds some backward compatible code to move the scripts
settings to the new location.
 2016-05-18 11:36:14 -07:00