Commit graph

17721 commits

Author SHA1 Message Date
Geenz
a54e8206fa Switch back to using the light's radius + spacing 2016-05-19 20:10:49 -04:00
Geenz
6ecbdc6b9a Modify evalLightAttenuation to "fade" edges of lights.
This provides a more attractive light falloff around the bounds of a
light - removing harsh edges.

This also adds a new parameter to evalLightAttenuation - the
unnormalized light vector.
2016-05-19 20:03:05 -04: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
Brad Davis
7efcad38d2 PR feedback 2016-05-18 23:11:36 -07:00
Zach Pomerantz
87b102ae0f Fix -Wunused-result from invokeResult 2016-05-18 18:19:44 -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
e622c17f6b Pull default UserAgentGetter out of func signature 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
Brad Davis
3cc08cdcfc Breaking up GL agnostic code from 4.1 specific code 2016-05-18 14:35:53 -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
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
Zach Pomerantz
59e17c2d5f Fix abs of unsigned warning 2016-05-17 22:57:29 -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
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
Andrew Meadows
1749bfbc58 transition to InAir state when not thrusting up 2016-05-17 14:02:47 -07:00
Andrew Meadows
9b7bf97891 enable vertical thrust while walking 2016-05-17 14:02:46 -07:00
Ryan Huffman
cf6eba96a4 Remove unused variable 2016-05-17 11:17:34 -07:00
Ryan Huffman
2dbea37690 Fix address manager sometimes double adding address history 2016-05-17 11:17:34 -07:00
Ryan Huffman
d47c74408e Cleanup handleViewpoint 2016-05-17 11:17:34 -07:00
Ryan Huffman
0ec9d9e277 Remove goToAddressFromObject from slots 2016-05-17 11:17:34 -07:00
Ryan Huffman
f213a059fb Fix AddressManager not always storing history when it should 2016-05-17 11:17:34 -07:00
Ryan Huffman
fde1f0740c Fix goBackPossible not being triggered correctly in AddressManager 2016-05-17 11:17:34 -07:00
samcake
8ec280535b FIx bad roughness value read from the deferred buffer 2016-05-17 11:13:34 -07:00
Ryan Huffman
013d902376 Add vector include to OctalCode.h 2016-05-17 10:59:51 -07:00
Ryan Huffman
475d881b04 Fix logging of shared_ptr 2016-05-17 10:59:51 -07:00
Ryan Huffman
1bec38584b Remove class qualification from header file 2016-05-17 10:59:51 -07:00
Ryan Huffman
368eded8ee Remove unnecessary type in Jurisdictionmap 2016-05-17 10:59:51 -07:00
Ryan Huffman
5fc18eafda Rename OctalCodePtr related functions 2016-05-17 10:59:51 -07:00
Ryan Huffman
35f147f557 Cleanup use of OctalCodePtrList and add allocateOctalCodePtr 2016-05-17 10:59:51 -07:00
Ryan Huffman
e819ab8475 Add mutex protection around octal code getters 2016-05-17 10:59:51 -07:00
Ryan Huffman
ef6d758e7f Fix JurisdictionMap multithreading issues
Make octal code pointers use shared_ptr, add locks around access.
2016-05-17 10:59:51 -07:00
Brad Davis
34e574c148 Merge pull request #7816 from zzmp/perf/idle-event
Drive render loop from DisplayPlugin instead of busy wait
2016-05-17 09:36:09 -07:00
Chris Collins
b2ece6f4a7 Merge pull request #7882 from zzmp/fix/script-thread-dtor
Wait and cleanly exit the scripting thread
2016-05-16 16:52:54 -07:00
Brad Davis
0d6b0eef59 PR feedback 2016-05-16 15:27:14 -07:00
Seth Alves
d77b3bf59a fix some comments and debug pritns 2016-05-16 14:12:05 -07:00
Brad Davis
5ba8372c21 Moving GL backend out of GPU 2016-05-16 12:54:17 -07:00