Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-05 06:12:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
8887 commits 25 branches 0 tags 1.1 GiB
Commit graph

4805 commits

Author SHA1 Message Date
Stephen Birarda
ec04d5450b Merge branch 'master' of https://github.com/highfidelity/hifi into nodelist-set 2014-01-22 16:16:47 -08:00
Stephen Birarda
f4f828ab72 Merge pull request #1629 from ZappoMan/juridiction_improvements 
Change JurisdictionListener and JurisdictionSender to not require virtual base class
 2014-01-22 16:16:24 -08:00
Andrzej Kapolka
ff4795d9a5 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-22 15:59:02 -08:00
Andrzej Kapolka
ba8791274f Remove test script for now, working on actual edits. 2014-01-22 15:58:41 -08:00
ZappoMan
29ce6db285 Merge pull request #1628 from birarda/dialog-fix 
updates to UpdateDialog ui loading
 2014-01-22 15:31:28 -08:00
ZappoMan
e19c7e12b5 Merge pull request #1625 from birarda/logger-deadlock 
fix LogDialog deadlock
 2014-01-22 15:30:29 -08:00
Stephen Birarda
abddb969a5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-22 14:47:44 -08:00
Stephen Birarda
e9e2557576 change node types of interest to a QSet 2014-01-22 14:47:04 -08:00
Andrzej Kapolka
e545cfe406 Fix for planes not at the origin. 2014-01-22 14:33:47 -08:00
Stephen Birarda
6937ce035a restore functionality of shouldSkipVersion 2014-01-22 14:25:06 -08:00
Brad Hefta-Gaub
85363f6603 Merge branch 'master' of git://github.com/worklist/hifi into juridiction_improvements 2014-01-22 14:23:00 -08:00
Stephen Birarda
e01f317cba remove QUiTools include, not needed 2014-01-22 14:20:40 -08:00
Stephen Birarda
a0b859a8e3 remove unneeded includes in UpdateDialog 2014-01-22 14:19:57 -08:00
Andrzej Kapolka
e552134cf5 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/src/Application.cpp
 2014-01-22 14:19:26 -08:00
Stephen Birarda
d2e02c15d8 repair the UpdateDialog so it is a QDialog with no child QWidget 2014-01-22 14:17:56 -08:00
Philip Rosedale
5e4fad2476 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-22 14:17:15 -08:00
Andrzej Kapolka
aabff3f141 Adjust the fog density; getting different results on Linux vs. OS X. 2014-01-22 14:17:02 -08:00
Brad Hefta-Gaub
6e9e21051d first cut at move JurisdicionListener and JuridictionSender into non-mulitply derived classes 2014-01-22 14:05:31 -08:00
Andrzej Kapolka
c6deb0c450 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-22 13:58:44 -08:00
Andrzej Kapolka
f2cfd868a6 MetavoxelEditorDialog -> MetavoxelEditor. 2014-01-22 13:57:59 -08:00
Andrzej Kapolka
064f0cd3ab Basic drag-out behavior for metavoxel editing. 2014-01-22 13:55:14 -08:00
Stephen Birarda
fb0f28cd7c fix LogDialog deadlock by removing unneeded mutex, closes #1624 2014-01-22 13:46:37 -08:00
Philip Rosedale
d068b668d8 add marker spheres at 1 meter away from origin for better avatar size testing 2014-01-22 12:48:10 -08:00
Stephen Birarda
a9ce6c7467 use NodeList ownerUUID for DataServerScriptingInterface, fix double UUID send 2014-01-22 12:00:26 -08:00
Stephen Birarda
d57aec9793 don't use separate NodeList owner UUID and Avatar UUID 2014-01-22 11:48:04 -08:00
Brad Hefta-Gaub
aacad00791 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	interface/src/Application.cpp
 2014-01-22 11:16:21 -08:00
Stephen Birarda
42c6498fe4 add debugging for mesh and skeleton changes for other Avatars 2014-01-22 11:11:38 -08:00
Andrzej Kapolka
15021b6ebc More work on metavoxel editing (track mouse ray intersection with grid). 2014-01-22 11:11:12 -08:00
Brad Hefta-Gaub
74fe9893ba make tipVelocity() world relative 2014-01-22 09:17:42 -08:00
Stephen Birarda
6b44172467 hook the user's avatar object into the Interface ScriptEngine 2014-01-22 09:13:25 -08:00
Brad Hefta-Gaub
fe5a8d9da2 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	libraries/shared/src/PacketHeaders.cpp
 2014-01-21 20:21:22 -08:00
Andrzej Kapolka
0a3d6ae5e0 More work on metavoxel editing (grid, etc.) 2014-01-21 19:31:56 -08:00
Andrzej Kapolka
d473b002a8 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-21 17:20:24 -08:00
Andrzej Kapolka
230b66680f More work on the editor. 2014-01-21 17:20:12 -08:00
Stephen Birarda
8df40b5d60 clearly init the skeleton URL in profile 2014-01-21 17:07:40 -08:00
Stephen Birarda
105fb42b34 rewrite mesh and skeleton requests from data-server 2014-01-21 16:46:04 -08:00
Andrzej Kapolka
5b4447d0b9 More work on metavoxel editing. 2014-01-21 16:17:31 -08:00
Stephen Birarda
f13aa322fc resolve conflicts in merge with upstream/master 2014-01-21 16:01:12 -08:00
Brad Hefta-Gaub
90c841ff01 add findClosestParticle() to JS interface 2014-01-21 14:29:20 -08:00
Brad Hefta-Gaub
03a9253748 remove usage of ParticleEditHandle from application 2014-01-21 14:07:46 -08:00
Brad Hefta-Gaub
97b0ed2cc5 implemented support for PACKET_TYPE_PARTICLE_ERASE 2014-01-21 13:24:35 -08:00
Stephen Birarda
e08f4d2eba more DataServerClient API tweaks 2014-01-21 13:13:57 -08:00
Andrzej Kapolka
d9589cd898 Starting on metavoxel editor dialog. 2014-01-21 11:43:15 -08:00
Andrzej Kapolka
5e908134ea Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-21 11:05:00 -08:00
Stephen Birarda
3613773b79 cleanup DSC api, add scripting interface 2014-01-21 09:55:06 -08:00
Leonardo Murillo
a4c057b01f PR fix 2014-01-21 11:27:03 -06:00
Leonardo Murillo
18a6d74165 removing comment 2014-01-21 11:24:23 -06:00
Leonardo Murillo
b2ef07f485 PR Fixes 2014-01-21 11:17:43 -06:00
Leonardo Murillo
cc147bc8bf PR fixes 2014-01-21 10:39:29 -06:00
Leonardo Murillo
b972d4260c PR Fixes 2014-01-21 10:31:16 -06:00
Leonardo Murillo
a9c294099e Merge branch 'master' of github.com:/worklist/hifi 2014-01-21 10:00:00 -06:00
ZappoMan
6fd4903672 Merge pull request #1599 from hifialanwu/master 
#19488 scripts save on exit and load on entry
 2014-01-21 02:20:57 -08:00
Brad Hefta-Gaub
347933f1a5 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	libraries/particles/src/Particle.cpp
	libraries/particles/src/ParticleCollisionSystem.cpp
	libraries/particles/src/ParticleTreeElement.cpp
 2014-01-21 02:15:46 -08:00
aw
0eed041deb scripts save on exit and load on entry 2014-01-20 22:58:01 -08:00
Brad Hefta-Gaub
3bcd02f8e3 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	libraries/shared/src/PacketHeaders.cpp
 2014-01-20 20:25:52 -08:00
Andrzej Kapolka
bf9fc65de4 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-20 17:40:16 -08:00
Andrew Meadows
b0edc7ee6f Merge branch 'master' of ssh://github.com/highfidelity/hifi into paddle-fixes-2 2014-01-20 17:39:41 -08:00
Stephen Birarda
d9ae27953b move DataServerClient to shared for use in other targets 2014-01-20 17:12:52 -08:00
Stephen Birarda
80fcc87437 some spacing fixes in Profile 2014-01-20 17:09:03 -08:00
Stephen Birarda
0ac5ec0690 hook old data server functionality through profile 2014-01-20 17:05:31 -08:00
Stephen Birarda
cf40fb0ef8 repairs to new Qt'ed DataServer and DataServerClient 2014-01-20 16:55:14 -08:00
Stephen Birarda
d405d31edf add data-server to hifi repo, abstract DataServerClient 2014-01-20 14:42:50 -08:00
Andrzej Kapolka
804ce83fa6 Get the base position/orientation directly from the avatar to prevent 
jerkiness when flying with the Hydra.  Also, restore arm lengths when the
Hydra becomes inactive.
 2014-01-20 13:44:41 -08:00
Brad Hefta-Gaub
b4b3720fcf move creatorTokenID management into Particle static members 2014-01-20 12:56:35 -08:00
Andrzej Kapolka
81ab68a529 Store hand position relative to body orientation/position. 2014-01-20 12:44:09 -08:00
Andrew Meadows
61e1b25e70 ParticleTreeElement::_particles is now a QList<> instead of std::vector<> for faster erase() 2014-01-20 12:43:27 -08:00
Brad Hefta-Gaub
bc2830d0d3 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	libraries/particles/src/ParticleCollisionSystem.cpp
 2014-01-20 10:55:34 -08:00
Leonardo Murillo
3036142a38 Removing comments 2014-01-20 11:55:10 -06:00
Leonardo Murillo
04970be8a2 Removing comments 2014-01-20 11:52:26 -06:00
Leonardo Murillo
c9f2db1f90 Merge branch 'master' of github.com:/worklist/hifi 2014-01-20 11:51:29 -06:00
Leonardo Murillo
f6bc7a2c4b I think last fixes 2014-01-20 11:51:17 -06:00
ZappoMan
17abbc4715 Merge pull request #1586 from PhilipRosedale/master 
Clap script and better bird sounds
 2014-01-20 09:06:28 -08:00
Leonardo Murillo
825c64e1d0 Anything obviously wrong? 2014-01-20 10:57:10 -06:00
Leonardo Murillo
3d5d02d5b0 Some more changes 2014-01-18 20:33:29 -06:00
Leonardo Murillo
7748002db7 More PR related changes 2014-01-18 20:27:56 -06:00
Leonardo Murillo
cd9f2fd240 Pull Request fixes 2014-01-18 20:17:47 -06:00
Leonardo Murillo
865045aae7 Merge branch 'master' of github.com:/worklist/hifi 2014-01-17 19:24:54 -06:00
Philip Rosedale
2fe666aa63 Merge pull request #1583 from birarda/nodelist-container 
NodeList container repairs
 2014-01-17 17:23:16 -08:00
Andrzej Kapolka
341f60da76 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-17 17:10:46 -08:00
Philip Rosedale
4547f07739 added fountain script 2014-01-17 17:10:15 -08:00
Andrzej Kapolka
470b83a55b Got the sign backwards. 2014-01-17 17:04:22 -08:00
Andrzej Kapolka
765f98fadc Remove unused variables, change orbit pitch behavior (closes #1582). 2014-01-17 17:00:03 -08:00
Philip Rosedale
08c49bb68f Merge branch 'master' of https://github.com/worklist/hifi 2014-01-17 16:54:48 -08:00
Philip Rosedale
317af4c927 Merge pull request #1585 from AndrewMeadows/paddle-fixes 
Paddle fixes
 2014-01-17 16:50:10 -08:00
Andrew Meadows
0921999c3b Removing menu option for where to hold the ball -- we always hold from the finger tip (approximately). 2014-01-17 16:37:44 -08:00
Andrew Meadows
6c6a59b252 Hand now holds a ball a bit forward, which prevents the body from colliding with the ball on throw. 2014-01-17 16:36:50 -08:00
Andrew Meadows
aac1764243 Re-enabling particle-avatar collisions. 2014-01-17 16:30:07 -08:00
Stephen Birarda
594165782a repair badly scoped usage of QMutexLocker 2014-01-17 16:20:22 -08:00
Stephen Birarda
99cd6c8ce8 remove two unused variable warnings 2014-01-17 16:04:04 -08:00
Brad Hefta-Gaub
99f9ae9d3a implement new setProperties() getProperties() for Particle to allow setting all properties at once using a JS hash 2014-01-17 16:02:58 -08:00
Brad Hefta-Gaub
1e0f1adb16 added lifetime to particles 2014-01-17 14:59:40 -08:00
Leonardo Murillo
91defcfd03 Merge branch 'master' of github.com:/worklist/hifi 2014-01-17 16:28:30 -06:00
Brad Hefta-Gaub
d4331db45a Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	examples/gun.js
	libraries/script-engine/src/ScriptEngine.cpp
 2014-01-17 13:29:36 -08:00
ZappoMan
bb41fe6ddb Merge pull request #1573 from stojce/19484 
Code Review for Job #19484
 2014-01-17 13:25:59 -08:00
Leonardo Murillo
a13d7b084f Removing comment 2014-01-17 14:39:48 -06:00
Leonardo Murillo
99275dadd4 PR Changes 2014-01-17 14:39:34 -06:00
Leonardo Murillo
ff6a9b2052 PR fix 2014-01-17 14:05:38 -06:00
Leonardo Murillo
a4efe55bbf changing dev version 2014-01-17 14:02:57 -06:00
stojce
99feb36d19 Merge branch 'master' of https://github.com/worklist/hifi into 19484 2014-01-17 20:57:23 +01:00
Leonardo Murillo
9582fadef4 Last changes 2014-01-17 13:44:03 -06:00