Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-30 12:22:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
32492 commits 71 branches 56 tags 1.2 GiB
Commit graph

32492 commits

This branch
This branch
All branches
Author SHA1 Message Date
ericrius1
407b6b8158 Fixed bug in spray paint where sometimes would not spray 2015-10-01 16:10:29 -07:00
ericrius1
0fb51a6777 got rid of unneeded light test code 2015-10-01 15:56:16 -07:00
ericrius1
cdb249c6ff original master script 2015-10-01 15:53:28 -07:00
ericrius1
25e25726d5 only lights 2015-10-01 15:43:25 -07:00
ericrius1
55c6b9d9c4 Added collision sound to blocks 2015-10-01 14:57:03 -07:00
ericrius1
5aef7475d6 Sound position updates every frame based on new position of can 2015-10-01 14:42:51 -07:00
ericrius1
c03a9ddd58 Added fire to master script 2015-09-30 11:14:18 -07:00
ericrius1
2b84c90f9d merged master hand controller 2015-09-30 10:18:13 -07:00
Brad Davis
9453e5cb1b Merge pull request #5947 from ZappoMan/hideHandCursors 
only show hand cursors when menu is enabled
 2015-09-30 09:43:40 -07:00
Brad Hefta-Gaub
76825c2be7 only show hand cursors when menu is enabled 2015-09-30 09:06:45 -07:00
Leonardo Murillo
054a3728de Merge pull request #5945 from kencooke/master 
Create symbol files on Windows release builds
 2015-09-30 09:46:16 -06:00
Ken Cooke
de8848f7bc Fix to only pass --release to windeployqt on release builds 2015-09-30 08:11:16 -07:00
Ken Cooke
4dc2c9a58f Create symbol files on Windows release builds. Added --release to windeployqt.exe, otherwise it gets confused and copies debug DLLs instead of release. 2015-09-29 18:42:52 -07:00
ericrius1
00cab85a11 Removed whiteboard from reset script 2015-09-29 18:33:31 -07:00
ericrius1
259391a40b Merge branch 'toybox' of https://github.com/ericrius1/hifi into toybox 2015-09-29 18:32:56 -07:00
ericrius1
ba17225c19 Remove hand control script from PR 2015-09-29 18:32:52 -07:00
Ryan Huffman
b4ca03ac3f Merge pull request #5940 from ericrius1/polyLineFix 
Made polyline painting experience smoother- no more flickering
 2015-09-29 18:22:01 -07:00
ericrius1
1760720b2b added check for normals and vertices 2015-09-29 17:42:20 -07:00
Eric Levin
68615e171a Update masterResetEntity.js 2015-09-29 17:40:05 -07:00
ericrius1
5ce3b13a4c Fixed spacing issues 2015-09-29 17:31:02 -07:00
ericrius1
5c6f8198f3 Merge remote-tracking branch 'origin/polyLineFix' into polyLineFix 
Conflicts:
	libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
 2015-09-29 16:39:21 -07:00
ericrius1
d1b016b483 untabbified lines 2015-09-29 16:38:21 -07:00
Eric Levin
c901a749c2 Update RenderablePolyLineEntityItem.cpp 2015-09-29 16:33:18 -07:00
Eric Levin
614312f04f Update PolyLineEntityItem.cpp 2015-09-29 16:32:07 -07:00
Eric Levin
36be35a836 Update RenderablePolyLineEntityItem.cpp 2015-09-29 16:30:42 -07:00
Brad Davis
166d267022 Merge pull request #5942 from ZappoMan/flickeringLightScript 
Change the update rate of the flickering light to 30hz
 2015-09-29 16:20:24 -07:00
Seth Alves
58d98d3ce4 Merge pull request #5932 from howard-stearns/default-animation-and-quieter 
Set default animation and quiet state logging
 2015-09-29 16:12:28 -07:00
Andrew Meadows
ddbdf2be86 Merge pull request #5943 from sethalves/no-avatar-collision-with-held 
rearrange when grab script changes avatar collisions
 2015-09-29 15:56:11 -07:00
Seth Alves
472ff89f48 rearrange when avatar collisions are adjusted 2015-09-29 15:52:38 -07:00
Brad Hefta-Gaub
67823b79d5 change additional lifetime to 60 seconds to avoid processing hiccups 2015-09-29 15:48:46 -07:00
Andrew Meadows
d7dee2abe8 Merge pull request #5939 from sethalves/no-avatar-collision-with-held 
Do Not Merge -- No avatar collision with held entites
 2015-09-29 15:48:34 -07:00
Brad Hefta-Gaub
90afeb4ce1 more debugging 2015-09-29 15:45:29 -07:00
ericrius1
d8e7da7b73 added painting to whiteboard 2015-09-29 15:43:59 -07:00
ericrius1
648fb7cb8c Merge branch 'master' into toybox 2015-09-29 15:40:46 -07:00
ericrius1
e7834365f5 Made polyline painting experience smoother- no more flickering 2015-09-29 15:33:39 -07:00
Seth Alves
8f2f14c9e5 keep track of state of avatar-collisions menu-item with global variables rather than per object ones 2015-09-29 15:30:24 -07:00
Seth Alves
2ba686ed89 cleanups 2015-09-29 15:11:52 -07:00
Seth Alves
d554eb8db9 avatar collisions are off during a grab 2015-09-29 15:09:25 -07:00
Brad Hefta-Gaub
04115052b3 Merge pull request #5938 from samcake/calvin 
Fixing the lighting view matrix for stereo again
 2015-09-29 15:08:41 -07:00
Brad Hefta-Gaub
f83eae4d42 more debugging 2015-09-29 14:45:24 -07:00
samcake
1bd07b58c3 Fixing the lighting view matrix for stereo again 2015-09-29 14:40:37 -07:00
Seth Alves
b1a133e55c working on disabling avatar collisions during grab 2015-09-29 14:38:47 -07:00
Brad Hefta-Gaub
07515ce710 Merge pull request #5918 from PhilipRosedale/master 
Throw held objects with velocity from fingertip
 2015-09-29 14:37:44 -07:00
unknown
006650f23b Fix for PR comments 2015-09-29 14:34:23 -07:00
James B. Pollack
bbc32cdd1e Merge pull request #5937 from ericrius1/grabFix 
releaseGrab event now triggered for non physical entities
 2015-09-29 14:25:59 -07:00
Brad Hefta-Gaub
00c32fc7cd Merge pull request #5924 from jherico/marge 
Support for accessing IPD in scripts
 2015-09-29 14:24:53 -07:00
Seth Alves
8c98ab9eb6 Merge pull request #5933 from howard-stearns/quiet-other-default-avatars 
Quiet once/second logging/updating of other people's default avatars.
 2015-09-29 14:24:18 -07:00
Brad Davis
9b13aac37d PR comments 2015-09-29 14:23:56 -07:00
ericrius1
7681d8d77d fixed commenting 2015-09-29 14:05:57 -07:00
ericrius1
644687f330 releaseGrab event now triggered for non physical entities 2015-09-29 14:04:03 -07:00