Commit graph

30377 commits

Author SHA1 Message Date
Brad Hefta-Gaub
542b124146 first cut at breakdance toy 2015-08-27 16:12:33 -07:00
Philip Rosedale
d0db56a4a6 Merge pull request #5667 from howard-stearns/rig-menu-toggle
Rig Menu Toggle and new animations
2015-08-27 13:52:12 -07:00
Leonardo Murillo
dd5d58a5e1 Merge pull request #5663 from birarda/master
don't request a cert from peer in HTTPSManager
2015-08-27 12:46:24 -07:00
Howard Stearns
96c74ebbd5 Enable Rig Animations is now a developer menu item (rather than requiring javascript to set). Also turning it off resets you to bind pose and deliberately throws away old animations.
Default animations are the new ones for our standard T-pose. (Had been for the double-A pose fightbot.)
Rig state machine now does "backup", and doesn't apply strafe while turning.
2015-08-27 12:25:40 -07:00
Brad Hefta-Gaub
79a9694d4a Merge pull request #5648 from ctrlaltdavid/20663
Clean Interface.ini after a crash
2015-08-27 10:52:25 -07:00
Brad Hefta-Gaub
176860c612 Merge pull request #5649 from larsnaesbye/master
Move i18n to own dir, update FA
2015-08-27 10:46:29 -07:00
Brad Hefta-Gaub
7b2f944f48 Merge pull request #5561 from ericrius1/particleExtensions
Extended Particle entity to allow for more varied effects
2015-08-27 10:45:03 -07:00
Brad Hefta-Gaub
87c604a475 Merge pull request #5655 from jherico/sideshow-bob
Fixing framerate limit, moving vsync to 2d plugin
2015-08-26 16:44:35 -07:00
Brad Davis
270f2f7a3b Fixing framerate limit, moving vsync to 2d plugin 2015-08-26 15:47:45 -07:00
Brad Davis
8cd13cad00 Merge pull request #5661 from sethalves/linux-memory-debugger
call setup_memory_debugger from common macros rather than from everywhere
2015-08-26 15:43:08 -07:00
Andrew Meadows
0835b79e33 Merge pull request #5646 from birarda/ds-cleanup
de-bloat the domain-server by adding a gatekeeper
2015-08-26 15:42:43 -07:00
Brad Hefta-Gaub
cd2cd90d8f Merge pull request #5664 from sethalves/quiet-obj-reader
ifdef out debug prints in OBJ reader
2015-08-26 15:32:17 -07:00
Seth Alves
f53704051f ifdef out debug prints in OBJ reader 2015-08-26 15:09:58 -07:00
Stephen Birarda
cd7d0f383b allow editors who can't be verified in the short term 2015-08-26 15:07:29 -07:00
Seth Alves
d2eb3108d5 Merge pull request #5644 from howard-stearns/eye-correction-application
eye correction correction
2015-08-26 14:46:48 -07:00
Stephen Birarda
0fc2713be1 don't request a cert from peer in HTTPSManager 2015-08-26 12:40:09 -07:00
Anthony Thibault
b5bfc84521 Merge pull request #5662 from AndrewMeadows/copper
fix Vectors::MIN
2015-08-26 11:54:59 -07:00
Andrew Meadows
f857ccfe16 fix Vectors::MIN 2015-08-26 11:46:50 -07:00
ericrius1
5586c2ff17 fixed ordering of bitsream reading for old svo files with particle entities 2015-08-26 11:45:19 -07:00
Seth Alves
695ffa29c7 call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
ericrius1
f25b75093c cleaned up conditional bitstream parsing 2015-08-26 09:44:29 -07:00
Brad Hefta-Gaub
aa80fc9127 Merge pull request #5653 from jherico/homer
Remove items from the VR menu properly
2015-08-26 09:14:48 -07:00
Andrew Meadows
45c846572e Merge pull request #5645 from jherico/maggie
Fixing problems reported by static analysis tool
2015-08-26 08:31:05 -07:00
Brad Hefta-Gaub
b19f1e0631 Merge pull request #5658 from ctrlaltdavid/20653
Add Desktop object to JavaScript with width and height properties
2015-08-25 23:18:20 -07:00
Brad Hefta-Gaub
1cd699de9d Merge pull request #5657 from birarda/master
fix for 0 entity avg ping
2015-08-25 22:27:44 -07:00
Brad Hefta-Gaub
029c59fb77 Merge pull request #5654 from jherico/barney
Fix stereo modes aspect ratio
2015-08-25 22:16:30 -07:00
Brad Hefta-Gaub
5d5c1584c3 Merge pull request #5659 from jherico/nelson
Fix UserInputMapper event generation
2015-08-25 22:14:37 -07:00
samcake
fda9827100 Merge pull request #5529 from SeijiEmery/gputest
gputest
2015-08-25 20:03:08 -07:00
Brad Davis
d311e4f2ea Fixing problems reported by static analysis tool 2015-08-25 19:18:55 -07:00
Brad Davis
073567558e Fix UserInputMapper event generation 2015-08-25 19:15:06 -07:00
Brad Davis
f176003dad Fixing aspect ratio on stereo plugins 2015-08-25 19:05:31 -07:00
Brad Davis
0aaa07a2de Remove items from the QML version of the menu when they are removed from the main menu 2015-08-25 19:05:29 -07:00
Seiji Emery
d29a368688 removed debug 2015-08-25 16:50:09 -07:00
Seiji Emery
140edd0589 try removing quotes... 2015-08-25 16:21:38 -07:00
David Rowe
9d3d104ec3 Add Desktop object to JavaScript with width and height properties 2015-08-25 16:13:36 -07:00
Seiji Emery
248d0729a6 test 2015-08-25 15:29:36 -07:00
Seiji Emery
62dc83fa32 test 2015-08-25 15:00:21 -07:00
Seiji Emery
3d59f8d7e8 changed setup_project to only use the generated shader source files 2015-08-25 14:40:52 -07:00
Stephen Birarda
c776f04ab2 don't allow in a user who should have edit but not verified 2015-08-25 14:36:22 -07:00
David Rowe
1f541832b6 Reword dialog 2015-08-25 14:24:15 -07:00
Seiji Emery
316ddd68ef force cmake autoscribe to use full paths 2015-08-25 13:46:50 -07:00
Stephen Birarda
6f14eb2206 fix for 0 entity avg ping 2015-08-25 12:35:34 -07:00
Clément Brisset
08ee5cbc17 Merge pull request #5656 from howard-stearns/fix-direct-url-avatars
fix direct-url avatars
2015-08-25 21:30:05 +02:00
Howard Stearns
6508d5943a textChanged has to do something 2015-08-25 11:29:27 -07:00
David Rowe
7c8ff4dcbd If Interface.ini doesn't contain crash option value assume default 2015-08-25 11:07:55 -07:00
David Rowe
a98a867b06 Delete Interface.ini.lock before accessing to check crash option 2015-08-25 11:07:20 -07:00
Stephen Birarda
9940f375ea repairs for CR comments 2015-08-25 10:02:43 -07:00
Howard Stearns
2ed6900c7e Clear the brush, clear the cobwebs, and set the other orientations now that we're clear on what coordinate system we're in. 2015-08-25 09:55:04 -07:00
Philip Rosedale
ff3a0480fe Merge pull request #5652 from birarda/master
tweaks to domain-server web interface
2015-08-24 21:36:52 -07:00
Brad Davis
f9f5743fd7 Merge pull request #5650 from ZappoMan/fixCrashInController
Fix a couple crashes in the Controller scripting interface
2015-08-24 18:49:50 -07:00