Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 16:49:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
8979 commits 25 branches 0 tags 1.1 GiB
Commit graph

8979 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
cda06d1cb3 replace uint64_t with quint64 for Qt friendlyness 2014-01-28 12:35:42 -08:00
Stephen Birarda
7b4921e761 use quint64 in place of uint64_t for QDataStream 2014-01-28 12:34:08 -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
b009cd8e67 repair more node communication problems after refactor 2014-01-28 12:25:44 -08:00
Stephen Birarda
ffefc529f3 ensure UUID pulled from packet header is exactly 16 bytes 2014-01-28 11:53:09 -08:00
Stephen Birarda
75e2fa491a some type fixes for marshalling/un-marshalling of data 2014-01-28 11:26:36 -08:00
Stephen Birarda
85ebad979f repair assignment flow errors from packet changes 2014-01-28 11:15:38 -08:00
Stephen Birarda
3854f75abd cleanup some UUID packing 2014-01-28 10:41:40 -08:00
Stephen Birarda
4103cc1cde packet header changes and beginning of conversion to QByteArray 2014-01-28 10:36:08 -08:00
Andrew Meadows
ade02c0259 Bug fix: update ALL avatars in the AvatarManager (rather than just one). 
Reviewed with Birarda and pushed directly to upstream.
 2014-01-28 09:32:58 -08:00
ZappoMan
f2cfb1634b Merge pull request #1717 from stojce/19483 
2nd Code Review for Job #19483
 2014-01-27 14:23:39 -08:00
ZappoMan
8de7bfe55e Merge pull request #1715 from stojce/19491 
Code Review for Job #19491
 2014-01-27 14:22:11 -08:00
stojce
3fde4078c5 ignore double-click on disabled items 2014-01-27 21:48:26 +01:00
stojce
4d1992485f removed unused QSound reference 2014-01-27 21:17:17 +01:00
stojce
c82a8a152e Set JPG quality to 100 2014-01-27 20:59:46 +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
stojce
dcdbf729c9 importing file w/ double click 2014-01-26 17:57:21 +01:00
stojce
ef39d019ac Voxel import fix 2014-01-26 16:28:21 +01:00
ZappoMan
c17476c985 Merge pull request #1683 from kordero/19487 
Code Review for Job #19487
 2014-01-25 12:25:44 -08:00
ZappoMan
8ef3e7c44f Merge pull request #1675 from stojce/19483 
Code Review for Job #19483
 2014-01-25 12:21:23 -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
b8db07be5f CR fixes 2014-01-25 12:08:20 +01:00
stojce
f4698065ce Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-25 07:39:17 +01:00
AndrewMeadows
d19cb6da36 Merge pull request #1694 from ZappoMan/dont_edit_bad_particles 
New particles JS features
 2014-01-24 17:23:30 -08:00
ZappoMan
afb7ab07da added new example of particle bird 2014-01-24 15:35:21 -08:00
ZappoMan
67ef3282cb handle preventing edits to non-existant particles 2014-01-24 15:30:40 -08:00
ZappoMan
2720b98d57 fix comment 2014-01-24 13:00:54 -08:00
ZappoMan
c5dd94f0cf add example 2014-01-24 13:00:01 -08:00
ZappoMan
0b871c80c3 added Particles.getParticleProperties() to JS 2014-01-24 12:56:36 -08:00
ZappoMan
bcaafb25f0 added findParticles() to JS api 2014-01-24 12:36:06 -08:00
AndrewMeadows
fd34d2cee3 Merge pull request #1687 from ZappoMan/particles_switch_domains 
clear particles when switching domains
 2014-01-24 11:18:00 -08:00
ZappoMan
f02bc95908 clear particles when switching domains 2014-01-24 11:07:27 -08:00
Lucas Crisman
3b767fff04 Merge branch 'master' of git://github.com/worklist/hifi into 19487 2014-01-24 15:13:27 -03:00
Lucas Crisman
759448bef7 resolving reverted change on last merge 2014-01-24 15:13:14 -03:00
ZappoMan
dbde1a29fe Merge pull request #1682 from ZappoMan/master 
Fix Windows Build
 2014-01-24 10:07:50 -08: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
Brad Hefta-Gaub
0c891ddfa8 Merge branch 'master' of https://github.com/ZappoMan/hifi 2014-01-24 09:55:52 -08:00
Brad Hefta-Gaub
177f09aa4d Merge branch 'master' of git://github.com/worklist/hifi 2014-01-24 09:55:38 -08:00
AndrewMeadows
ea681f0d8f Merge pull request #1669 from birarda/avatar-list 
add an AvatarManager to house a separate list of Avatars from NodeList
 2014-01-24 09:54:17 -08:00
Brad Hefta-Gaub
7c507b44eb Merge branch 'master' of git://github.com/worklist/hifi 2014-01-24 09:53:19 -08:00
Brad Hefta-Gaub
692358bf6e fix windows builds 2014-01-24 09:51:17 -08:00
Brad Hefta-Gaub
54faeae13e fix windows builds 2014-01-24 09:51:06 -08:00
Leonardo Murillo
57dd739607 Merge pull request #1679 from birarda/mismatch-log 
expand packet mismatch log entry
 2014-01-24 09:49:29 -08:00
Stephen Birarda
dff59f386a cleanup spacing in debug 2014-01-24 09:23:44 -08:00
Brad Hefta-Gaub
fd2f5ec0e6 Merge branch 'master' of https://github.com/ZappoMan/hifi 2014-01-24 09:16:51 -08:00
Stephen Birarda
fc55c3efac simplify debug a little 2014-01-24 09:11:03 -08:00
Stephen Birarda
9d71671a52 add extra debugging to packet mismatch 2014-01-24 09:10:27 -08:00