Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-16 13:16:50 +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
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
James B. Pollack
b59b8db5c9 set defaults 2015-12-21 12:09:18 -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
samcake
aef748b894 Adding linear color in Particule system 2015-12-21 10:40:29 -08:00
Anthony J. Thibault
dcde640acd Stub Perception Neuron input plugin 2015-12-21 10:06:36 -08:00
Brad Davis
46a4a469e9 Merge pull request #6689 from ZappoMan/rightClickMenu 
Some early work to support hand driven reticle
 2015-12-20 17:49:50 -08:00
James B. Pollack
da57e29096 start options, cleanup 2015-12-20 16:40:41 -08:00
Seth Alves
d71cecbc61 Merge pull request #6675 from AndrewMeadows/crash-fix 
fix crash when visiting new domain with gun in hand
 2015-12-20 06:24:44 -08:00
James B. Pollack
485bb4ee3f slider should stay with avatr 2015-12-19 19:14:56 -08:00
James B. Pollack
daa262af7d readme 2015-12-19 19:14:19 -08:00
James B. Pollack
9f0d254739 panel entity, readme 2015-12-19 19:11:17 -08:00
James B. Pollack
05467bd5e1 create panel entity and parent panel to it 2015-12-19 18:19:00 -08:00
Brad Hefta-Gaub
ae04556f45 Merge pull request #6708 from sethalves/fix-entity-server-crash 
fix entity-server crash
 2015-12-19 16:13:24 -08:00
James B. Pollack
378d50d8a3 update overlays when cutoff slider is used 2015-12-19 12:49:42 -08:00
James B. Pollack
eb03dcd821 keep parent of lights that already have parents 2015-12-19 12:47:44 -08:00
James B. Pollack
890f98b38b Merge branch 'master' into light_mod 2015-12-19 12:23:23 -08:00
samcake
8f63a7ae11 Merge pull request #6710 from samcake/graphicsMaster 
Graphics: merge upstream master to upstream graphics
 2015-12-19 11:40:22 -08:00
samcake
1e8e3fec87 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-19 11:38:20 -08:00
Seth Alves
9271209d89 another 2015-12-19 08:13:53 -08:00
Seth Alves
8b9de716f1 fix bad pointer juju 2015-12-19 08:08:10 -08:00
Brad Hefta-Gaub
e929e3f789 more work on angular velocity tests 2015-12-18 19:20:32 -08:00
Brad Hefta-Gaub
f55445bb88 Merge pull request #6707 from jherico/webengine 
Fixing QML based web view crash.
 2015-12-18 18:19:36 -08:00
ericrius1
1beec0dbe7 balls 2015-12-18 18:15:05 -08:00
Brad Davis
ae6cf131f5 Fixing crash bug 2015-12-18 17:19:06 -08:00
Brad Davis
6098c4a1d6 Revert "Revert "Migrate QML based web views to Qt WebEngine"" 
This reverts commit 1f3adeb666.
 2015-12-18 17:18:46 -08:00
samcake
4e1a812ff3 Merge pull request #6706 from samcake/graphicsMaster 
Graphics: apply upstream master revert
 2015-12-18 17:15:54 -08:00
samcake
7e66515beb Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-18 17:13:48 -08:00
Brad Davis
baf2d5acb7 Merge pull request #6705 from highfidelity/revert-6651-webengine 
Revert "Migrate QML based web views to Qt WebEngine"
 2015-12-18 17:09:44 -08:00
Brad Davis
1f3adeb666 Revert "Migrate QML based web views to Qt WebEngine" 2015-12-18 17:09:38 -08:00
James B. Pollack
b0da1773c2 have right rotation on sequential edits 2015-12-18 16:53:41 -08:00
James B. Pollack
4afdd0242b cleanup 2015-12-18 16:44:20 -08:00
James B. Pollack
f834765990 readme 2015-12-18 16:39:21 -08:00
James B. Pollack
e405311cc8 cleanup 2015-12-18 16:35:06 -08:00