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

38407 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
Brad Davis
af1180aadb Fix combobox in modal windows 2016-01-28 15:47:42 -08:00
Brad Davis
c41500f9d2 Running scripts can now show script URL 2016-01-28 12:21:44 -08:00
Brad Davis
04e6a5360a Renaming preference dialog variable 2016-01-28 10:29:21 -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
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
Anthony Thibault
3cdd88e06c Merge pull request #6951 from ZappoMan/fixAnimationRestart 
fix for animations stopping after domain restart
 2016-01-27 14:31:27 -08:00
Stephen Birarda
f3903022f2 Merge pull request #6958 from huffman/injector-timing-fixes 
Fix injector looping issues when using audio that isn't a multiple of the sample size
 2016-01-27 14:29:30 -08:00
samcake
f4e0352f61 Merge pull request #6930 from zzmp/feat/bubble-render-settings 
Bubble up render settings from CPP to JS/QML
 2016-01-27 14:20:51 -08:00
Ryan Huffman
2ec201b85e Fix conversion warning 2016-01-27 14:13:23 -08:00
Ryan Huffman
7e5eec55da Fix non-looped injected audio possibly looping 2016-01-27 13:47:32 -08:00
Ryan Huffman
4de8e7a3c8 Add audio resizing in injector 2016-01-27 13:47:09 -08:00
James B. Pollack
86b2a67f72 Merge pull request #6891 from sethalves/avatar-updates-query-cube 
Avatar updates query cube
 2016-01-27 13:04:03 -08:00
Howard Stearns
f00ec8de5d Merge pull request #6947 from huffman/fix-entity--mkdir 
Update entity server to always make resource directory if it does not…
 2016-01-27 13:03:00 -08:00
Brad Hefta-Gaub
5ea4cb6900 Merge pull request #6949 from birarda/installer-sixense 
pull missing Sixense DLLs from external project
 2016-01-27 12:17:59 -08:00
Stephen Birarda
6385309c9d Merge pull request #6939 from huffman/injector-timing-fixes 
Injector timing fixes
 2016-01-27 11:34:26 -08:00
Anthony J. Thibault
c771c925c8 MyAvatar: copy body velocity + hmd follow velocity onto avatar 
This was inadvertently removed in a previous PR.

https://github.com/highfidelity/hifi/pull/6895

Also, renamed Velocity stat to Speed.
 2016-01-27 11:20:32 -08:00
Seth Alves
18a1f0884e Merge pull request #6884 from ericrius1/junkyardReset 
Junkyard reset script
 2016-01-27 11:19:02 -08:00
Ryan Huffman
8764eda479 Merge branch 'master' of https://github.com/highfidelity/hifi into injector-timing-fixes 2016-01-27 11:03:52 -08:00
Howard Stearns
0d257b82fa Merge pull request #6934 from hyperlogic/tony/anim-pre-post-rot-support 
Avatar Developer Menu: added animation debug options
 2016-01-27 10:39:25 -08:00
Ryan Huffman
607f23618d Fix compiler warning for float->int conversion 2016-01-27 10:36:44 -08:00
Ryan Huffman
a3b2dd2295 Add proper loop handling in injector 2016-01-27 10:14:05 -08:00
Brad Hefta-Gaub
dc6662d115 Merge pull request #6943 from jherico/attachments 
Attachment dialog in overlay
 2016-01-26 22:51:40 -08:00
Brad Davis
f53aaa1d64 Removing old attachment dialog, updating menu code 2016-01-26 21:55:42 -08:00
Brad Davis
2956557c5f Adding overlay compatible combo-box 2016-01-26 21:55:41 -08:00
Brad Davis
664100b9b1 Attachment dialog 2016-01-26 21:55:40 -08:00
Brad Hefta-Gaub
881a94cd19 Merge pull request #6950 from jherico/qml 
Small QML fixes
 2016-01-26 21:30:46 -08:00
Zach Pomerantz
49c1285837 Add suffix Mode to DebugMode enum to avoid collision 2016-01-26 19:11:59 -08:00
Zach Pomerantz
e770d7b679 Add PhysicsShowOwned back to Menu 2016-01-26 18:56:52 -08:00
Brad Davis
0a6be80578 Added some disabled modal focus protection code 2016-01-26 18:50:55 -08:00
Brad Hefta-Gaub
f178fc789c fix for animations stopping after domain restart 2016-01-26 18:44:34 -08:00
Brad Davis
fbee221966 Fix tool window breaking when visible while edit.js reloads 2016-01-26 18:15:41 -08:00
Zach Pomerantz
4354eae129 Fix type, gaussion->gaussian 2016-01-26 18:09:18 -08:00
Brad Davis
9a8d56da77 Center new windows without a defined position 2016-01-26 17:25:36 -08:00
Brad Davis
fee920723a Cleaning up test project 2016-01-26 17:25:20 -08:00
Anthony Thibault
0fdfb69cae Merge pull request #6938 from AndrewMeadows/reduce-hip-swing 
reduce hips swing driven by head orientation when wearing HMD
 2016-01-26 17:00:31 -08:00
Brad Davis
940b095013 Removing menu logspam 2016-01-26 16:59:37 -08:00
Brad Davis
5f38c5265c Fixing potential crash in dialog popups 2016-01-26 16:59:19 -08:00
Brad Davis
cea57a111b Desktop cleanup 2016-01-26 16:56:33 -08:00
Brad Davis
8dc066fc00 Fix the recursive launching of load script from URL 2016-01-26 16:49:23 -08:00
Ryan Huffman
2717c027e8 Merge pull request #6932 from birarda/console 
various installer fixes and improvements
 2016-01-26 16:39:31 -08:00
Stephen Birarda
8ba0e3bc6e give dev shortcuts a specific name too 2016-01-26 16:21:18 -08:00
Zach Pomerantz
5009e8702e Cleanup new render settings 2016-01-26 15:58:50 -08:00
Stephen Birarda
e6a8fd192c use the VS2011 DLLs bundled with sixense for installer 2016-01-26 15:54:08 -08:00
James B. Pollack
d8dbb717d5 Update junkyardResetEntityScript.js 2016-01-26 14:06:17 -08:00
Ryan Huffman
a731a571e0 Update entity server to always make resource directory if it does not exist 2016-01-26 13:50:58 -08:00
Anthony J. Thibault
33993b8c44 AnimClip: removed unused static member. 2016-01-26 13:34:21 -08:00