Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-24 18:07:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
39896 commits 77 branches 59 tags 1.2 GiB
Commit graph

16078 commits

Author SHA1 Message Date
Zach Pomerantz
c20bd6cbbc Update Scene on ZoneEntity update 
ZoneEntity is unique in that it is not updated
every frame that it is rendered, but only
when the avatar moves.

This introduces custom code so that the
RenderableZoneEntity initiates an update
in the EntityTreeRenderer on update,
to improve usability of zone editing.
 2016-02-25 10:06:19 -08:00
Zach Pomerantz
9000c3479b Avoid double-update of zone 2016-02-25 10:06:19 -08:00
Anthony J. Thibault
b5b3a40233 LogHandler: add option to display milliseconds in timestamp 2016-02-25 10:03:12 -08:00
Zach Pomerantz
32ce7c6eab Rename light surfaceRadius->falloffRadius 2016-02-25 10:02:33 -08:00
Andrew Meadows
9c927ea36b ViewFrustum method renames and whitespace cleanup 
fooInFrustum() --> computeFooViewLocation()
except pointInFrustum() --> computeFrustumLocation()
 2016-02-25 09:11:28 -08:00
Brad Hefta-Gaub
91f6b7e80d Merge pull request #7186 from zzmp/feat/scene-ambient-tex 
Wire up zone ambientURL
 2016-02-25 09:05:25 -08:00
Brad Hefta-Gaub
5828c32041 add toggleOverlays menu item and action 2016-02-25 08:31:11 -08:00
Brad Davis
ef33d297e2 Fix framebuffer behavior when changing attachments 2016-02-24 19:57:00 -08:00
Zach Pomerantz
c2ed5e5474 Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity 2016-02-24 16:24:09 -08:00
Zach Pomerantz
20bfdba14b Avoid light prop copies when setting globalLight 2016-02-24 16:20:59 -08:00
Zach Pomerantz
1817b8ef2f Use only skyboxTexture in DeferredLightingEffect 2016-02-24 16:07:28 -08:00
Zach Pomerantz
95d98e3ed7 Wire up zone ambientURL 2016-02-24 16:07:04 -08:00
Anthony Thibault
9d9e63a947 Merge pull request #7182 from zzmp/fix/aa-shader 
Fix fxaa shader to use texture
 2016-02-24 13:51:12 -08:00
Brad Hefta-Gaub
9273238b53 Merge pull request #7178 from Nex-Pro/20807 
CR for Job #20807 - Fix vertically mirrored particles.
 2016-02-24 13:43:40 -08:00
Zach Pomerantz
124c84c8b9 Fix fxaa shader to use texture 2016-02-24 13:36:08 -08:00
Brad Hefta-Gaub
2a18127a01 Merge pull request #7171 from jherico/avatar_qml_location 
Allow avatar positioning from QML
 2016-02-24 11:37:12 -08:00
Brad Hefta-Gaub
3df5d0abad Merge pull request #7161 from zzmp/fix/overlay-model-scale 
Use proper getter for model overlay scaling
 2016-02-24 09:31:47 -08:00
Chris Collins
64a07440cc Merge pull request #7180 from jherico/qml 
Several QML fixes
 2016-02-24 08:20:03 -08:00
Chris Collins
7f679af186 Merge pull request #7176 from zzmp/menu/graphics 
Update graphics menus
 2016-02-24 08:18:58 -08:00
Brad Davis
4074ba172d Fix window confirmation dialog 2016-02-23 20:37:25 -08:00
Brad Davis
b63e4b9d1f Address shutdown crash 2016-02-23 18:15:29 -08:00
Stephen Birarda
f8392e62a8 some wording tweaks in comments 2016-02-23 17:43:01 -08:00
Stephen Birarda
0191d75e86 allow temporary domain to upload public key 2016-02-23 17:29:15 -08:00
Andrew Meadows
8d91912d4b Merge pull request #7162 from hyperlogic/tony/controller-velocity 
Improve hand controller move and throw velocity
 2016-02-23 17:13:13 -08:00
Nex Pro
864f00ee61 Fixed inverted particle rendering. 2016-02-24 01:02:17 +00:00
Zach Pomerantz
13153bcf08 Fix keyLight.ambientURL capitalization 2016-02-23 16:53:16 -08:00
Zach Pomerantz
ea8edb3744 Remove antialiasing from menus, default to on 2016-02-23 16:24:44 -08:00
Chris Collins
94d018be3e Merge pull request #7172 from zzmp/fix/stats 
Consolidate stats for opaque/transparent/other
 2016-02-23 16:23:11 -08:00
Stephen Birarda
5fe74bb33c send hearbeat denied packet back from ice-server 2016-02-23 15:12:17 -08:00
Stephen Birarda
bb561e98d0 actually process the connection denied packets 2016-02-23 15:00:42 -08:00
Stephen Birarda
39d9e64ee5 process a handshake if the connection has ever received data 2016-02-23 14:59:27 -08:00
Stephen Birarda
2c7112e9a8 add initial send sequence number to SendQueue 2016-02-23 14:59:27 -08:00
Stephen Birarda
6cab831ea0 re-gen the interface keypair while being denied from domain 2016-02-23 14:52:12 -08:00
Anthony Thibault
38b29f4709 Revert "Physics: extrapolate kinematic objects as well as dynamic ones." 
This reverts commit e544275500.
 2016-02-23 13:26:15 -08:00
Zach Pomerantz
eb53f44a06 Convert size_t details to int 2016-02-23 12:44:38 -08:00
Brad Davis
2258a9cad9 Allow avatar positioning from QML 2016-02-23 12:16:41 -08:00
Zach Pomerantz
7804ee22d4 Consolidate stats for opaque/transparent/other 2016-02-23 12:14:00 -08:00
Anthony J. Thibault
e544275500 Physics: extrapolate kinematic objects as well as dynamic ones. 2016-02-23 12:07:14 -08:00
Stephen Birarda
540d1615cd re-attempt keypair generation for domain check in if missing 2016-02-23 12:05:12 -08:00
Clément Brisset
a802f69aa9 Merge pull request #7169 from samcake/red 
Fix the crash when Particle system entities are created and removed quickly
 2016-02-23 11:45:32 -08:00
Stephen Birarda
7e92841367 Merge pull request #7168 from howard-stearns/audio-restart-injector-limits 
audio restart injector limits
 2016-02-23 11:28:38 -08:00
Stephen Birarda
83e8c248bd repairs to failure case for keypair generation 2016-02-23 11:20:21 -08:00
Stephen Birarda
bfdf74367e don't update the AM keypair until uploaded 2016-02-23 11:09:28 -08:00
Stephen Birarda
e2f02347dd repairs to issues discovered during ID change 2016-02-23 10:57:54 -08:00
Howard Stearns
6a987391d2 Remove debugging code. 2016-02-23 10:55:36 -08:00
Howard Stearns
5d9ee84e63 Extend the test for number of active injectors to apply to injector restarts. 2016-02-23 10:42:39 -08:00
samcake
1c53f9bc87 Fix the cleanup of the render::Item::ID in the EntityITem Rendereable wich were often not invalidated after beeing removed from the scene. THis caused a bug with particule system when beeing added /removed / updated quickly 2016-02-23 10:40:50 -08:00
Zach Pomerantz
7c9022fb3e Fix model overlay scaling 2016-02-23 10:40:47 -08:00
Stephen Birarda
8385d12d9b Merge pull request #7159 from Atlante45/fix/atp 
Fix packet resend faillure bug
 2016-02-23 10:15:36 -08:00
Brad Davis
160a107bbd Auto-unhide the desktop when showing or raising a window 2016-02-22 19:36:00 -08:00
Zach Pomerantz
1e3cfd6baf Detect changes for surfaceRadius 2016-02-22 19:27:35 -08:00
Anthony Thibault
3b87cd0ea8 Improve hold action by using controller velocity 
The AvatarHoldAction now derives the body velocity by using data from the controller::Pose.  Rather then trying to derive it based on previous positions.  This results in more acurate motion of the held object when the hold is released.

OpenVR input plugin: pass the velocity and angularVelocity directly from the controller pose to the controller::Pose.
 2016-02-22 19:15:22 -08:00
Stephen Birarda
d510ee0e47 complete ice-server signature verification 2016-02-22 18:00:05 -08:00
Zach Pomerantz
8688bf2abb Move light entity defaults to light 2016-02-22 15:56:10 -08:00
Atlante45
4c18a50473 Only debug if define set 2016-02-22 15:42:11 -08:00
Atlante45
97aebaf52a Fix log regexes 2016-02-22 15:33:53 -08:00
Atlante45
cb4f400c7e Cleanup obfuscation code 2016-02-22 15:32:00 -08:00
Atlante45
17b4d6fcf9 Factor members copy 2016-02-22 15:15:38 -08:00
Atlante45
f06ac911c5 Fix XORing algorithm 2016-02-22 15:15:38 -08:00
Atlante45
3a11e84c94 Use hex for msvc compatibility 2016-02-22 15:15:38 -08:00
Atlante45
c29ad09306 Fix obfuscation 2016-02-22 15:15:38 -08:00
Atlante45
bf5a65ca45 Add missing copies 2016-02-22 15:15:38 -08:00
Atlante45
4605cf5087 Move all udt header constants to Constant.h 2016-02-22 15:15:38 -08:00
Atlante45
3d7d812044 Add resend mecanic with obfuscation 2016-02-22 15:15:38 -08:00
Atlante45
6d9405d91d Add obfuscation level to packets 2016-02-22 15:15:38 -08:00
Atlante45
f6526272de Add header descriptions 2016-02-22 15:15:38 -08:00
Stephen Birarda
11a1bc4488 add signed heartbeat sending to domain-server 2016-02-22 15:12:02 -08:00
Zach Pomerantz
77ad4039bc Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity 2016-02-22 15:11:12 -08:00
Zach Pomerantz
8ac84b3fc2 Render point/spot lights with surface radii 2016-02-22 15:07:08 -08:00
Zach Pomerantz
292842261d Bump packet version to LIGHT_HAS_SURFACE_RADIUS 2016-02-22 15:07:07 -08:00
Zach Pomerantz
6d7bf7d423 Add PROP_SURFACE_RADIUS to LightEntity 2016-02-22 15:07:07 -08:00
Brad Davis
c07f3789e4 Don't crash on script destructor 2016-02-22 14:26:33 -08:00
Brad Davis
b4a7dc113e Safer shutdown behavior in QML surfaces 2016-02-22 14:25:30 -08:00
Brad Davis
4169e9be9d Don't deadlock objreader on shutdown 2016-02-22 14:24:31 -08:00
Zach Pomerantz
329202def7 Remove light curve scale/bias from cutoff 
Light intensity attenuation is still calculated
as a function of distance from the light surface,
but is biased back so that the curve begins at
the light source, not the surface.

Light maximum radius is still user-inputted, but
if the radius is after a MIN_CUTOFF_INTENSITY,
a new cutoff radius will be calculated from the
intensity to avoid extra shader processing.
 2016-02-22 13:54:14 -08:00
Stephen Birarda
90e9089e85 repairs for storage of domain ID in AM accounts file 2016-02-22 13:23:01 -08:00
Ryan Huffman
e6ccf501fa Merge pull request #7135 from zzmp/fix/grid 
Update renderGrid to use a shader, and fix grid edit tools
 2016-02-22 12:58:23 -08:00
Brad Hefta-Gaub
bb1ed2147f revert change that trusted Qt's claim that it supports the format 2016-02-22 11:22:03 -08:00
Stephen Birarda
e30b2b7051 generate new domain keypair on domain ID change 2016-02-22 10:28:32 -08:00
Brad Hefta-Gaub
2c7c6be6a6 fix build buster 2016-02-21 10:40:11 -08:00
Brad Hefta-Gaub
a12446dab5 Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking 
Conflicts:
	libraries/entities-renderer/src/RenderableWebEntityItem.cpp
 2016-02-21 10:10:24 -08:00
Brad Hefta-Gaub
f41ebdf71d CR feedback 2016-02-21 10:03:54 -08:00
Brad Hefta-Gaub
dd558f0656 Merge pull request #7147 from jherico/too_many_webs 
Too many (or too large) web views crash Interface
 2016-02-21 10:03:16 -08:00
Brad Hefta-Gaub
1a4591db58 Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking 2016-02-21 09:30:41 -08:00
Thijs Wenker
58539171a3 give particle trails a nice smooth path between frames 2016-02-20 22:46:19 +01:00
Brad Davis
786747c2d7 Properly preserve and restore the GL context after building a web entity 2016-02-20 12:01:34 -08:00
Brad Hefta-Gaub
e6614fb9e5 Merge pull request #7141 from sethalves/fix-avatar-fade 
Fix avatar fade
 2016-02-20 10:26:07 -08:00
Brad Hefta-Gaub
db448c240f Merge pull request #7122 from howard-stearns/audio-output-buffer 
Audio output buffer
 2016-02-20 09:40:06 -08:00
Brad Hefta-Gaub
04fa37324f tweak to virtual desktop size, to make text more readable, 240d horz FOV 2016-02-19 18:24:32 -08:00
Stephen Birarda
837c4c0810 handle upload of domain public key to metaverse API 2016-02-19 16:55:12 -08:00
Stephen Birarda
6e4ecffb09 expose generated public key and private key from generator 2016-02-19 16:48:58 -08:00
Stephen Birarda
5de8601b43 simpler cleanup of result from RSAKeypairGenerator 2016-02-19 16:41:56 -08:00
Stephen Birarda
fa5f2571d7 cleanup migrations from previous account file system 2016-02-19 16:31:31 -08:00
Stephen Birarda
f553becabe data-server name tweak and isAgent behaviour change 2016-02-19 16:04:45 -08:00
Stephen Birarda
98b06112bd handle persistence of AccountManager info to sep file 2016-02-19 15:45:20 -08:00
Brad Davis
021b86c3fe Cap the max concurrent webviews, and deallocate unrendered views after 30 seconds 2016-02-19 15:41:40 -08:00
Brad Davis
64ec56bf89 Guards and warnings in QML rendering 2016-02-19 15:36:51 -08:00
Stephen Birarda
af181e00b1 allow for creation of domain-server keypair in AccountManager 2016-02-19 14:34:19 -08:00
Zach Pomerantz
fd6aa9a78b Add layering to renderGrid, draw edit grid not layered 2016-02-19 13:57:32 -08:00
howard-stearns
e21d9042d0 Remove some logging. 2016-02-19 13:34:06 -08:00