Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-12 16:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
58941 commits 68 branches 56 tags 1.2 GiB
Commit graph

58941 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cain Kilgore
794f3ca69f Indentation 2017-09-15 06:09:03 +01:00
Cain Kilgore
67a5c75a0d Doesn't need to be here anymore 2017-09-15 06:08:22 +01:00
Cain Kilgore
e86b37f949 Added script for testing 2017-09-15 06:07:50 +01:00
Cain Kilgore
0526d32802 Merge branch 'master' of https://github.com/highfidelity/hifi into 21542 2017-09-15 06:05:43 +01:00
Cain Kilgore
c2e342ddac Gravity Implementation 2017-09-15 06:03:56 +01:00
Thijs Wenker
9f61e7471c Merge pull request #11365 from thoys/feat/cloneAvatarEntities 
Clone local avatar entities
 2017-09-15 04:51:18 +02:00
Chris Collins
cfec2a29ae Merge pull request #11314 from jherico/polyline_crash 
Fix polyline crash and flicker
 2017-09-14 15:42:49 -07:00
Thijs Wenker
af4bc59307 clone local avatar entities 2017-09-14 23:31:51 +02:00
Seth Alves
10494cf3e0 Merge pull request #11359 from vladest/fix_runningscripts_selection 
use selection model of TreeView
 2017-09-14 11:22:08 -07:00
Seth Alves
11df5a447e Merge pull request #11310 from ElderOrb/case6718 
6718 PR11082: Help text cannot be dismissed by clicking on the text i…
 2017-09-14 11:17:48 -07:00
Brad Davis
aef85eb69d Fix polyline rendering using default texture 2017-09-14 10:48:14 -07:00
Seth Alves
dbaf60a957 Merge pull request #11363 from ElderOrb/lint-fix 
add missing comma
 2017-09-14 09:10:14 -07:00
beholder
61c5395f44 add missing comma 2017-09-14 18:48:43 +03:00
Brad Davis
501eee8b10 Fix transform of polylines with high update rates 2017-09-14 08:45:37 -07:00
Brad Davis
75e7146c5b Fix polyline crash and flicker 2017-09-14 08:45:36 -07:00
Thijs Wenker
523d099f70 Merge pull request #11355 from jherico/crash/zone-keylight 
Fix race condition accessing QString sub-properties in zones
 2017-09-14 16:03:05 +02:00
Thijs Wenker
ddb4b2d2be Merge pull request #11354 from hyperlogic/bug-fix/good-riddance 
Remove handControllerGrab.js, see controllerDispatcher.js instead.
 2017-09-14 15:42:30 +02:00
vladest
7233c47257 use selection model of TreeView 2017-09-14 15:36:12 +02:00
Brad Davis
f4d8216501 Fix race condition accessing QString sub-properties in zones 2017-09-13 18:06:21 -07:00
Anthony J. Thibault
745d2ff395 Remove handControllerGrab.js, see controllerDispatcher.js instead. 2017-09-13 17:36:56 -07:00
anshuman64
d3dbd431d6 Merge pull request #11279 from druiz17/controller-dispatcher-1 
handControllerGrab Refactor -> controllerDispatcher
 2017-09-13 16:56:57 -07:00
Cain Kilgore
f741083352 Merge branch 'master' of https://github.com/highfidelity/hifi into 21542 2017-09-14 00:25:53 +01:00
Cain Kilgore
72ca62c4af Initial Commit - more to do. 2017-09-14 00:25:11 +01:00
druiz17
1b288ef860 make garbbing radius the same as master 2017-09-13 16:15:36 -07:00
druiz17
310dbce65d fixed merge conflict 2017-09-13 15:55:04 -07:00
Chris Collins
84998a3360 Merge pull request #11351 from Atlante45/new-master 
Update master from stable
 2017-09-13 14:28:44 -07:00
Atlante45
d3966ce8c2 Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2017-09-13 13:14:25 -07:00
Melissa Brown
49ab8af428 Merge pull request #11344 from Menithal/21536 
21536: Clap App!
 2017-09-13 12:54:31 -07:00
Menithal
59746c564b 21536: Applied forgotten beutify to file 2017-09-13 21:24:24 +03:00
David Kelly
030b39050a Merge pull request #11343 from davidkelly/dk/oneFileWallet 
Wallet updates
 2017-09-13 11:15:03 -07:00
Chris Collins
1b608a7d35 Merge pull request #11315 from highfidelity/RC-54 
Beta Release 54 - Includes up to Developer Release 7078
 2017-09-13 10:36:28 -07:00
David Kelly
bce92a622e cr feedback 2017-09-13 09:45:02 -07:00
Andrew Meadows
50b94887fa Merge pull request #11339 from ElderOrb/case7469 
7469 Mouse Pointer Depth is Incorrect in HMD Mode
 2017-09-13 08:33:09 -07:00
Andrew Meadows
5741699bab Merge pull request #11301 from Menithal/21484-Fix 
WL21484 _- Hotfix - Solve Joint array issues with Similar, but not same Skeletons
 2017-09-13 08:05:53 -07:00
David Kelly
7550374f8f Merge branch 'master' of https://github.com/highfidelity/hifi into dk/oneFileWallet 2017-09-13 04:49:13 -07:00
druiz17
b3ff5c86f7 fixed secondary triggers and chest lid 2017-09-12 14:43:06 -07:00
druiz17
0b360f455c Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-12 14:38:07 -07:00
Dante Ruiz
bf32f65efe Merge pull request #11341 from vladest/flickable_off 
Flickable off
 2017-09-12 13:09:06 -07:00
Menithal
40beb4bca8 Some minor tweaks 2017-09-12 22:12:30 +03:00
Chris Collins
bb26cf2179 Merge pull request #11342 from Atlante45/RC-54 
Fix RC-54 conflict with stable
 2017-09-12 11:48:13 -07:00
Menithal
79603765c4 Removed unused check 2017-09-12 21:40:15 +03:00
Menithal
5aab3f3cf3 Switched from marketplace links to local 2017-09-12 21:24:14 +03:00
Menithal
ca2d22a192 Updated Scripts 2017-09-12 21:22:40 +03:00
David Kelly
187ed71a8a more cleanup, plus now keyfile associated with user directly 2017-09-12 10:55:27 -07:00
Dante Ruiz
d90f6320a9 Merge pull request #8 from sethalves/controller-dispatcher-1 
Controller dispatcher 1
 2017-09-12 10:54:10 -07:00
Atlante45
c170cc2eb1 Merge branch 'stable' of https://github.com/highfidelity/hifi into RC-54 2017-09-12 10:53:04 -07:00
druiz17
b634292261 fixing some small issues 2017-09-12 10:53:04 -07:00
Seth Alves
e9918ca599 add profiling to controller-dispatcher 2017-09-12 10:52:52 -07:00
Seth Alves
a9aa6df93e Merge branch 'controller-dispatcher-1' of github.com:sethalves/hifi into controller-dispatcher-1 2017-09-12 10:44:29 -07:00
Seth Alves
315f874824 add profiling to controller-dispatcher 2017-09-12 10:44:09 -07:00