Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-13 04:12:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
8235 commits 22 branches 28 tags 1.2 GiB
Commit graph

8235 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
6bde55898d handle NOMINMAX in cmake 2014-01-10 21:58:55 -08:00
Brad Hefta-Gaub
73c8dc495b changed all fmin to std::min 2014-01-10 21:42:08 -08:00
Brad Hefta-Gaub
550ec8a9c7 changed all fmin to std::min 2014-01-10 21:42:01 -08:00
Brad Hefta-Gaub
26adabf130 removed voxel addSphere since it wasn't compiling and was old debug code 2014-01-10 21:39:03 -08:00
Brad Hefta-Gaub
ef60aec81e removed persit file load time to help windows build 2014-01-10 21:32:44 -08:00
Brad Hefta-Gaub
dec16c8f0b windows build 2014-01-10 21:21:07 -08:00
Brad Hefta-Gaub
b6b2b7f58b first cut at making GenericThread use QThread instead of pthread 2014-01-10 21:16:00 -08:00
Brad Hefta-Gaub
7848d065bc added NOMINMAX before things that possibly include windows.h 2014-01-10 21:01:43 -08:00
Brad Hefta-Gaub
ac97f129d3 change interface since its confusing windows compiler 2014-01-10 20:49:08 -08:00
Brad Hefta-Gaub
124250b2c2 changed fmax to std::max 2014-01-10 20:38:13 -08:00
Brad Hefta-Gaub
b0f8e21d06 more windows build hackery 2014-01-10 20:36:37 -08:00
Brad Hefta-Gaub
44893b0a8c hackery to get windows to build 2014-01-10 19:58:10 -08:00
Brad Hefta-Gaub
a5c5a35c12 removed sys/time.h for Systime.h on windows 2014-01-10 19:54:20 -08:00
Brad Hefta-Gaub
731209d8cb remove unused PerfStats class more missing header changes 2014-01-10 19:47:23 -08:00
Brad Hefta-Gaub
e55e680e66 tweaks to some variable names since windows has a problem with them 2014-01-10 18:28:18 -08:00
Brad Hefta-Gaub
5725a92cfe get rid of arpa/inet.h and netdb.h 2014-01-10 18:13:23 -08:00
Brad Hefta-Gaub
9bc4a3df41 switch from pthread mutex to QMutex 2014-01-10 18:01:36 -08:00
Brad Hefta-Gaub
2c30b8b5b4 Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-10 17:36:53 -08:00
ZappoMan
038f8d5777 Merge pull request #1502 from AndrewMeadows/master 
more correct particle-particle collisions
 2014-01-10 17:36:36 -08:00
ZappoMan
6345eff3ae Merge pull request #1501 from birarda/qprocess 
switch to QProcess instead of fork in AssignmentClient
 2014-01-10 17:36:24 -08:00
Brad Hefta-Gaub
f6d775e3e1 remove timeval and unistd.h 2014-01-10 17:27:23 -08:00
Andrew Meadows
c61f071ab7 merge of latest upstream work in preparation for pull request #1500 
Conflicts:
	libraries/particles/src/ParticleCollisionSystem.cpp
 2014-01-10 17:03:45 -08:00
Stephen Birarda
248754e63e make sure STDOUT from child assignment-client bubbles up to parent 2014-01-10 17:03:13 -08:00
Stephen Birarda
ceb8ca7a23 changes to AssignmentClient architecture to fix fork behaviour 2014-01-10 16:59:01 -08:00
Andrew Meadows
e18ae78ce1 merge pull #1499 2014-01-10 16:30:22 -08:00
Andrew Meadows
f2d0d445c2 yet another merge after competing pull requests 2014-01-10 16:03:48 -08:00
Andrzej Kapolka
415935a594 Merge branch 'master' of https://github.com/worklist/hifi into fixery 2014-01-10 16:03:40 -08:00
Andrzej Kapolka
31a9ba6489 Merge pull request #1496 from birarda/makefiles 
fix for makefiles build on 10.9
 2014-01-10 16:02:57 -08:00
Andrzej Kapolka
de0472cfc1 Merge pull request #1498 from birarda/remove-curl 
remove curl dependency by removing starfield loading from URL
 2014-01-10 16:02:17 -08:00
Andrzej Kapolka
355321c8b5 Merge branch 'master' of https://github.com/worklist/hifi into fixery 2014-01-10 16:01:18 -08:00
Andrew Meadows
8799ad133e merge again after some competing pull requests were processed 2014-01-10 16:00:08 -08:00
Andrew Meadows
d28ed70ca9 merge pull request 1446 2014-01-10 15:55:38 -08:00
Andrzej Kapolka
a7c14f1f17 Only register movement if the hand isn't new. 2014-01-10 15:53:50 -08:00
Philip Rosedale
ea0f7c1e05 Merge pull request #1475 from ZappoMan/local_voxel_cache 
Local voxel cache & some bug fixes
 2014-01-10 15:53:47 -08:00
Andrzej Kapolka
5283e51927 Start out disabled. 2014-01-10 15:51:12 -08:00
Andrzej Kapolka
a7e9434c96 Tweaked constants. 2014-01-10 15:50:14 -08:00
Stephen Birarda
1c3259c8cf remove the starfield URL loading code, closes #1497 2014-01-10 15:33:43 -08:00
Stephen Birarda
a820b2c3b6 force 10.9 build to act like 10.8 with Makefiles, closes #1210 2014-01-10 15:01:39 -08:00
Andrzej Kapolka
515b40ecc3 Attempt to disable Hydra hands after five seconds without movement. 2014-01-10 15:00:14 -08:00
Andrzej Kapolka
38118fdab0 When we start setting the fake coefficients after we set the real ones, make 
sure all of the other coefficients are zero.
 2014-01-10 14:42:05 -08:00
Andrzej Kapolka
4ae5203f38 Remove unused constant. 2014-01-10 14:10:33 -08:00
Andrzej Kapolka
9fa170494c I believe what we really want to decay is the mouse pitch. 2014-01-10 14:04:46 -08:00
Andrzej Kapolka
e97970d961 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-10 12:27:04 -08:00
Andrzej Kapolka
131af0cf16 I believe this should fix the "Joint/model not in model list" errors. 2014-01-10 12:26:11 -08:00
Andrew Meadows
c4c0c389ae Temporarily disabling DAMPING and non-unity ELASTICITY during particle-particle collisions 2014-01-10 11:42:23 -08:00
Andrew Meadows
71e5de8420 Adding Particle::_mass and correct elastic collisions between particles 2014-01-10 11:37:01 -08:00
Philip Rosedale
f0460bac5f Merge pull request #1492 from stojce/19466 
Code Review for Job #19466
 2014-01-10 11:19:43 -08:00
Brad Hefta-Gaub
50fa6be829 Merge branch 'master' of git://github.com/worklist/hifi into local_voxel_cache 2014-01-09 19:41:15 -08:00
ZappoMan
88232f320c Merge pull request #1469 from birarda/kill-leap 
remove leap integration
 2014-01-09 19:40:58 -08:00
Brad Hefta-Gaub
e908121bcd fix bug in Octree server that wasn't properly surpressing duplicate packets 2014-01-09 19:13:17 -08:00