Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-16 03:40:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
8887 commits 72 branches 59 tags 1.2 GiB
Commit graph

8887 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
7c5c71ec42 Merge pull request #1532 from murillodigital/master 
Update required query and notification
 2014-01-21 09:55:25 -08:00
Stephen Birarda
3613773b79 cleanup DSC api, add scripting interface 2014-01-21 09:55:06 -08:00
Philip Rosedale
b508318473 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-21 09:36:11 -08:00
Leonardo Murillo
90329e0465 Merge branch 'master' of github.com:/worklist/hifi 2014-01-21 11:29:37 -06:00
Leonardo Murillo
a4c057b01f PR fix 2014-01-21 11:27:03 -06:00
Andrew Meadows
141c20f4ef Fix formatting to abide by compressed K&R style. 2014-01-21 09:26:23 -08: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
ZappoMan
b48ec97f5b Merge pull request #1598 from AndrewMeadows/paddle-fixes-2 
Paddle fixes 2
 2014-01-21 02:12:47 -08:00
Brad Hefta-Gaub
cd0e8e742c particle edit checkpoint 2014-01-21 02:12:31 -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
Andrew Meadows
966cd76e2c Adding static friction for easier "catching" of particles on paddle hands. 2014-01-20 17:34:24 -08:00
Andrew Meadows
516a590e4f Modifying how the "particle is stopped" logic reads with minimal modification to how it works. 2014-01-20 17:33:09 -08:00
Stephen Birarda
340ae8ebd1 column width repair 2014-01-20 17:17:26 -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
Brad Hefta-Gaub
d831f9df5e first cut at using partial property info in particle edits 2014-01-20 16:34:45 -08:00
Stephen Birarda
657589fa64 add sequence number handling to the data-server 2014-01-20 14:52:45 -08:00
Philip Rosedale
c5652935a5 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-20 14:50:43 -08:00
Philip Rosedale
19793a9a4a Merge pull request #1595 from ey6es/master 
Fix hand jerkiness when flying (by always keeping the hand positions relative to the body orientation/position).
 2014-01-20 14:50:20 -08:00
Stephen Birarda
8930cf889b bump data server packet version to 1 2014-01-20 14:48:14 -08:00
Stephen Birarda
d405d31edf add data-server to hifi repo, abstract DataServerClient 2014-01-20 14:42:50 -08:00
Andrzej Kapolka
b98ceec21c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-20 13:45:49 -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
Andrew Meadows
1ed57e044a Fixing measure of "old" particles while simplifying the math (faster!). 2014-01-20 13:40:15 -08:00
Andrew Meadows
1eb2f19320 Removing one more usecTimestampNow() call in Particle::update() 2014-01-20 13:34:08 -08:00
Andrew Meadows
79e4b6d691 Removing per-particle calls to usecTimestampNow() which can add up when simulating a lot of particles. 2014-01-20 13:27:19 -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
Andrzej Kapolka
af74a73423 Merge pull request #1594 from ey6es/master 
Compile fixes (perhaps just for my version of Qt/GCC).
 2014-01-20 11:42:38 -08:00
Andrzej Kapolka
520f7a78a8 Compile fixes (perhaps just for my version of Qt/GCC). 2014-01-20 11:41:04 -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
a4e3f06502 Merge pull request #1592 from ZappoMan/master 
fix windows build
 2014-01-20 09:30:29 -08:00
Brad Hefta-Gaub
0c55447809 fix windows build 2014-01-20 09:26:49 -08:00
Brad Hefta-Gaub
ab9e01ce7f add ParticleID class 2014-01-20 09:11:47 -08:00