Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-03 21:58:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
9175 commits 25 branches 0 tags 1.1 GiB
Commit graph

1530 commits

Author SHA1 Message Date
Stephen Birarda
40a963cf92 some application destructor cleanup 2014-01-31 17:50:51 -08:00
Stephen Birarda
d65a3ee174 spacing cleanup in Application and ScriptEngine 2014-01-31 17:38:53 -08:00
Stephen Birarda
8fc55bd196 add user UUID to application window title 2014-01-31 14:56:04 -08:00
AndrewMeadows
f277e00780 Merge pull request #1785 from birarda/post-event 
repairs to VoxelImporter to remove warning, closes #1758
 2014-01-31 11:23:01 -08:00
Stephen Birarda
217135a8d6 repairs to VoxelImporter to remove QCoreApplication warning 2014-01-31 11:00:44 -08:00
AndrewMeadows
bed63513a9 Merge pull request #1745 from ZappoMan/scripting_work 
support for global collision callbacks in JS
 2014-01-31 10:42:44 -08:00
AndrewMeadows
0badc02a93 Merge pull request #1776 from birarda/bent-avatars 
repair ping packet parsing in creation of reply, fix AvatarMixer crash with UNIX client
 2014-01-31 10:25:20 -08:00
Stephen Birarda
a5b0675f24 sendPingPackets method need not be static 2014-01-31 09:58:29 -08:00
stojce
21ab08b31a Merge branch 'master' of https://github.com/worklist/hifi into 19493 2014-01-30 22:23:54 +01:00
stojce
d2464d89e3 #19493 - @ function can jump to locations as well as avatars 2014-01-30 22:23:31 +01:00
Stephen Birarda
84ef757af4 fix avatar count, HandData crash (closes #1754) 2014-01-30 09:45:09 -08:00
ZappoMan
ed0a2a5a18 Merge branch 'master' of https://github.com/worklist/hifi into scripting_work 
Conflicts:
	libraries/shared/src/SharedUtil.cpp
	libraries/shared/src/SharedUtil.h
	libraries/voxels/src/VoxelEditPacketSender.cpp
 2014-01-29 19:49:36 -08:00
ZappoMan
08b06cc59c support for global collision callbacks in JS 2014-01-29 17:52:17 -08:00
Andrew Meadows
82a4b7a4d1 Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions 
Conflicts:
	interface/src/Application.cpp
 2014-01-29 13:20:42 -08:00
Stephen Birarda
33edcea5fb resolve conflicts on merge with upstream master 2014-01-29 12:23:06 -08:00
Andrew Meadows
d757f20d22 Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions 
Conflicts:
	interface/src/Application.cpp
 2014-01-29 11:41:39 -08:00
ZappoMan
b36cc0bcf9 removed old cruft around mousePitch in Head and unified pitch 2014-01-29 02:09:49 -08:00
ZappoMan
9d87d58723 Merge branch 'master' of https://github.com/worklist/hifi into more_scripting 
Conflicts:
	libraries/particles/src/ParticlesScriptingInterface.cpp
 2014-01-28 20:36:35 -08:00
ZappoMan
305e69def6 really get controller key, mouse, etc scripting working 2014-01-28 19:47:45 -08:00
Andrew Meadows
677341d207 fix for crash bug #1728. 
Moving _myAvatr to live in AvatarManager.  Application still has a
pointer to it.  Unfortunately the order of Application initialization
and destruction matters very much.
 2014-01-28 18:04:42 -08:00
ZappoMan
5addc35cd8 hacking on controller events 2014-01-28 14:58:08 -08:00
Andrew Meadows
167acb8873 Adding avatars back into ParticleCollisionSystem. 
Had to add Application::_myAvatar to the AvatarManager list so that
particles would properly collide.
 2014-01-28 14:16:34 -08:00
Stephen Birarda
423e1598f0 use NodeSet in place of QSet<NodeType_t> where possible 2014-01-28 13:41:39 -08:00
Stephen Birarda
4de270b832 cleanup Node types, closes #1726 2014-01-28 13:38:33 -08:00
Stephen Birarda
cda06d1cb3 replace uint64_t with quint64 for Qt friendlyness 2014-01-28 12:35:42 -08:00
Stephen Birarda
3a706a2759 repair the count of avatars and servers 2014-01-28 12:31:25 -08:00
Stephen Birarda
2aaa9ce3f6 resolve conflicts on merge with upstream master 2014-01-28 12:30:43 -08:00
Stephen Birarda
4103cc1cde packet header changes and beginning of conversion to QByteArray 2014-01-28 10:36:08 -08:00
ZappoMan
1681dbb57b Merge branch 'master' of https://github.com/worklist/hifi into particle_meshes 2014-01-28 09:26:54 -08:00
Andrew Meadows
c4f429dcd0 Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions 2014-01-27 18:05:39 -08:00
Andrew Meadows
2b5675b077 Fix issue #1684 : particles collide against avatars again. 
This a quick and dirty fix to resurrect particle-avatar collisions.
We rebuild and pass a list of AvatarData* to the
ParticleCollisionManager every call to update().
 2014-01-27 18:01:53 -08:00
stojce
4d1992485f removed unused QSound reference 2014-01-27 21:17:17 +01:00
stojce
40ea552981 filename format changes 
- new wav file
- changed filename format
 2014-01-27 20:35:06 +01:00
stojce
74801da07f #19491 - Implement in-app snapshots 2014-01-27 18:07:03 +01:00
ZappoMan
62b7e6e58d implement local edits in ParticleScriptingInterface 2014-01-27 09:00:34 -08:00
ZappoMan
c17476c985 Merge pull request #1683 from kordero/19487 
Code Review for Job #19487
 2014-01-25 12:25:44 -08:00
Lucas Crisman
28d6171be5 Merge branch 'master' of git://github.com/worklist/hifi into 19487 2014-01-25 11:24:51 -03:00
Lucas Crisman
f56e4b0820 build error fix 2014-01-25 11:24:33 -03:00
stojce
f4698065ce Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-25 07:39:17 +01:00
ZappoMan
f02bc95908 clear particles when switching domains 2014-01-24 11:07:27 -08:00
Lucas Crisman
759448bef7 resolving reverted change on last merge 2014-01-24 15:13:14 -03:00
Lucas Crisman
cece4add27 Merge branch 'master' of git://github.com/worklist/hifi into 19487 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2014-01-24 15:01:24 -03:00
Lucas Crisman
482c501f3b stats reduction on mirror enabled 2014-01-24 10:35:03 -03:00
Lucas Crisman
ef107e0a54 timer positioning when toggling BandwithMeter 2014-01-24 08:14:26 -03:00
Lucas Crisman
43d1678d18 position/sizes tweaks / moving stats and osciloscope when mirror is ON 2014-01-24 07:56:01 -03:00
Lucas Crisman
c3aa8167d6 click on stats to expand/contract them 2014-01-24 07:18:45 -03:00
Lucas Crisman
a2f8a61a69 stats font & color changes, styling audio & bandwidth meters 2014-01-24 05:06:55 -03:00
stojce
0c2e55a53b Merging with master 
- resolve conflicts on GeometryCache
 2014-01-24 07:31:22 +01:00
Stephen Birarda
10cfd628aa resolve conflicts on merge with upstream master 2014-01-23 17:52:30 -08:00
Lucas Crisman
f818b07dc8 Merge branch 'master' of git://github.com/worklist/hifi into 19487 2014-01-23 22:18:33 -03:00