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
39721 commits 6 branches 1 tag 1.1 GiB
Commit graph

39721 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
f7654dce05 Style modal dialog background and border 2016-02-23 13:10:02 +13: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
Stephen Birarda
9f9ef8764d add a note about the QDataStream black box 2016-02-22 15:32:59 -08:00
Atlante45
cb4f400c7e Cleanup obfuscation code 2016-02-22 15:32:00 -08:00
Zach Pomerantz
dacf9f7123 Rm extra " in entityProperties 2016-02-22 15:18:45 -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
868e2ec961 Use "number" in entityProperties 2016-02-22 15:07:10 -08:00
Zach Pomerantz
1506686b79 Expose light surface to entityProperties 2016-02-22 15:07:09 -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
James B. Pollack
c102abd11f scale 2016-02-22 14:25:13 -08:00
Brad Davis
4169e9be9d Don't deadlock objreader on shutdown 2016-02-22 14:24:31 -08:00
Seth Alves
f113a83c5b merge from upstream 2016-02-22 14:02:38 -08:00
Seth Alves
c470649076 don't crash if entity vanishes while doing touch test 2016-02-22 14:00:01 -08:00
Seth Alves
8a3b233659 don't crash if entity vanishes while doing touch test 2016-02-22 13:58:07 -08:00
Stephen Birarda
d444d5dd18 don't offer login reset from CrashHandler 2016-02-22 13:56:33 -08:00
Brad Hefta-Gaub
3f7a2eb10a add support in depthReticle.js to set depth to overlay depth when you're over a 2D overlay 2016-02-22 13:54:46 -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
Brad Hefta-Gaub
54b21abf02 remove editWithHacks and move to more generic depthReticle 2016-02-22 13:32:19 -08:00
Brad Hefta-Gaub
fc002df5e7 implement Reticle.depth using the apparent 3D look at logic instead 2016-02-22 13:24:14 -08:00
Stephen Birarda
90e9089e85 repairs for storage of domain ID in AM accounts file 2016-02-22 13:23:01 -08:00
James B. Pollack
03d64d163e Merge branch 'master' into tiltmaze 2016-02-22 13:09:12 -08:00
David Rowe
d986a45497 Merge branch '20805' into 20809 2016-02-23 09:59:39 +13:00
David Rowe
942406e5d5 Improve focus shadow 2016-02-23 09:58:37 +13: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
715355464f Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork 2016-02-22 12:52:56 -08:00
Zach Pomerantz
5bf9b8bc76 Set grid minor div min to 0.01 2016-02-22 11:59:15 -08:00
Howard Stearns
523b77328c Merge pull request #7157 from ZappoMan/revertFlippedAudioChange 
revert change that trusted Qt's claim that it supports the audio format
 2016-02-22 11:37:54 -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
e369c1f327 fix unix warning 2016-02-22 10:28:00 -08:00
Chris Collins
f24e4bc6b1 Merge pull request #7152 from sethalves/fix-touch 
fix grab-script touch
 2016-02-22 09:58:29 -08:00
Brad Hefta-Gaub
3f03678d02 add version of edit that sets reticle depth 2016-02-22 09:27:27 -08:00
Chris Collins
7074f72e6f Merge pull request #7154 from ZappoMan/hmdHacking 
various HMD fixes and improvements
 2016-02-22 09:24:44 -08:00
Brad Hefta-Gaub
19d0968ccb Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork 
Conflicts:
	interface/src/ui/ApplicationCompositor.h
 2016-02-22 09:18:40 -08:00