Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-08 04:28:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
32492 commits 69 branches 58 tags 1.2 GiB
Commit graph

32492 commits

This branch
This branch
All branches
Author SHA1 Message Date
James B. Pollack
8a7798fcd7 disable bubble particle burst until i know the right for an entity to watch and see if it is deleted. 2015-09-17 22:00:44 -07:00
Brad Hefta-Gaub
0811da14b8 use new feature for getEntityUserData 2015-09-17 21:14:07 -07:00
David Rowe
f647dcf147 Change emitter radiuses to dimensions to match sphere properties 2015-09-17 21:06:40 -07:00
Brad Hefta-Gaub
d0a4622427 removed some debug code 2015-09-17 21:01:56 -07:00
James B. Pollack
5ac084ad4f Randomize bubble gravity, code cleanup 2015-09-17 20:57:07 -07:00
Brad Hefta-Gaub
45c34e1617 only copy properties to the script values for properties that our type actually has 2015-09-17 20:55:19 -07:00
Brad Hefta-Gaub
7f9a6d7b8e whitespace fixes 2015-09-17 20:26:50 -07:00
Brad Hefta-Gaub
6de424237f add support for property groups in the desired properties logic 2015-09-17 20:24:15 -07:00
Brad Hefta-Gaub
ec86394556 Merge pull request #5835 from hyperlogic/tony/vive-eye-offset-fix 
Fix for getEyePose in OpenVRDisplayPlugin
 2015-09-17 20:22:10 -07:00
Brad Hefta-Gaub
08babecb75 add support for mapping EntityPropertyFlags to QScriptValues and wire in desiredProps 2015-09-17 19:51:21 -07:00
James B. Pollack
3ce1661c36 Merge remote-tracking branch 'highfidelity/master' 2015-09-17 19:38:53 -07:00
Anthony Thibault
493819c013 Merge pull request #5834 from AndrewMeadows/ik-repairs-001 
route hand data directly to new anim system
 2015-09-17 17:49:05 -07:00
Brad Hefta-Gaub
b16dfb8a9e whitespace repair 2015-09-17 17:41:54 -07:00
Brad Hefta-Gaub
81255c8379 whitespace repair 2015-09-17 17:40:41 -07:00
Brad Hefta-Gaub
4e2cb00ec3 first cut at only returning type specific properties in getEntityProperties 2015-09-17 17:33:53 -07:00
Shared Vive Room
4459708b0e Fix for getEyePose in OpenVRDisplayPlugin 2015-09-17 17:16:12 -07:00
ericrius1
ae795a5c4f spray paint spawner working 2015-09-17 17:15:59 -07:00
David Rowe
12e2cf3ce9 Emit in all directions from a point or the surface of a spheroid 2015-09-17 17:14:35 -07:00
ericrius1
78642e3c79 Getting rid of managers 2015-09-17 17:04:09 -07:00
Brad Hefta-Gaub
3deaa68b7b Merge pull request #5832 from samcake/HMDLightingBug 
Fix the lighting issue when the Rear View mirror is enabled
 2015-09-17 16:46:56 -07:00
ericrius1
5f12a5c85a Merge branch 'master' into toybox 2015-09-17 16:13:10 -07:00
ericrius1
9614a69b19 adding spray can 2015-09-17 16:12:16 -07:00
Andrew Meadows
4505d5999c route hand data differently for new Anim system 2015-09-17 16:04:00 -07:00
Andrew Meadows
9746d31f5e notes for moving hand updates 2015-09-17 16:04:00 -07:00
James B. Pollack
df0b9e7dbb refactor bubble wand to prevent duplicate bubbles 2015-09-17 15:59:19 -07:00
ericrius1
109f2d8a1a base positions 2015-09-17 15:39:31 -07:00
ericrius1
75c1e49567 more tweaks 
yeah
 2015-09-17 15:32:40 -07:00
Ryan Huffman
d0acd74861 Merge pull request #5833 from birarda/master 
fix for some locking races in SendQueue/Connection cleanup
 2015-09-17 15:04:52 -07:00
Stephen Birarda
285a6cc738 use erase directly for cleanupConnection 2015-09-17 14:51:48 -07:00
Howard Stearns
fb71a85bb8 Merge pull request #5831 from hyperlogic/tony/anim-qstring 
AnimGraph: prefer QString over std::string
 2015-09-17 14:36:39 -07:00
ericrius1
cdae5452ce going ac script route for entity reset 2015-09-17 14:21:11 -07:00
Stephen Birarda
a914ec82c3 more comment correctness for Socket 2015-09-17 14:17:43 -07:00
Stephen Birarda
1f9bb22b9e fix some wording in Socket comment 2015-09-17 14:17:03 -07:00
Stephen Birarda
36e2d4fc76 add check for NotStarted state in PL queue 2015-09-17 14:16:03 -07:00
Stephen Birarda
320429fd1e Merge branch 'master' of https://github.com/highfidelity/hifi 2015-09-17 14:15:05 -07:00
Stephen Birarda
4758dd2a53 correct locking races in SendQueue/Connection cleanup 2015-09-17 14:13:24 -07:00
Sam Gateau
b207d97f72 Fix the lighting when the rear view mirror is showing up 2015-09-17 12:28:17 -07:00
Brad Hefta-Gaub
58e0625192 Merge pull request #5824 from jherico/marge 
Debug Oculus plugin for performance testing
 2015-09-17 11:46:26 -07:00
Brad Hefta-Gaub
5549f4ec40 Merge pull request #5821 from ericrius1/paintCan 
Paint can tweaks
 2015-09-17 11:37:44 -07:00
Anthony J. Thibault
bef136d811 AnimGraph: prefer QString over std::string 2015-09-17 11:21:14 -07:00
ericrius1
c5b7de2156 added fire spawner 2015-09-17 10:00:01 -07:00
Ryan Huffman
f099e17f43 Merge pull request #5823 from birarda/master 
guard a perpetual AC domain connection if the NL thread is locked
 2015-09-17 09:40:52 -07:00
Stephen Birarda
fb38fd05ed Merge branch 'master' of https://github.com/highfidelity/hifi 2015-09-17 09:37:29 -07:00
ericrius1
7ffcce589d blocks spawning 2015-09-17 09:09:25 -07:00
ericrius1
b9985031da adding blocks 2015-09-17 09:03:42 -07:00
Brad Davis
5ba6242bda Support a debug oculus plugin for performance testing 2015-09-16 19:55:57 -07:00
Howard Stearns
5eef0e21ad Merge pull request #5826 from AndrewMeadows/ik-repairs-000 
prevent initial bad IK targets for hands
 2015-09-16 18:49:46 -07:00
James B. Pollack
75df4e96e8 cleanup 2015-09-16 18:48:06 -07:00
James B. Pollack
a8fe3b3edd keep the bubble with the wand, make the wand smaller 2015-09-16 18:08:56 -07:00
David Rowe
c992107363 Add particle properties ready to use for emitting from a spheroid 2015-09-16 18:07:18 -07:00