Brad Hefta-Gaub
|
483ac66518
|
more windows build tweaks, warnings and linking
|
2014-01-13 11:48:16 -08:00 |
|
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
|
08bb783777
|
more windows build work
|
2014-01-12 14:49:15 -08:00 |
|
Brad Hefta-Gaub
|
6bde55898d
|
handle NOMINMAX in cmake
|
2014-01-10 21:58:55 -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
|
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 |
|
Stephen Birarda
|
1c3259c8cf
|
remove the starfield URL loading code, closes #1497
|
2014-01-10 15:33:43 -08:00 |
|
Brad Hefta-Gaub
|
c181d0a849
|
first cut at local voxel cache
|
2014-01-09 12:05:09 -08:00 |
|
Andrzej Kapolka
|
1bd069c4e2
|
Removed unused variable.
|
2014-01-03 17:56:55 -08:00 |
|
Andrzej Kapolka
|
c2af9becba
|
Ray/capsule intersection test.
|
2014-01-03 17:48:58 -08:00 |
|
Andrzej Kapolka
|
aa9fc290a5
|
Minimum chat circle radius from Ryan, basic avatar/voxel orbit behavior.
|
2014-01-03 16:46:11 -08:00 |
|
Andrew Meadows
|
bce39e916a
|
Pulling latest worklist/hifi into local repo
|
2014-01-03 16:10:21 -08:00 |
|
Andrew Meadows
|
ea88f00ce5
|
Name changes, formatting, and comments for readability.
|
2014-01-03 16:01:31 -08:00 |
|
ZappoMan
|
ec1f08b140
|
Merge pull request #1443 from birarda/master
open up more audio to JS
|
2014-01-03 10:12:44 -08:00 |
|
Stephen Birarda
|
f24eff33fe
|
open up ASI playSound method to ScriptEngine
|
2014-01-03 09:38:05 -08:00 |
|
Andrew Meadows
|
930d9957f3
|
Changed argument names in collision methods for improved readability.
|
2014-01-02 16:09:41 -08:00 |
|
ZappoMan
|
f1da6bf90b
|
fix various compiler warnings on gcc
|
2014-01-02 15:58:03 -08:00 |
|
Stojce Slavkovski
|
31fa8ad1fb
|
Merge branch 'master' of https://github.com/worklist/hifi into 19463
|
2014-01-02 21:06:28 +01:00 |
|
Stephen Birarda
|
591876eaf3
|
notify for node kill on NodeList clear
|
2014-01-02 10:01:47 -08:00 |
|
Stojce Slavkovski
|
840d1a33ef
|
Reveal log file
- change log location lo application data folder
- reveal file in Finder (Explorer) implementation
|
2013-12-23 21:23:47 +01:00 |
|
Philip Rosedale
|
a6c2334f49
|
Merge pull request #1414 from birarda/injected-audio
C++ API for Audio Injection of samples from URL
|
2013-12-19 16:41:55 -08:00 |
|
Stephen Birarda
|
80a2bd0844
|
move _shouldLoopbackForNode to PositionalAudioRingBuffer for access in injector
|
2013-12-19 15:44:04 -08:00 |
|
ZappoMan
|
90a2fd31ef
|
fixed spacing
|
2013-12-19 15:17:29 -08:00 |
|
ZappoMan
|
d71bc248f4
|
support adjusting particles based on clockSkew
|
2013-12-19 14:49:58 -08:00 |
|
ZappoMan
|
bfbaf265dd
|
first cut at added clockSkew support to nodes and PING/PING_REPLY
|
2013-12-19 13:14:14 -08:00 |
|
ZappoMan
|
e2b7e08398
|
revert back to timestamps, fix a couple other bugs
|
2013-12-19 09:50:53 -08:00 |
|
Philip Rosedale
|
9980065659
|
Merge pull request #1406 from ZappoMan/particle_blinky_bug
Fix Particle Blinkiness on Clock Skew, and remove all global time stamps from wire formats
|
2013-12-18 20:02:38 -08:00 |
|
ZappoMan
|
5b36953e81
|
cleanup clockSkew debug options and remove some chatty logs
|
2013-12-18 19:33:52 -08:00 |
|
Andrzej Kapolka
|
f10dccb1b8
|
Fix for menu shortcuts; just include widget library rather than using awkward
workaround.
|
2013-12-18 17:28:21 -08:00 |
|
ZappoMan
|
1badc8dc5d
|
first pass at removing timestamps from particles removed _lastUpdated/getLastUpdated()
|
2013-12-18 16:59:36 -08:00 |
|
ZappoMan
|
6b0d7c30f0
|
added debugging option for forced clock skew
|
2013-12-18 16:58:49 -08:00 |
|
ZappoMan
|
4bfdce3910
|
Merge branch 'master' of https://github.com/worklist/hifi into controller_scripting_interface
Conflicts:
libraries/avatars/src/HandData.h
libraries/script-engine/src/ScriptEngine.cpp
libraries/script-engine/src/ScriptEngine.h
|
2013-12-17 15:25:12 -08:00 |
|
ZappoMan
|
a6e6205a57
|
first cut at scriptable controller
|
2013-12-17 15:23:09 -08:00 |
|