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

8723 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
8aa7a915e7 ok, one more shot at fixing particle-server crash 2014-01-23 13:01:07 -08:00
ZappoMan
2c896f402b Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 2014-01-23 10:32:49 -08:00
ZappoMan
ccc30d95fb fix crashing particle server bug 2014-01-23 10:32:42 -08:00
Leonardo Murillo
f177a4fe23 Merge pull request #1645 from ZappoMan/bugfixes 
fix particle-server spinning out at 100% cpu
 2014-01-23 10:11:27 -08:00
ZappoMan
3d0d5f130a fix particle-server spinning out at 100% cpu% 2014-01-23 10:02:04 -08:00
ZappoMan
0e6faec5bb Merge pull request #1639 from birarda/master 
add debugging for UUID owner change on NodeList
 2014-01-22 17:46:55 -08:00
Stephen Birarda
33257fc785 add debugging for UUID owner change on NodeList 2014-01-22 17:42:52 -08:00
ZappoMan
84bddf2383 Merge pull request #1635 from birarda/packet-sender 
fix null UUIDs
 2014-01-22 17:35:57 -08:00
Stephen Birarda
454a1cc6c9 only set UUID when not null, properly send UUID from data-server 2014-01-22 17:33:17 -08:00
AndrewMeadows
3a9dc667db Merge pull request #1633 from birarda/master 
fix for NodeList UUID not updating
 2014-01-22 16:59:02 -08:00
Stephen Birarda
5214d53872 call UUID setter in Profile UUID update so it updates NodeList 2014-01-22 16:49:36 -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
Philip Rosedale
3c5cd850fc Merge pull request #1631 from ZappoMan/new_particle_scripting_interface 
remove ParticleEditHandle, and change ParticleCollisionSystem to use new particle edit API
 2014-01-22 16:03:51 -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
ZappoMan
d73144ff0e Merge pull request #1623 from birarda/master 
remove separate Avatar UUID
 2014-01-22 15:29:39 -08:00
Brad Hefta-Gaub
e0f68bedc1 fixed type 2014-01-22 15:25:05 -08:00
Brad Hefta-Gaub
9231c1d80a remove ParticleEditHandle, and change ParticleCollisionSystem to use new particle edit API 2014-01-22 15:21:58 -08:00
Stephen Birarda
abddb969a5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-22 14:47:44 -08:00
Brad Hefta-Gaub
b9ccd28428 removed some debug code 2014-01-22 14:35:38 -08:00
Brad Hefta-Gaub
ef2d0e97da removed some debug code 2014-01-22 14:26:57 -08:00
Brad Hefta-Gaub
132b043d68 removed debug code 2014-01-22 14:26:03 -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
Brad Hefta-Gaub
39f7111b2d remove public virtual from PacketSender and RecievedPacketProcessor 2014-01-22 14:21:03 -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
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
135f96a18c Merge pull request #1620 from ZappoMan/new_particle_scripting_interface 
New particle scripting interface
 2014-01-22 14:14:33 -08:00
Brad Hefta-Gaub
8be6fcbccc CR feedback 2014-01-22 14:11:11 -08:00
Brad Hefta-Gaub
34dc1a698e fixed types 2014-01-22 14:09:39 -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
Stephen Birarda
fb0f28cd7c fix LogDialog deadlock by removing unneeded mutex, closes #1624 2014-01-22 13:46:37 -08:00
Stephen Birarda
120001ecac Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-22 13:25:47 -08:00
Stephen Birarda
d307412183 remove preEvaluateReset in ScriptEngine 2014-01-22 12:01:15 -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
ZappoMan
da9fccc9b2 Merge pull request #1610 from PhilipRosedale/master 
Example script drumSticks.js lets you play air drums
 2014-01-22 11:15:14 -08:00
ZappoMan
ed71e8b69d Merge pull request #1617 from birarda/redis-warnings 
remove unused hiredis externals
 2014-01-22 11:14:26 -08:00
Philip Rosedale
8137f24db0 Merge pull request #1619 from birarda/master 
add debugging for mesh and skeleton changes for other avatars
 2014-01-22 11:13:05 -08:00
Brad Hefta-Gaub
c3b681786a make particles and voxels JS APIs all operate on meters not domain units 2014-01-22 11:12:52 -08:00
Stephen Birarda
42c6498fe4 add debugging for mesh and skeleton changes for other Avatars 2014-01-22 11:11:38 -08:00
Philip Rosedale
eccf1e0fac Merge pull request #1614 from birarda/scripted-avatar 
expose MyAvatar to Interface ScriptEngine
 2014-01-22 10:57:45 -08:00
Brad Hefta-Gaub
f81adb8810 update packet versions 2014-01-22 09:48:19 -08:00
Brad Hefta-Gaub
1b5938d0af new toyball script that is DRY-er 2014-01-22 09:48:04 -08:00
Stephen Birarda
34629f3850 remove unused hiredis externals, closes #1612 2014-01-22 09:27:39 -08:00
Brad Hefta-Gaub
64940a04ff latest toyball script 2014-01-22 09:18:01 -08:00
Brad Hefta-Gaub
74fe9893ba make tipVelocity() world relative 2014-01-22 09:17:42 -08:00
Stephen Birarda
a5bac3d209 fix a couple of warnings by using QString for object name 2014-01-22 09:14:52 -08:00