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

2066 commits

Author SHA1 Message Date
Brad Hefta-Gaub
55babbf7b6 windows type mismatch warning fixes 2014-01-13 00:30:23 -08:00
Brad Hefta-Gaub
9ccaba3ca8 snprintf windows fixes 2014-01-12 23:26:13 -08:00
Brad Hefta-Gaub
9e24996f39 more isnan() hacks 2014-01-12 23:11:06 -08:00
Brad Hefta-Gaub
19012e2f6d more windows build fixes isnan 2014-01-12 22:05:55 -08:00
Brad Hefta-Gaub
a94e371e5c fix more windows warnings 2014-01-12 21:27:25 -08:00
Brad Hefta-Gaub
441da98063 define _Pragma for windows 2014-01-12 17:25:06 -08:00
Brad Hefta-Gaub
08bb783777 more windows build work 2014-01-12 14:49:15 -08:00
Brad Hefta-Gaub
f9f29c68b2 more windows build fixes 2014-01-11 01:11:49 -08:00
Brad Hefta-Gaub
9dea84c227 more windows build fixes 2014-01-11 00:45:45 -08:00
Brad Hefta-Gaub
cb828d330a more windows build fixes 2014-01-11 00:43:47 -08:00
Brad Hefta-Gaub
825c1c8876 fix windows warnings 2014-01-11 00:07:35 -08:00
Brad Hefta-Gaub
7234b9ca4a try to get this to work 2014-01-10 22:58:32 -08:00
Brad Hefta-Gaub
908b5e1de7 hack test externals 2014-01-10 22:38:16 -08:00
Brad Hefta-Gaub
148cde30a0 make it work on unix, mac, and windows 2014-01-10 22:15:41 -08:00
Brad Hefta-Gaub
46c45da842 std::min() compiler error on windows 2014-01-10 22:11:20 -08:00
Brad Hefta-Gaub
6bde55898d handle NOMINMAX in cmake 2014-01-10 21:58:55 -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
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
Andrew Meadows
f2d0d445c2 yet another merge after competing pull requests 2014-01-10 16:03:48 -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
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
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
Stephen Birarda
1c3259c8cf remove the starfield URL loading code, closes #1497 2014-01-10 15:33:43 -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
e908121bcd fix bug in Octree server that wasn't properly surpressing duplicate packets 2014-01-09 19:13:17 -08:00
Brad Hefta-Gaub
5787d3d9e9 more cast coding standard fixes 2014-01-09 19:00:57 -08:00
Brad Hefta-Gaub
6e95c52444 make local voxel cache properly switch to different cache file when switching domains 2014-01-09 14:51:04 -08:00
Brad Hefta-Gaub
c181d0a849 first cut at local voxel cache 2014-01-09 12:05:09 -08:00
Brad Hefta-Gaub
03794f7218 make casts float match coding standard 2014-01-09 10:07:51 -08:00
Stephen Birarda
32be6199fd fix reference to downloaded byte array samples 2014-01-05 17:41:33 -08:00
Stephen Birarda
a06f18328c add downsampling so RAW audio for sound assumed to be 48Khz 2014-01-05 17:40:37 -08:00