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

32743 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
94b0e36f0e Merge pull request #5948 from sethalves/debug-grab 
script to display entity-action details in an overlay
 2015-09-30 10:43:05 -07:00
Seth Alves
96d0df49e4 script to display entity-action details in an overlay 2015-09-30 10:41:39 -07:00
James Pollack
c3dfea4712 initial files 2015-09-30 10:26:24 -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
Sam Gateau
e78f1521ab getting the stencil buffer in place 2015-09-30 09:24:36 -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
James B. Pollack
cbeeb62c32 Merge remote-tracking branch 'upstream/master' 2015-09-29 21:34:39 -07:00
James B. Pollack
402fd44cff header file cleanup 2015-09-29 21:27:55 -07:00
James B. Pollack
80a457eb14 cleanup the main.js file for distribution 2015-09-29 19:47:00 -07:00
James B. Pollack
47b410df93 version 0.1 of particle explorer for distribution 2015-09-29 19:44:15 -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
Sam Gateau
21c7b292bb Merge branch 'calvin' of https://github.com/samcake/hifi into calvin 2015-09-29 18:31:01 -07:00
samcake
dc3c9b48ea MOving forward on the background beeing drawn last 2015-09-29 18:28:20 -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
James Pollack
d4cc3994f4 add some 2 way bindings for settings sanity check 2015-09-29 17:47:41 -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
Andrew Meadows
b192d0a9cd make neck IK target type same as head 2015-09-29 17:39:17 -07:00
ericrius1
5ce3b13a4c Fixed spacing issues 2015-09-29 17:31:02 -07:00
James Pollack
d0f20bfa63 working particle explorer w00t! 2015-09-29 17:01:10 -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
Anthony J. Thibault
5e2279ed4b AnimManipulator: Don't read defaultAbsPose.trans anim var. 
At the moment the manipulator only supports rotations.
 2015-09-29 16:37:43 -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
Andrew Meadows
a052f5e125 remove commented out debug line 2015-09-29 16:21:08 -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
cdae16e07b fix bug: IK attenuates fast underpose animations 2015-09-29 16:11:27 -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
David Rowe
e2bee8ec08 Fix particle radius, color, and alpha starts/finishes 2015-09-29 15:40:46 -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