Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 09:31:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
36469 commits 75 branches 59 tags 1.2 GiB
Commit graph

36469 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
c0faf978f8 Introducing a setting for the tone curve 2015-12-16 15:21:09 -08:00
Leonardo Murillo
bbe444ffc1 Forgot to add file 2015-12-16 16:40:51 -06:00
Leonardo Murillo
a7b61cf791 Couple of fixes 2015-12-16 16:39:09 -06:00
samcake
dc6585591f t :wq 
Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr
 2015-12-16 14:38:47 -08:00
Atlante45
b709c8162c Fix node flapping race 2015-12-16 14:27:26 -08:00
Atlante45
6bda8d3f18 CR logging category 2015-12-16 14:27:26 -08:00
Atlante45
b55d8f750f CR 2015-12-16 14:27:26 -08:00
Atlante45
0f7093bed7 Whitespace 2015-12-16 14:27:26 -08:00
Atlante45
df24fafe49 CR feedback 2015-12-16 14:27:26 -08:00
Atlante45
a655557af0 Make variable name more obvious 2015-12-16 14:27:26 -08:00
Atlante45
b4dc3b1b47 Fix windows compile error. 2015-12-16 14:27:26 -08:00
Atlante45
a541fdd2df Move OctreeSendThread to the OctreeServer 2015-12-16 14:27:26 -08:00
Atlante45
51ec7ae2ed Keep UUID of node in send thread 2015-12-16 14:27:26 -08:00
Atlante45
3cd1eea1dc Use weak pointer to the Node instead of strong ownership 2015-12-16 14:27:26 -08:00
Atlante45
95da71b19c Assignment don't inherit from NodeData 
This is an artefact from an old design that stuck around
 2015-12-16 14:27:26 -08:00
Atlante45
562d9ac2de Forward QThread's finished signal in GenericThread 2015-12-16 14:27:26 -08:00
Atlante45
346c28f9e2 Remove OctreeServer's static instance 2015-12-16 14:27:26 -08:00
Atlante45
09701fdcf1 deadlock 101 2015-12-16 14:27:26 -08:00
Atlante45
b65cdd2865 Add logging categories to assignment client. 2015-12-16 14:27:26 -08:00
Atlante45
bd7fa266cf Bit of cleanup 2015-12-16 14:27:26 -08:00
Seth Alves
8bfbb69316 clean up code, change try-locks to locks 2015-12-16 14:21:56 -08:00
Leonardo Murillo
66770cc907 Finishing touches 2015-12-16 16:11:35 -06:00
Seth Alves
d3c57821c0 call a method on actions before each physics simulation step. use this to attempt to dejitter held objects 2015-12-16 14:00:04 -08:00
Leonardo Murillo
cbed8bf35a NSIS Changes 2015-12-16 15:12:14 -06:00
Leonardo Murillo
5ed422e3a1 Removing unwanted changes 2015-12-16 14:28:49 -06:00
Leonardo Murillo
56ef52022d Removing unwanted changes 2015-12-16 14:28:05 -06:00
Leonardo Murillo
711d02ba2f Consolidating installer checkpoint 2015-12-16 14:26:24 -06:00
Clément Brisset
48429eddc8 Merge pull request #6666 from samcake/hdr 
Graphics: Adding a simple manual exposure for configuring the tone mapping
 2015-12-16 12:09:52 -08:00
Anthony Thibault
0c1ae5bb61 Merge pull request #6657 from AndrewMeadows/avatar-capsule-2 
Correct collision capsule for scaled avatars
 2015-12-16 11:36:08 -08:00
Ryan Huffman
a422103e89 Merge pull request #6662 from AlessandroSigna/overlays 
Exposing emmisive property of the Image3DOverlay
 2015-12-16 10:29:34 -08:00
Seth Alves
2f17051b1f Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-16 10:16:06 -08:00
Seth Alves
10b82945a6 formatting 2015-12-16 10:16:01 -08:00
Seth Alves
45d19167c9 fix a couple of missing-parent bugs 2015-12-16 10:09:46 -08:00
AlessandroSigna
08f7591787 Fix misspelling 2015-12-16 10:02:47 -08:00
samcake
7c8f12b9c4 Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr 2015-12-16 09:55:37 -08:00
samcake
1ff5c1e985 Merge pull request #6669 from samcake/graphicsMaster 
Graphics: merge upstream master into upstream graphics
 2015-12-16 09:52:30 -08:00
samcake
b4b541178d Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-16 09:42:06 -08:00
Leonardo Murillo
3e6316f089 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-16 11:34:58 -06:00
Seth Alves
4429890cd8 Merge pull request #6668 from zzmp/fix/fbx-texture 
Load texture by convention with .obj
 2015-12-16 06:47:02 -08:00
Seth Alves
b55596689f Merge branch 'fix/fbx-texture' of github.com:zzmp/hifi into near-grab-via-parenting 2015-12-16 06:39:35 -08:00
samcake
1364329886 FIxing the compil bug by checking security of the call with assert and avoiding the compilation error 2015-12-15 22:07:06 -08:00
Brad Davis
1e5793893b Merge pull request #6665 from ZappoMan/rightClickMenu 
fix bug in simulated left click - make qml menus work
 2015-12-15 21:40:00 -08:00
Zach Pomerantz
3280894e29 Load texture by convention with .obj 2015-12-15 19:30:15 -08:00
Clément Brisset
7c8f019507 Merge pull request #6663 from birarda/baseball 
update link to bat script in createBatButton.js
 2015-12-15 19:26:33 -08:00
Seth Alves
0003c607ea Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-15 18:46:21 -08:00
Seth Alves
13a1eec48c Merge pull request #6658 from AndrewMeadows/linux-input-plugins 
correct input plugin load path on linux
 2015-12-15 18:39:27 -08:00
Seth Alves
e8aa9c07ed Merge branch 'linux-input-plugins' of github.com:AndrewMeadows/hifi into near-grab-via-parenting 2015-12-15 18:38:04 -08:00
samcake
a60ef4fb5a Finalize the names 2015-12-15 18:32:30 -08:00
samcake
c2feec16de Cleaning the code 2015-12-15 18:24:16 -08:00
samcake
d2ebaef69e Adding a simple manual exposure control to configure the tonemapping and expose it to js. Add a convenient way to access the Job._concept._data with template 2015-12-15 18:18:42 -08:00