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

1084 commits

Author SHA1 Message Date
Andrew Meadows
9d2758ee14 fix warning about malformed case statement 2014-03-07 09:32:12 -08:00
Andrzej Kapolka
c5ab32235f Merge branch 'master' of https://github.com/highfidelity/hifi into joints 2014-03-06 17:09:24 -08:00
Andrzej Kapolka
3adea84b81 Basic joint data sending. Closes #2166. 2014-03-06 17:07:29 -08:00
ZappoMan
c81bac2ac4 Merge pull request #2224 from birarda/resources 
cleanup switchToResourcesParentIfRequired hack
 2014-03-06 16:51:31 -08:00
Stephen Birarda
0f22168e42 Merge pull request #2230 from ey6es/master 
Add a five second download timeout timer: if that much time passes witho...
 2014-03-06 16:22:54 -08:00
Stephen Birarda
8cbdf5d94a Merge branch 'master' of https://github.com/highfidelity/hifi into resources 2014-03-06 15:49:45 -08:00
Stephen Birarda
ac66f09157 Merge pull request #2194 from AndrewMeadows/cleanup 
g++ warnings
 2014-03-06 15:49:22 -08:00
Andrzej Kapolka
8ec7a5e600 When we time out, report the last received/total counts. 2014-03-06 15:08:34 -08:00
Andrew Meadows
0b2c399713 memcmp() returns a signed int! 2014-03-06 14:33:59 -08:00
Andrzej Kapolka
1468bd1b49 Add a five second download timeout timer: if that much time passes without 
any progress, consider it an error.
 2014-03-06 14:31:13 -08:00
Stephen Birarda
403f91c988 update resource references to use Qt resource system 2014-03-06 10:41:11 -08:00
Philip Rosedale
c2a63c4206 Merge pull request #2190 from AndrewMeadows/shapes 
Collision Shapes
 2014-03-05 17:59:42 -08:00
Philip Rosedale
e4924cdca8 Merge pull request #2202 from birarda/authentication 
remove deprecated qt5 methods in CMakeList files
 2014-03-04 18:30:22 -08:00
Stephen Birarda
231dc624ff replace deprecated qt5 macros in cmake with target_link_libraries 2014-03-04 12:41:24 -08:00
Andrew Meadows
57e217c7fb Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes 2014-03-04 12:10:12 -08:00
Andrew Meadows
d537b4118d Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes 2014-03-04 11:40:59 -08:00
Andrew Meadows
427cf02d03 Merge branch 'cleanup' to 'cleanup2' 2014-03-04 11:20:42 -08:00
Andrew Meadows
1b2db1f7ab fix for warnings about signed/unsigned comparison 2014-03-04 11:07:15 -08:00
Stephen Birarda
f5aaad1f33 remove if checks in cases where delete handles null 2014-03-04 10:05:43 -08:00
Andrew Meadows
e22e022252 Fixing warnings and out-of-range index. 2014-03-04 09:55:32 -08:00
Andrew Meadows
343998a4a8 Adding virtual destructor to Shape class 2014-03-04 09:55:08 -08:00
Andrew Meadows
7ba5bc71ea Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes 
Conflicts:
	interface/src/renderer/FBXReader.cpp
	interface/src/renderer/Model.cpp
	interface/src/renderer/Model.h
 2014-03-04 09:01:24 -08:00
ZappoMan
1a5b0ee02e Merge pull request #2170 from birarda/cmake-quotes 
complete quoting of various cmake commands
 2014-03-04 09:00:26 -08:00
Andrew Meadows
f23dda7317 Less math for the same effect. 2014-03-03 17:34:16 -08:00
Stephen Birarda
bb3a8677be Merge branch 'master' of https://github.com/highfidelity/hifi into cmake-quotes 2014-03-03 16:31:25 -08:00
Andrzej Kapolka
7ecfeeaba3 Do the actual reading of the reply on the worker thread. Otherwise, when we 
read from the cache, we're reading synchronously from a file.  Closes #2171.
 2014-03-03 15:16:13 -08:00
Andrzej Kapolka
9759cd70c0 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-03 14:20:21 -08:00
Andrzej Kapolka
85083d74bc Fix for annoying "QThreadStorage" warning. 2014-03-03 13:39:01 -08:00
Stephen Birarda
1b7d24a79c keep known nodes alive when we receive a packet from them 2014-03-03 12:49:46 -08:00
Stephen Birarda
628f91cd73 complete quoting of varous Cmake commands, closes #1999 2014-03-03 12:15:05 -08:00
Stephen Birarda
60eb588e96 remove some unecessary null pointer checks 2014-03-03 11:36:01 -08:00
ZappoMan
ef87fbffac Merge branch 'master' of https://github.com/worklist/hifi into octree_server_scaling 
Conflicts:
	libraries/shared/src/ResourceCache.cpp
 2014-02-28 16:58:43 -08:00
ZappoMan
c1c41ea2ca handle some shutdown cases and reduce time of locking in octree server 2014-02-28 16:18:02 -08:00
ZappoMan
d2faca9767 fixed some warnings 2014-02-28 16:17:30 -08:00
Andrzej Kapolka
2f27d8ecd3 Process geometry/textures in worker threads (via QThreadPool). Closes #2137. 2014-02-28 16:14:02 -08:00
Andrzej Kapolka
21a149348b When switching models, retain old one until new one is loaded. Closes #2146. 2014-02-28 13:57:25 -08:00
Andrzej Kapolka
73ec568b4b Further work on request limiting. 2014-02-27 19:28:45 -08:00
Andrzej Kapolka
29f7954d20 Factored out bits common to resource caches, added global limit on number of 
resources being requested at any one time.
 2014-02-27 18:13:40 -08:00
Andrew Meadows
b8c1bab4ae Using pre-computed Model shapes for collisions 
...instead of generating collision shapes on the fly
 2014-02-27 17:52:35 -08:00
Andrew Meadows
25bdfd7677 Update to comment. 2014-02-26 15:38:33 -08:00
Andrew Meadows
5954bb91d4 ListShape now handled by ShapeCollider 2014-02-26 15:36:19 -08:00
Andrew Meadows
07eb366138 stubbed out collision handlers for ListShape 2014-02-26 14:32:46 -08:00
Philip Rosedale
0a1e840d10 Bot.js NPCs wander around and make sounds 2014-02-26 13:50:04 -08:00
Andrew Meadows
da0276ac7e ShapeCollider takes CollisionList argument 
Also, adding first pass at ListShape
 2014-02-26 12:10:16 -08:00
ZappoMan
d765e250d5 removed AbstractMenuInterface.h 2014-02-25 20:42:59 -08:00
ZappoMan
42ddc82ac4 possible fix to windows assert 2014-02-25 20:23:38 -08:00
ZappoMan
4b3911c5c1 Merge pull request #2101 from birarda/authentication 
fixes to login/logout flow when jumping domains
 2014-02-25 18:25:17 -08:00
Stephen Birarda
bf3b5c07d5 Merge pull request #2093 from ZappoMan/menu_js 
Adds support for editing application Menus to JS
 2014-02-25 17:40:39 -08:00
Stephen Birarda
d5fc1caaaf fix wording for access token change signal 2014-02-25 16:12:25 -08:00
Stephen Birarda
2496c6252f fix login/logout flow when jumping domains 2014-02-25 16:10:08 -08:00