Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-16 15:36:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
36752 commits 74 branches 59 tags 1.2 GiB
Commit graph

36752 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
e2ecc388ca Indicate particle properties that (temporarily) aren't working 2015-12-18 15:10:47 +13:00
Brad Hefta-Gaub
d344ef6e2a fix warning in my PR 2015-12-17 18:10:41 -08:00
David Rowe
5aef309b8a Get particles in particlesTest.js emitting again 2015-12-18 15:09:36 +13:00
samcake
c891bcb8cd FIxing the diffuse contribution bug maybe 2015-12-17 17:44:40 -08:00
samcake
32bb8f020c FIxing the diffuse contribution bug maybe 2015-12-17 17:40:35 -08:00
Brad Hefta-Gaub
762aefbbca add hand driven reticle 2015-12-17 17:38:20 -08:00
James B. Pollack
7a542a678b prep for close button 2015-12-17 17:17:04 -08:00
James B. Pollack
a25feb5578 switching branches 2015-12-17 16:58:38 -08:00
samcake
e179326e58 Merge pull request #6688 from Atlante45/graphics 
Added live custom debug shader support
 2015-12-17 16:19:49 -08:00
Atlante45
78b805a19a Fix file shader file lookup on windows 2015-12-17 16:06:55 -08:00
Atlante45
c0a675dd9e Fix msvc warning 2015-12-17 16:02:49 -08:00
ericrius1
17af34a3be fixed spelling error 2015-12-17 15:48:05 -08:00
ericrius1
aa1f77ab1c adding ravestick to toybox demo room 2015-12-17 15:42:52 -08:00
Atlante45
f41ca9fc50 More custom debug work 2015-12-17 15:18:23 -08:00
Atlante45
d8a389ff92 First cut at custom pipelines 2015-12-17 15:18:23 -08:00
Atlante45
9d6618c341 Cleanup DebugDeferredBuffer code 2015-12-17 15:18:23 -08:00
Atlante45
06d7de7106 Make Shader interface take more consts 2015-12-17 15:18:23 -08:00
Atlante45
b271542b73 Save DebugMode to setting, restore on script start 2015-12-17 15:18:23 -08:00
ericrius1
3e6ae7c571 added lightball back 2015-12-17 15:02:25 -08:00
Andrew Meadows
1bb6ddb99f Merge pull request #6676 from sethalves/dejitter-hold-action 
Dejitter hold action
 2015-12-17 14:29:39 -08:00
ericrius1
035ca25b48 arc ball finds other balls 2015-12-17 13:31:27 -08:00
Clément Brisset
992cffd6d6 Merge pull request #6686 from samcake/hdr 
Graphics: Fix bad returned references which should be copied values
 2015-12-17 13:20:59 -08:00
ericrius1
92f96cbb2f Removed un-needed libraries from particle effect entity 2015-12-17 12:49:30 -08:00
ericrius1
6f82d680b9 removed unwanted file 2015-12-17 12:38:25 -08:00
Brad Davis
5088eec2a2 Move directory web UI into the overlay 2015-12-17 12:23:39 -08:00
Brad Davis
82c865af2c Rename QmlWebWindow to OverlayWebWindow, move ctor registration to script engine 2015-12-17 12:20:38 -08:00
James B. Pollack
8e2128c692 update light volume when you move light parent 2015-12-17 11:59:21 -08:00
Seth Alves
b80fa1c806 code review 2015-12-17 11:46:41 -08:00
ericrius1
5b52b5e5e7 Merge branch 'master' into polylineOptimizations 2015-12-17 11:41:34 -08:00
ericrius1
8d25a666d1 fixed bug where trail would remain after user released rave stick 2015-12-17 11:40:06 -08:00
ericrius1
2aaefbcfcb refactoring, adding headers 2015-12-17 11:32:48 -08:00
Ryan Huffman
3da5cf1fe5 Merge pull request #6684 from birarda/read-type-assert 
fix reading of empty or malformed packets
 2015-12-17 11:26:47 -08:00
Seth Alves
f3adb8a2f7 fix offset math in hold action 2015-12-17 11:16:59 -08:00
Brad Hefta-Gaub
63a63152a4 add procedural hand pose example 2015-12-17 11:10:49 -08:00
Seth Alves
eb173815f5 Merge branch 'master' of github.com:highfidelity/hifi into dejitter-hold-action 2015-12-17 11:08:05 -08:00
Stephen Birarda
06e9731fe4 don't attempt to read an empty or malformed packet 2015-12-17 11:07:36 -08:00
Seth Alves
aabc544d6c Merge pull request #6683 from birarda/shtml-content-type 
serve SHTML files with HTML MIME type
 2015-12-17 11:05:34 -08:00
James B. Pollack
5cc5a2ab33 working non kinematic release 2015-12-17 10:58:14 -08:00
Stephen Birarda
08f42c08d9 use a ternary for single assignment 2015-12-17 10:54:32 -08:00
ericrius1
d4481818b2 lightsaber oriented right 2015-12-17 10:50:58 -08:00
Stephen Birarda
286b984d6f serve SHTML files with HTML MIME type 2015-12-17 10:48:33 -08:00
ericrius1
57e51afd46 light stick 2015-12-17 10:35:20 -08:00
samcake
927cdc0880 Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr 2015-12-17 10:30:04 -08:00
samcake
593f74aa99 Merge pull request #6682 from samcake/graphicsMaster 
Graphics: merging upstream master into upstream graphics
 2015-12-17 10:27:30 -08:00
James B. Pollack
cd911b31d2 dont accidentally constrain all objects 2015-12-17 10:26:54 -08:00
ericrius1
f7811cf5dc light trails from rave stick 2015-12-17 10:25:51 -08:00
samcake
d8a71db929 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-17 10:11:03 -08:00
James B. Pollack
ba1f4506c2 Merge branch 'master' into light_mod 2015-12-17 10:11:03 -08:00
samcake
8d4d0d4e9a FIxing the bad returned value per reference 2015-12-17 10:08:40 -08:00
ericrius1
064c05e98c light trails 2015-12-17 10:04:51 -08:00