Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 03:23:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
40070 commits 76 branches 59 tags 1.2 GiB
Commit graph

40070 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
c95d1f68f6 remove debug print 2016-03-06 14:38:03 -08:00
Seth Alves
b6a478d970 Merge branch 'master' of github.com:highfidelity/hifi into fix-hulls-for-non-default-registration 2016-03-06 14:35:38 -08:00
Seth Alves
5c585acd9a offset is included in shape key for models 2016-03-06 14:29:30 -08:00
Seth Alves
dcb720a832 fix polyvox hull when registration changes. 2016-03-06 14:09:45 -08:00
Brad Hefta-Gaub
78b608b970 Merge pull request #7225 from PhilipRosedale/hydraReticle 
Hand controller drives mouse, does not take over if set down
 2016-03-06 13:33:02 -08:00
Seth Alves
59804a0f54 cleanups 2016-03-06 12:59:41 -08:00
Seth Alves
5241dc5394 this seems to be working now. more cleanups to come 2016-03-06 12:59:33 -08:00
Seth Alves
f03ddb856b Merge branch 'master' of github.com:highfidelity/hifi into fix-hulls-for-non-default-registration 2016-03-05 09:54:38 -08:00
Seth Alves
8bc2c76a8b change shape-key when registration point changes so shape cache doesn't incorrectly reuse the old shape 2016-03-05 08:01:30 -08:00
Brad Hefta-Gaub
b0decbee18 Merge pull request #7229 from kencooke/master 
New audio peak limiter library.
 2016-03-04 17:25:46 -08:00
Ken Cooke
d390c60ef7 CR feedback 2016-03-04 17:11:44 -08:00
Seth Alves
9346171695 if entity registration isn't default, adjust physics shapes to match 2016-03-04 16:47:30 -08:00
PhilipRosedale
87e7dd9ce3 add vive button mapping 2016-03-04 16:16:05 -08:00
Brad Davis
7728ef0258 Merge pull request #7242 from ZappoMan/hackathonLightening 
example of a rainy day/night zone
 2016-03-04 15:56:02 -08:00
Brad Hefta-Gaub
6d56a0d051 more CR feedback 2016-03-04 15:55:08 -08:00
Brad Hefta-Gaub
2b4d206eca more CR feedback 2016-03-04 15:54:28 -08:00
Philip Rosedale
ee3e0fcc38 Merge pull request #7238 from hyperlogic/tony/hmd-follow-work 
MyAvatar: Improved body recentering for room scale
 2016-03-04 15:51:07 -08:00
Brad Hefta-Gaub
e776bf5819 CR feedback 2016-03-04 15:47:50 -08:00
Brad Hefta-Gaub
d8e7c60ce0 CR feedback 2016-03-04 15:47:25 -08:00
Brad Hefta-Gaub
3f85daf276 Merge branch 'master' of https://github.com/highfidelity/hifi into hackathonLightening 2016-03-04 15:31:32 -08:00
Anthony Thibault
0de19d13c4 MyAvatar: open up horizontal leaning threshold 2016-03-04 15:28:38 -08:00
Brad Hefta-Gaub
30bcb04a2f Merge pull request #7149 from jherico/overlays_qml 
Make Overlay API usable from QML
 2016-03-04 15:00:45 -08:00
Philip Rosedale
cb8e2b7018 Merge pull request #7246 from AndrewMeadows/stable-ik 
recover stability of arm IK
 2016-03-04 14:38:59 -08:00
Brad Davis
a1b286302f Merge pull request #7237 from birarda/domain-over-connect 
re-use the node with same sockets during failed domain connection
 2016-03-04 14:37:39 -08:00
Brad Davis
3aec9f8e8e Merge pull request #7244 from Atlante45/feat/hackaton 
Flappy avatars
 2016-03-04 14:34:07 -08:00
Brad Davis
468cb05571 Merge pull request #7231 from ctrlaltdavid/20812 
Restyle settings dialogs
 2016-03-04 14:33:21 -08:00
David Rowe
b4c489d4c6 Fix not reliably being able to select "None" in Graphics settings 2016-03-05 10:17:39 +13:00
Atlante45
3a5165ab66 Add json import for game entity 2016-03-04 11:54:03 -08:00
Atlante45
ab5a29b076 Bit of cleanup 2016-03-04 11:50:12 -08:00
Anthony Thibault
37ba0ecd9f MyAvatar: prevent face from being visible when crouching 
Overall, this should fix many of the issues with the head being visible when it shouldn't.
 2016-03-04 11:48:55 -08:00
Brad Davis
2f89253dc1 Make Overlays usable from QML 2016-03-04 11:35:54 -08:00
PhilipRosedale
e01524abbe fix for clicking 2016-03-04 11:24:35 -08:00
Anthony J. Thibault
dc456cbdbe MyAvatar: dropped vertical recenter limit. 2016-03-04 11:15:11 -08:00
Andrew Meadows
9bf4a30a23 fix typo in example script 2016-03-04 10:57:06 -08:00
Andrew Meadows
c06d76f7f0 remove twist constraints on hands 
also tighten swing limit on shoulder
 2016-03-04 10:56:29 -08:00
Atlante45
f62a3ed8f6 Remove tabs 2016-03-04 10:46:30 -08:00
Ryan Huffman
f21815e332 Merge pull request #7245 from birarda/domain-security 
manually install OpenSSL DLLs for Qt
 2016-03-04 09:23:21 -08:00
Brad Hefta-Gaub
5b2c3b4b26 Merge pull request #7243 from thoys/20821 
CR for Job #20821 - Remove stray tray icon
 2016-03-03 18:10:56 -08:00
Stephen Birarda
3750d5d780 manually install OpenSSL DLLs for Qt 2016-03-03 17:57:34 -08:00
Atlante45
0364703f86 Move script to toybox 2016-03-03 17:29:11 -08:00
Brad Hefta-Gaub
7bb87305d4 Merge pull request #7234 from zzmp/fix/line3d-back-cull 
Render line3d without backface culling
 2016-03-03 17:16:54 -08:00
Brad Hefta-Gaub
0d48803761 Merge pull request #7236 from howard-stearns/entity-script-safety 
entity script safety
 2016-03-03 17:16:30 -08:00
Atlante45
10d55666f2 Changed coin value 2016-03-03 12:23:50 -08:00
Atlante45
b00ff7a81c Display score and save high scores 2016-03-03 12:19:01 -08:00
Atlante45
d1f7cf6387 Added freeze on loss and points architecture 2016-03-03 10:51:37 -08:00
Thijs Wenker
17f0688db5 removed stray traybar icon 2016-03-03 19:18:47 +01:00
Atlante45
442bd22f46 New sounds + coins!!! 2016-03-03 09:56:11 -08:00
Atlante45
f582222389 Couple additional features 2016-03-03 03:24:12 -08:00
Brad Hefta-Gaub
a752f55deb example of a rainy day/night zone 2016-03-03 02:25:41 -08:00
Atlante45
d5d5eaaf9c Fix cooldown 2016-03-02 23:42:27 -08:00