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

36548 commits

This branch
This branch
All branches
Author SHA1 Message Date
ericrius1
bb28369dee Merge branch 'polylineOptimizations' of https://github.com/ericrius1/hifi into polylineOptimizations 2015-12-22 11:49:31 -08:00
Eric Levin
e8803ad9ae Lightsaber looks way better now 2015-12-22 11:35:04 -08:00
Eric Levin
653e3ecdcc fixed offset issue with lightsaber 2015-12-22 11:02:36 -08:00
ericrius1
fdb909ca31 merged 2015-12-22 09:40:42 -08:00
Brad Davis
7fdeb66cf4 Merge pull request #6723 from ZappoMan/macHydraCrash 
fix crash on mac when sixense DLL can't be loaded
 2015-12-22 09:32:23 -08:00
Brad Hefta-Gaub
eff830ad4b fix crash on mac when sixense DLL can't be loaded 2015-12-22 01:03:23 -08:00
ericrius1
1031489ada changed dates 2015-12-21 19:08:34 -08:00
ericrius1
ba993eccd4 cleanup 2015-12-21 18:32:07 -08:00
ericrius1
8d80c06f02 updated ravestick model 2015-12-21 18:26:28 -08:00
Brad Hefta-Gaub
3dfc48e205 Merge pull request #6687 from jherico/marketplace 
Support the marketplace in QML
 2015-12-21 17:55:55 -08:00
Brad Davis
fc4ece5671 Merge pull request #6719 from ZappoMan/rightClickMenu 
fix reticle drive
 2015-12-21 17:11:48 -08:00
Brad Hefta-Gaub
da86686533 fix reticle drive 2015-12-21 17:10:01 -08:00
samcake
757e94ed98 Merge pull request #6715 from zzmp/refactor/scene-render-js 
Clean up interfaces for JS Scene/Render
 2015-12-21 16:50:41 -08:00
Brad Hefta-Gaub
ce426f0144 Merge pull request #6695 from birarda/qxmpp-deletion 
remove an unused qxmpp external
 2015-12-21 16:49:04 -08:00
Brad Davis
95c524fba1 Fixing authentication token for followed links 2015-12-21 15:44:35 -08:00
Zach Pomerantz
4df8fa4ac3 Create Render/Scene unique_ptr without C++14 make_unique 2015-12-21 15:39:49 -08:00
Zach Pomerantz
f146b207c4 Update JS debug scripts to use nested props 2015-12-21 15:27:37 -08:00
Brad Hefta-Gaub
e527bfd645 Merge pull request #6717 from birarda/collision-verbose-debug 
remove extra audio injector debug
 2015-12-21 15:26:59 -08:00
Stephen Birarda
ba89c8a97a remove some extra debug that isn't needed 2015-12-21 16:23:23 -07:00
Ryan Huffman
f5f0829216 Merge pull request #6716 from birarda/master 
fix for stop of a nullptr QTimer
 2015-12-21 15:21:42 -08:00
ericrius1
f19d1a3067 cleanup 2015-12-21 15:20:36 -08:00
Stephen Birarda
8c6449a886 fix for stopping a nullptr QTimer 2015-12-21 16:20:06 -07:00
Zach Pomerantz
d8022aa5b0 Add back deferred debugging and combine context init 2015-12-21 14:32:06 -08:00
Zach Pomerantz
c6a2f5b20d Nest JS props in RenderScriptingInterface 2015-12-21 14:32:06 -08:00
Zach Pomerantz
5a86f0c23f Nest JS props in SceneScriptingInterface 2015-12-21 14:32:06 -08:00
ericrius1
876d8ab6b2 far grabbing arc balls 2015-12-21 13:59:00 -08:00
Brad Hefta-Gaub
111a8caa3c Merge pull request #6701 from highfidelity/graphics 
Graphics merge into Master: Adding Gamma correction, Tone Mapping and Debugging tool
 2015-12-21 13:54:50 -08:00
ericrius1
cabc47e7a9 lightsaber immediately turns off on release 2015-12-21 13:30:52 -08:00
ericrius1
4110630d1f fixed ravestick fargrab 2015-12-21 13:15:37 -08:00
ericrius1
1cdee11784 Merge branch 'master' into polylineOptimizations 2015-12-21 12:49:00 -08:00
ericrius1
4b4fe96b64 tweaks 2015-12-21 12:47:31 -08:00
Brad Davis
491d2fe95e Merge pull request #6713 from ZappoMan/rightClickMenu 
add absolute rotation based hand reticle movement
 2015-12-21 12:45:50 -08:00
Brad Davis
e3ab230638 Merge pull request #6711 from samcake/hdr 
Graphics : Fix procedural Shader Gamma and Adding color linear getters in Particle system
 2015-12-21 12:22:14 -08:00
Brad Hefta-Gaub
b69892eb9b Merge pull request #6714 from jherico/qml_dep_fix 
Remove script -> qt::webchannel dependency
 2015-12-21 12:10:38 -08:00
samcake
4f54b85c92 Remove warnings 2015-12-21 12:05:19 -08:00
samcake
ae124ebede Tuning the proedural shader support to work with the current default: gamma corrected emissive 2015-12-21 12:00:30 -08:00
ericrius1
b89e25f8f7 correct file 2015-12-21 11:35:57 -08:00
Brad Davis
6ef77bc46a Support the marketplace in QML 2015-12-21 11:34:03 -08:00
ericrius1
ba3633710a name fixes 2015-12-21 11:29:59 -08:00
samcake
492572df45 Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr 2015-12-21 11:26:15 -08:00
samcake
1f6466f107 Merge pull request #6712 from samcake/graphicsMaster 
Graphics: Merge upstream master into upstream graphics
 2015-12-21 11:24:07 -08:00
Brad Davis
05b7fcc957 Remove script -> qt::webchannel dependency 2015-12-21 11:19:05 -08:00
ericrius1
3c66e38268 test 2015-12-21 11:12:59 -08:00
ericrius1
48ab99c348 rotation fix 2015-12-21 11:00:10 -08:00
Brad Hefta-Gaub
248b3d09ac add absolute rotation based hand reticle movement 2015-12-21 10:49:49 -08:00
samcake
6bbc94badc Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-21 10:48:55 -08:00
ericrius1
45ba7a3d35 merged 2015-12-21 10:46:54 -08:00
ericrius1
0dd7287e61 mergedq 2015-12-21 10:46:45 -08:00
ericrius1
7a7befafb9 arc balls working 2015-12-21 10:43:59 -08:00
samcake
4c2d5c54c4 Merge branch 'hdr' of https://github.com/samcake/hifi into hdr 2015-12-21 10:43:41 -08:00