Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 11:17:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
22550 commits 76 branches 59 tags 1.2 GiB
Commit graph

22550 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kodey
a0a1564720 Merge branch '20305' of https://github.com/virneo/hifi into 20305 2015-02-25 08:45:29 +05:30
Kodey
a5aeb3b980 cmake changes for building on linux 2015-02-25 08:45:00 +05:30
Virendra Singh
9a153a6506 Time measurement 
Used c++11 chrono class to measure elapsed time.
 2015-02-25 08:36:58 +05:30
Virendra Singh
c15c549881 Code formatting 2015-02-25 07:47:00 +05:30
ZappoMan
f1017f8a5d simplify waitTillDoneRunning 2015-02-24 17:45:22 -08:00
Seth Alves
5c5ffc07ab allow client count to drift as needed if the user doesn't specify --min or --max 2015-02-24 17:43:08 -08:00
ZappoMan
310654831c clean up comments remove dead code 2015-02-24 17:34:19 -08:00
Kodey
7a182d0a98 update 
Merge branch 'master' of git://github.com/highfidelity/hifi into 20305
 2015-02-25 07:00:55 +05:30
Andrew Meadows
0456cb298f lower threshold for ignoring rotation updates 
one hundred fold smaller
 2015-02-24 17:16:00 -08:00
ZappoMan
eab09eaf28 removed extra debugging 2015-02-24 17:15:58 -08:00
Seth Alves
0c28e220d1 Merge branch 'assignment-client-keep-a-spare-again' of github.com:sethalves/hifi into assignment-client-keep-a-spare-x 2015-02-24 17:10:32 -08:00
Seth Alves
89ebb45c03 Revert "Merge pull request #4332 from birarda/master" 
This reverts commit 3230857b0d, reversing
changes made to 1b669af79d.
 2015-02-24 17:09:05 -08:00
ZappoMan
25ae001d3b removed extra debugging 2015-02-24 17:05:44 -08:00
Ryan Huffman
eb21b74439 Replace Planar3DOverlay::findRayIntersection with GeometryUtil::findRayRectangleIntersection 2015-02-24 17:01:24 -08:00
Ryan Huffman
be7959bbcd Fix BillboardOverlay findRayIntersection implementation 2015-02-24 17:00:55 -08:00
Ryan Huffman
03b10b6cb0 Add findRayRectangleIntersection 2015-02-24 17:00:30 -08:00
Seth Alves
c9d6a44c3a fix up command-line parsing 2015-02-24 16:56:13 -08:00
ZappoMan
9dcea38b2b tweak some debugging 2015-02-24 16:23:39 -08:00
ZappoMan
89f7f2da2e don't do idle process and painting if we're shutting down the application 2015-02-24 15:57:34 -08:00
ZappoMan
8757600a5e ifdef around massive debug output 2015-02-24 15:57:13 -08:00
ZappoMan
ca432a415f Merge branch 'master' of https://github.com/highfidelity/hifi into crashonexit 2015-02-24 15:33:41 -08:00
Stephen Birarda
e7e7323ff0 pass 10.9 SDK as CMAKE_OSX_SYSROOT 2015-02-24 15:00:41 -08:00
Ryan Huffman
89c10ca2ec Fix BillboardOverlay::findRayIntersection 2015-02-24 14:36:24 -08:00
ZappoMan
fd93b99f03 more hacking on script shutdown behavior 2015-02-24 14:02:46 -08:00
Stephen Birarda
d52ba5e958 call windeployqt after fixup_bundle for qt plugins 2015-02-24 13:20:17 -08:00
Leonardo Murillo
3230857b0d Merge pull request #4332 from birarda/master 
revert the spare assignment-client work for now
 2015-02-24 12:32:34 -08:00
Stephen Birarda
09ffcbb2e8 Revert "Merge pull request #4324 from sethalves/assignment-client-keep-a-spare" 
This reverts commit 087e2babde, reversing
changes made to 5202d2136a.
 2015-02-24 12:30:40 -08:00
Stephen Birarda
5750d4bad0 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-02-24 12:27:21 -08:00
Andrew Meadows
1b669af79d Merge pull request #4307 from Atlante45/fix_warnings 
Fix warnings
 2015-02-24 12:19:32 -08:00
Andrew Meadows
efcac708b6 Merge pull request #4331 from PhilipRosedale/master 
Toyball is a textured baseball, added ability to get controller angular velocity
 2015-02-24 12:19:20 -08:00
Philip Rosedale
573390b429 fix dice for collision shapes, add angular velocity 2015-02-24 11:55:41 -08:00
Philip Rosedale
9d021a1a1e remove unused line 2015-02-24 11:49:12 -08:00
Philip Rosedale
7489b468f3 give angular velocity to the thrown ball 2015-02-24 11:48:35 -08:00
Stephen Birarda
087e2babde Merge pull request #4324 from sethalves/assignment-client-keep-a-spare 
Assignment client keep a spare
 2015-02-24 11:40:43 -08:00
samcake
5202d2136a Merge pull request #4319 from huffman/avatar-billboards 
Fix avatar billboards all rendering as the same billboard
 2015-02-24 11:22:38 -08:00
Philip Rosedale
d74856e01b add angularVelocity to controller 2015-02-24 11:21:04 -08:00
Ryan Huffman
c9818c184a Update editEntities to turn off when switching domains 2015-02-24 10:47:55 -08:00
Ryan Huffman
4641bd0cd9 Add Window.domainChanged signal for scripting 2015-02-24 10:47:37 -08:00
Seth Alves
88920ad3aa Merge branch 'assignment-client-keep-a-spare' of github.com:sethalves/hifi into assignment-client-keep-a-spare 2015-02-24 10:42:22 -08:00
Seth Alves
5f9af610c2 coding convention 2015-02-24 10:41:58 -08:00
Seth Alves
f5a7a19bc3 coding convention 2015-02-24 10:41:20 -08:00
Seefo
ab590440be Cleaned up warnings on Windows 2015-02-23 22:15:24 -05:00
ZappoMan
6be8f4c0ec more work on improving shutdown behavior 2015-02-23 17:32:31 -08:00
Stephen Birarda
086960f8af clarify the build guide for nmake and msbuild 2015-02-23 16:10:42 -08:00
Stephen Birarda
71dd443ae2 also call fixup_bundle for release builds on win 2015-02-23 15:29:43 -08:00
Brad Hefta-Gaub
af99a5d07b Merge pull request #4325 from AndrewMeadows/bispinor 
use strings for shapeType in JS Entity properties
 2015-02-23 15:11:57 -08:00
Andrew Meadows
3cd0a70641 store shapeType whenever it is explicitly changed 2015-02-23 14:35:44 -08:00
Stephen Birarda
87ce55cc42 add new macro file for fixup libs 2015-02-23 13:24:53 -08:00
Stephen Birarda
8be707f63f rename add paths macro for fixup_bundle 2015-02-23 13:24:21 -08:00
Stephen Birarda
bae5d987f9 add OpenSSL lib path to paths for fixup 2015-02-23 13:21:45 -08:00