Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 16:10:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
43436 commits 76 branches 59 tags 1.2 GiB
Commit graph

43436 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
1de9598243 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-19 16:37:40 -07:00
Brad Hefta-Gaub
cef4a49c35 Merge pull request #7867 from huffman/fix/query-octree-crash 
Fix crash in JurisdictionMap
 2016-05-19 11:53:54 -07:00
Brad Hefta-Gaub
ac15097f47 Merge pull request #7834 from huffman/feat/user-agent-plugins 
Add system information to UserAgent in AccountManager requests
 2016-05-19 11:53:14 -07:00
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
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
419c744bd4 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-19 09:49:18 -07:00
Brad Davis
7efcad38d2 PR feedback 2016-05-18 23:11:36 -07: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
Atlante45
917fe2ae6a Give AC audio searcher invalid avatar URL 2016-05-18 19:10:59 -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
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
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
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
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
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
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
Brad Hefta-Gaub
4df4829280 Merge pull request #7902 from jherico/gpu_breakup 
moving GL backend out of GPU
 2016-05-18 11:35:35 -07:00
Brad Hefta-Gaub
52445115dd Merge pull request #7906 from howard-stearns/improve-hand-controller-edit 
improve hand-controller edit
 2016-05-18 11:35:00 -07:00
James B. Pollack
8026a5e7f0 fix utils paths 2016-05-18 10:30:43 -07:00
Brad Hefta-Gaub
9a3b6bf081 Merge pull request #7858 from Atlante45/remove-deprecated-entity-props 
removed dead code for overlays/entities glow level
 2016-05-18 09:14:26 -07:00
Brad Hefta-Gaub
9af39d71e1 Merge pull request #7767 from huffman/fix/address-bar-back 
Fix address bar becoming unusable after going backwards or forwards
 2016-05-18 09:14:07 -07:00
Brad Hefta-Gaub
df491159ed Merge pull request #7881 from imgntn/tidyBotSwipe 
[Home] TidyBot 2.0
 2016-05-18 09:08:07 -07:00
James B. Pollack
d24ec08f9f cleanup 2016-05-18 08:55:02 -07:00
James B. Pollack
5d1b2996d3 semicolon 2016-05-18 08:53:57 -07:00
James B. Pollack
946558d0f6 cleanup 2016-05-18 08:53:13 -07:00
James B. Pollack
0c5adf83ce fix hands 2016-05-18 08:43:53 -07:00
Zach Pomerantz
59e17c2d5f Fix abs of unsigned warning 2016-05-17 22:57:29 -07:00
Seth Alves
cf829f1bab magic number 2016-05-17 19:14:44 -07:00
Seth Alves
3380b2a668 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-17 19:10:33 -07:00
Andrew Meadows
9786c0bfd3 remove warning about signed/unsigned conversion 2016-05-17 15:34:09 -07:00
Andrew Meadows
aab26c5089 disable DEBUG_STATE_CHANGE 2016-05-17 15:14:36 -07:00
Ryan Huffman
68665e6b25 Fix JurisdictionMap not initializing correctly 2016-05-17 15:12:45 -07:00
Ryan Huffman
47d897f669 Fix processOctreeStats recreating JurisdictionMap for every stat packet 2016-05-17 15:12:14 -07:00
Andrew Meadows
aa171578b7 remove cruft 2016-05-17 14:58:14 -07:00
Andrew Meadows
c64612c42b namechange keyboardMotor --> actionMotor 2016-05-17 14:46:50 -07:00
Andrew Meadows
2f39968a03 remove debug cruft 2016-05-17 14:32:20 -07:00
Andrew Meadows
e4cb6e2b87 order-independent CharacterController motors 2016-05-17 14:02:49 -07:00