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

18891 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
604b1b620b Move dock window to ToolWindow 2014-11-14 10:52:08 -08:00
Brad Hefta-Gaub
1b6bed89fe Merge pull request #3795 from ctrlaltdavid/geometry-cache-crash-workaround 
Disable model overlay properties example
 2014-11-14 10:42:54 -08:00
Stephen Birarda
903cd05ff8 put newlines back in interface log 2014-11-14 10:39:45 -08:00
Stephen Birarda
86284036f1 put back timestamp in log 2014-11-14 10:35:13 -08:00
David Rowe
20fdd6d811 Disable model overlay properties example 
It causes intermittent crashes in
NetworkGeometry::setTextureWithNameToURL()
 2014-11-14 10:31:30 -08:00
Thijs Wenker
76ae60c5ca fix Ubuntu build 2014-11-14 19:27:27 +01:00
Sam Gateau
f09b58c255 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-14 10:05:01 -08:00
Clément Brisset
7177104d87 Merge pull request #3793 from AndrewMeadows/bispinor 
fix warning about function terminating with no return call
 2014-11-14 09:58:27 -08:00
Sam Gateau
642f436fba first draft of factorizing the rendering traversal for both sides in stereo 2014-11-14 09:56:36 -08:00
ZappoMan
11058355a0 implement aboutToFinish for persist thread to allow final save before shutdown 2014-11-14 09:55:32 -08:00
Andrew Meadows
5ba213f8d1 fix for function override with no return 2014-11-14 09:33:11 -08:00
AndrewMeadows
edc599bc2d Merge pull request #3792 from ZappoMan/bugFixes 
fix a couple bugs
 2014-11-14 08:33:49 -08:00
Atlante45
4afcf9b240 Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame 2014-11-14 08:29:22 -08:00
ZappoMan
7b69642c67 fix bug in animation jitter on turn 2014-11-13 23:03:12 -08:00
ZappoMan
744f9bc508 better handle corrupt packets that would cause unreasonably deep recursion 2014-11-13 22:26:18 -08:00
ZappoMan
5da0d1e55a fix regexs for dangerously deep recurssion suppression 2014-11-13 20:53:31 -08:00
Brad Hefta-Gaub
db2b5fc28d Merge pull request #3791 from ctrlaltdavid/20128 
CR for Job #20128 - Make leapHands.js compensate for avatars without wrist joints
 2014-11-13 20:44:43 -08:00
Brad Hefta-Gaub
3441167838 Merge pull request #3790 from Atlante45/entities_userdata 
Entities userdata
 2014-11-13 20:43:57 -08:00
Brad Hefta-Gaub
27c37f3a4e Merge pull request #3784 from ctrlaltdavid/20157 
CR for Job #20157 - Enable "Get Overlay properties" from javascript
 2014-11-13 20:43:38 -08:00
Ryan Huffman
3658d65028 Remove grid tool from menu 2014-11-13 20:02:19 -08:00
ZappoMan
6a4f1c857f fix a couple bugs 2014-11-13 18:35:04 -08:00
Ryan Huffman
a6f027e33a Fix entity edit grid not hiding when disabling tools 2014-11-13 18:31:32 -08:00
Atlante45
4c35f8e325 Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame 2014-11-13 18:06:30 -08:00
Ryan Huffman
6b2a497810 Merge branch 'master' of github.com:highfidelity/hifi into entity-tool-grid-fixes 2014-11-13 17:48:17 -08:00
Ryan Huffman
03f155bcd8 Add tool window 2014-11-13 17:47:02 -08:00
Ryan Huffman
55612cc596 Add title to WebWindowClass 2014-11-13 17:46:20 -08:00
Atlante45
ce73f75e7d Merge branch 'entities_userdata' into chessgame 2014-11-13 17:45:55 -08:00
Atlante45
f914f02a0b Move user data to end of enum 2014-11-13 17:44:22 -08:00
Ryan Huffman
49563dbff7 Add entityProperties tool window 2014-11-13 17:41:51 -08:00
Ryan Huffman
4254d38cdd Update buttons to grid tool 2014-11-13 17:40:21 -08:00
Chris Collins
c55f76d7ef Apply alpha to text from 0 - .9 
Apply alpha to text from 0 - .9
 2014-11-13 17:27:05 -08:00
Atlante45
9fc7451581 Move macros to the end 2014-11-13 17:06:57 -08:00
Atlante45
40576b3c03 moved append to the end 2014-11-13 17:02:45 -08:00
Atlante45
f8be98260c String specific macros 2014-11-13 16:32:15 -08:00
Philip Rosedale
4e11191856 Merge pull request #3789 from birarda/lobby 
use ResourceCache for Sound files so they are cached too
 2014-11-13 16:30:06 -08:00
Atlante45
aae02328ca Merge branch 'master' of https://github.com/highfidelity/hifi into entities_userdata 2014-11-13 16:20:29 -08:00
Stephen Birarda
7630aab963 only debug request sound if there is a network request 2014-11-13 16:18:19 -08:00
Atlante45
f47620231e Entities have user data 2014-11-13 16:16:20 -08:00
samcake
c3f764091e Merge pull request #3788 from ZappoMan/modelSceneRendering 
More work on model scene rendering
 2014-11-13 15:45:33 -08:00
Thijs Wenker
e964741e30 added OverlayPreloader and made a bunch of clones 2014-11-14 00:01:51 +01:00
Stephen Birarda
cfa2912877 use new SoundCache across scripts 2014-11-13 15:01:45 -08:00
Stephen Birarda
f27367a0c1 fix audio-mixer muting for injectors 2014-11-13 15:00:40 -08:00
Stephen Birarda
de5881818b update playSound to new sound interface 2014-11-13 14:54:48 -08:00
David Rowe
8076bfea72 Merge branch 'master' into 20157 
Conflicts:
	interface/src/ui/overlays/Text3DOverlay.cpp
 2014-11-13 14:53:57 -08:00
ZappoMan
49ef6f8be0 some cleanup 2014-11-13 14:53:37 -08:00
ZappoMan
3ff89be3fd actually only pick programs once 2014-11-13 14:51:47 -08:00
Stephen Birarda
8a03738c83 give a Sound cache to the assignment-client 2014-11-13 14:48:18 -08:00
Stephen Birarda
e10d132f75 avoid Qt QTimer thread bug by putting SoundCache on same thread 2014-11-13 14:47:28 -08:00
ZappoMan
d7d7db4494 Merge branch 'master' of https://github.com/highfidelity/hifi into modelSceneRendering 2014-11-13 14:47:15 -08:00
ZappoMan
7ba3c74bc0 more work on render model scenes 2014-11-13 14:47:02 -08:00