Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:16:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
38521 commits 71 branches 56 tags 1.2 GiB
Commit graph

38521 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
db7e4eee8f Make Ctrl-O and 'Running Scripts->load file' follow the same code path 2016-01-28 15:52:11 -08:00
Brad Davis
1324525ecc Make file dialog compatible with QFileDialog::getOpenFile 2016-01-28 15:50:57 -08:00
Stephen Birarda
0c2805db7e remove debug added to catch injector DOS 2016-01-28 15:50:04 -08:00
Brad Davis
af1180aadb Fix combobox in modal windows 2016-01-28 15:47:42 -08:00
Stephen Birarda
311f1ac0e3 fix for overflow on time of next frame 2016-01-28 15:38:33 -08:00
samcake
9c5670fc0f Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-01-28 15:31:56 -08:00
samcake
972d4cda77 Adding better octree visualization 2016-01-28 15:31:24 -08:00
David Rowe
2020514974 Move OpenGLVersionChecker to gl library 2016-01-29 12:29:21 +13:00
David Rowe
b7134c75c3 Rename OpenGLInfo to OpenGLVersionChecker 2016-01-29 12:14:47 +13:00
Anthony J. Thibault
d743ea2c9b Changed urls from s3-us-west-1 to hifi-content.s3 2016-01-28 14:20:10 -08:00
Anthony J. Thibault
8710029604 Changed urls to http and updated hand poses. 2016-01-28 14:12:52 -08:00
Zach Pomerantz
02d530ccc8 Merge pull request #6971 from samcake/hdr 
Fixing the default value for the TOneMapping curve
 2016-01-28 14:09:41 -08:00
ericrius1
628158e2fb Merge branch 'master' into zoneEntityProps 2016-01-28 13:26:10 -08:00
Ryan Huffman
15db8040d8 Merge pull request #6961 from birarda/resampling-error 
fix a couple of resampling errors in Sound downSample
 2016-01-28 13:22:00 -08:00
ericrius1
c30109ec29 trying to sync again 2016-01-28 13:21:48 -08:00
Ryan Huffman
d39ab952f7 Merge pull request #6973 from birarda/injector-dos 
add some debug for AudioInjector DOS case
 2016-01-28 13:14:54 -08:00
samcake
5863e340af Cleaner... 2016-01-28 12:46:18 -08:00
samcake
ef451d40df Cleaner... 2016-01-28 12:39:52 -08:00
Brad Hefta-Gaub
49bbf42995 Merge pull request #6960 from sethalves/fix-adjust-edit-packet-for-clock-skew 
don't adjust a time of '0 usecs since epoch' with clock skew in edit packets
 2016-01-28 12:31:27 -08:00
Brad Hefta-Gaub
da709f3f56 Merge pull request #6968 from imgntn/nodebugheap 
Document the _NO_DEBUG_HEAP trick
 2016-01-28 12:29:25 -08:00
Howard Stearns
33226796ff Merge pull request #6964 from ericrius1/editHref 
Validate href entity property (hifi:// only)
 2016-01-28 12:29:18 -08:00
Stephen Birarda
79c6ed9739 add some debug for AudioInjector DOS case 2016-01-28 12:22:36 -08:00
Brad Davis
c41500f9d2 Running scripts can now show script URL 2016-01-28 12:21:44 -08:00
samcake
62d5a45829 Cleaner init 2016-01-28 12:20:09 -08:00
samcake
bf3a09cd00 Fixing the default value for the TOneMapping curve and cleaning the code into the ToneMappingEffect file 2016-01-28 12:14:20 -08:00
ericrius1
98453c085b Moved source URL up to top of entity properties panel 2016-01-28 12:08:21 -08:00
Andrew Meadows
3e35a5fc2d Merge pull request #6937 from ctrlaltdavid/20790 
Make entity properties be undefined after entity is unloaded
 2016-01-28 11:59:01 -08:00
ericrius1
3fff5868e8 Fix syntax error 2016-01-28 11:57:33 -08:00
ericrius1
40c66a94be Moves text props to top of Entity Props panel 2016-01-28 11:44:50 -08:00
James B. Pollack
9cb768bcbd document no debug heap trick 2016-01-28 11:42:51 -08:00
samcake
a2a9227d28 Merging with master 2016-01-28 11:37:24 -08:00
ericrius1
191e6090e7 Moves zone props to top of entity props panel 2016-01-28 11:36:23 -08:00
Howard Stearns
bff3362f94 Merge pull request #6953 from jherico/qml 
More small fixes
 2016-01-28 11:22:40 -08:00
samcake
0c50903030 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-01-28 11:19:37 -08:00
Anthony Thibault
85843cff39 Merge pull request #6955 from AndrewMeadows/stable-judasboots 
apply "hips offset" to root of state graph
 2016-01-28 11:13:11 -08:00
Brad Davis
04e6a5360a Renaming preference dialog variable 2016-01-28 10:29:21 -08:00
samcake
54b9c1ac0d Merge pull request #6962 from zzmp/feat/task-io 
Reduce code duplication for render::Job::Model
 2016-01-28 09:31:26 -08:00
samcake
23f2c98834 fixing the addressing issue 2016-01-28 09:23:45 -08:00
Brad Davis
18d6a09dc9 Better preferences dialog initial state 2016-01-28 09:20:31 -08:00
Brad Davis
d9651c6d4b Allow user browser to work with marketplace 2016-01-28 09:20:29 -08:00
samcake
6d8c33b996 Merging with upstream and still debugging the cell navigation math 2016-01-27 18:59:45 -08:00
samcake
20e1270e92 Merging with upstream and still debugging the cell navigation math 2016-01-27 18:59:18 -08:00
David Rowe
af3d842e60 Warn user if OpenGL version is too low (< 4.1) 2016-01-28 15:25:00 +13:00
Anthony J. Thibault
4e4627d039 avatar-animation.json: Updated standard animations 2016-01-27 17:08:49 -08:00
Stephen Birarda
0a386cdde8 remove trimFrames call from Sound 2016-01-27 16:10:18 -08:00
ericrius1
cd5e81de36 Validating href for edit.js 2016-01-27 16:02:02 -08:00
Andrew Meadows
7b5c221ceb Merge pull request #6956 from hyperlogic/tony/velocity-fix 
MyAvatar: copy body velocity + hmd follow velocity onto avatar
 2016-01-27 14:59:46 -08:00
Seth Alves
8286a037b0 Merge pull request #6941 from imgntn/dicelocation 
Update dice location in toybox
 2016-01-27 14:49:21 -08:00
Andrew Meadows
1b45f5cc0c tweaks to neck and spine constraints 2016-01-27 14:45:09 -08:00
Andrew Meadows
f67a20ee68 apply _hipsOffset in hips local-frame 2016-01-27 14:45:08 -08:00