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

7330 commits

Author SHA1 Message Date
Sam Gateau
e3b3c8e1ef Setting the defalt at a better time of the day 2015-02-26 16:09:21 -08:00
Sam Gateau
e77d4572fa Merge branch 'temp1' of https://github.com/samcake/hifi into temp1 2015-02-26 12:03:39 -08:00
dev
b04dbf7a34 fixing compilation issue on macos 2015-02-26 11:27:40 -08:00
Sam Gateau
38762e882e Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-26 10:53:26 -08:00
Sam Gateau
fcb293d0b2 CLean up before pr 2015-02-26 10:45:00 -08:00
Philip Rosedale
c2e559342a Merge pull request #4341 from AndrewMeadows/bispinor 
load non-moving dynamic objects as "inactive" in physics engine
 2015-02-26 09:21:49 -08:00
Sam Gateau
a757229c0e Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-25 19:18:01 -08:00
Sam Gateau
4959e2924e add an example script to control the sun light 2015-02-25 19:17:38 -08:00
Sam Gateau
6b29e314c2 Adding the Stage of the Scene and exposing control of the sun light from javascript 2015-02-25 19:05:27 -08:00
Andrew Meadows
7b68916010 Merge pull request #4343 from ZappoMan/hangOnExit 
BUG FIX: Hang on exit
 2015-02-25 17:02:26 -08:00
ZappoMan
05d7d47045 some cleanup 2015-02-25 16:32:48 -08:00
ZappoMan
5eecb6a837 correctly delete glbuffers 2015-02-25 14:44:10 -08:00
Leonardo Murillo
006b3ed0ac Merge pull request #4300 from birarda/dependencies 
NOT MERGEABLE - add some externals as cmake external projects
 2015-02-25 13:22:49 -08:00
Brad Hefta-Gaub
e7b36166ec Merge pull request #4340 from huffman/fix-repeat-captured-keys 
Make KeyEvent objects equal even if they have differing isAutoRepeat val...
 2015-02-25 12:24:19 -08:00
Brad Hefta-Gaub
6d237f3f79 Merge pull request #4339 from huffman/fix-plane-pick 
Fix plane pick
 2015-02-25 12:23:45 -08:00
Andrew Meadows
d85be49694 merge upstream/master into andrew/bispinor 2015-02-25 12:08:02 -08:00
Andrew Meadows
5776df1012 load dynamic obj as inactive when not moving 2015-02-25 12:07:19 -08:00
Ryan Huffman
660d9ad499 Make KeyEvent objects equal even if they have differing isAutoRepeat values 2015-02-25 10:28:45 -08:00
Ryan Huffman
14ec9b431e Update findRayRectangleIntersection to set out variable distance 2015-02-25 10:26:44 -08:00
Clément Brisset
b1e46c1bc8 Merge pull request #4337 from ZappoMan/crashonexit 
Fixes to various Crashes on shutdown
 2015-02-25 08:47:36 -08:00
ZappoMan
e87df0017a code review feedback 2015-02-25 08:26:54 -08:00
Brad Hefta-Gaub
97e2e65cb3 Merge pull request #4336 from AndrewMeadows/bispinor 
lower threshold for ignoring rotation updates
 2015-02-24 20:13:22 -08:00
Brad Hefta-Gaub
0f4e098a61 Merge pull request #4334 from huffman/edit-ray-improvement 
Fix BillboardOverlay::findRayIntersection
 2015-02-24 20:13:05 -08:00
Brad Hefta-Gaub
8b47de3150 Merge pull request #4329 from Seefo/master 
Cleaned up warnings on Windows
 2015-02-24 20:08:56 -08:00
ZappoMan
f1017f8a5d simplify waitTillDoneRunning 2015-02-24 17:45:22 -08:00
ZappoMan
310654831c clean up comments remove dead code 2015-02-24 17:34:19 -08:00
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
ZappoMan
25ae001d3b removed extra debugging 2015-02-24 17:05:44 -08:00
Ryan Huffman
03b10b6cb0 Add findRayRectangleIntersection 2015-02-24 17:00:30 -08:00
ZappoMan
9dcea38b2b tweak some debugging 2015-02-24 16:23:39 -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
ZappoMan
fd93b99f03 more hacking on script shutdown behavior 2015-02-24 14:02:46 -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
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
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
Philip Rosedale
d74856e01b add angularVelocity to controller 2015-02-24 11:21:04 -08:00
Seth Alves
5f9af610c2 coding convention 2015-02-24 10:41:58 -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
Andrew Meadows
3cd0a70641 store shapeType whenever it is explicitly changed 2015-02-23 14:35:44 -08:00
Andrew Meadows
456acd8833 merge upstream/master into andrew/bispinor 2015-02-23 11:41:40 -08:00
ZappoMan
7e2d355b56 first cut at properly shutting down timers while shutting down scripts 2015-02-23 11:40:30 -08:00
Andrew Meadows
2e1c122915 moved ShapeType boilerplate stuff macos 2015-02-23 11:38:56 -08:00
Seth Alves
0b9b7f06cc address various comments from code review 2015-02-23 11:12:19 -08:00
Andrew Meadows
0fc4c732f7 use macro for copying shapeType string to script 2015-02-23 10:13:47 -08:00
ZappoMan
1efa7b28b0 removed dead code 2015-02-23 10:04:14 -08:00
Andrew Meadows
0455ccf7be Merge pull request #4313 from ctrlaltdavid/20355 
CR for 20355 - Initial Integration with DDE
 2015-02-23 09:47:19 -08:00