Commit graph

42921 commits

Author SHA1 Message Date
Brad Hefta-Gaub
530a06f5f5 Merge pull request #7802 from sethalves/ignore-my-own-actions-on-net
keep track of actions we are editing and ignore updates from server for these actions
2016-05-02 17:58:49 -07:00
Seth Alves
1da041de9b don't consume the physics related property changes from the packet that informs us that we are the simulationOwner of an entity 2016-05-02 15:09:08 -07:00
Seth Alves
ae8f502808 keep track of actions we are editing and ignore updates from server for these actions 2016-05-02 14:23:36 -07:00
Clément Brisset
2ef87557fc Merge pull request #7798 from zzmp/clean/override
Fix warnings on vanilla XCode compilations
2016-05-02 10:56:07 -07:00
Brad Hefta-Gaub
cddcac60c1 Merge pull request #7768 from ctrlaltdavid/20891
Add Interface "Home" bookmark function
2016-05-02 10:14:57 -07:00
Brad Hefta-Gaub
a447ce4633 Merge pull request #7770 from AndrewMeadows/avoid-crosseyes
don't cross the eyes
2016-05-02 10:13:25 -07:00
Brad Hefta-Gaub
e117f280cc Merge pull request #7779 from zzmp/fix/fst-crash
Avoid crashing on missed pipelines
2016-05-02 10:12:17 -07:00
Brad Hefta-Gaub
44fb572248 Merge pull request #7775 from ctrlaltdavid/20896
Use UI Toolkit border styles for various dialogs
2016-05-02 10:11:29 -07:00
Brad Hefta-Gaub
d599d008c3 Merge pull request #7757 from imgntn/cellProduction
Move cellscience to production s3 bucket
2016-05-02 10:11:08 -07:00
Eric Levin
f1de590835 updated script 2016-04-30 14:45:28 -07:00
Zach Pomerantz
13945aa4d9 Annotate all virtual fns with override 2016-04-30 13:48:59 -07:00
Ryan Huffman
5dadfa9e7e Merge pull request #7792 from Atlante45/fix/crash-asset-request
Fix dangling reference into container
2016-04-29 17:58:11 -07:00
Atlante45
6d9080162c Make slots private method 2016-04-29 17:39:53 -07:00
Clément Brisset
ddde4e2dc4 Merge pull request #7793 from imgntn/toyboxProduction
Move Toybox Domain to Production s3
2016-04-29 13:27:09 -07:00
Clément Brisset
7c813cdc7b Merge pull request #7795 from imgntn/dicefix
Fix the dice in /tutorials
2016-04-29 13:26:45 -07:00
James B. Pollack
fc82780512 move toolbars to production 2016-04-29 11:04:04 -07:00
James B. Pollack
e61f8524c1 update dice path 2016-04-29 11:01:19 -07:00
Brad Hefta-Gaub
d2d4ba277d Merge pull request #7791 from birarda/anon-events
use a setting handle for UAL disabled to fix startup race
2016-04-28 19:11:09 -07:00
James B. Pollack
4fd6647d0b add rave stick entity script 2016-04-28 18:25:09 -07:00
James B. Pollack
45bb91cb0b planky 2016-04-28 18:20:20 -07:00
James B. Pollack
d7d667c99b add utils scripts 2016-04-28 18:17:38 -07:00
Stephen Birarda
09981db834 use a setting handle for UAL disabled to fix startup race 2016-04-28 18:05:06 -07:00
Atlante45
9a7bebaaa2 Fix dangling reference into container 2016-04-28 18:04:04 -07:00
James B. Pollack
f73ef9b4a9 cleanup 2016-04-28 18:03:38 -07:00
James B. Pollack
366d9869e6 convert the rest 2016-04-28 18:03:18 -07:00
Brad Hefta-Gaub
19e069f6ef Merge pull request #7790 from birarda/anon-events
don't require authentication to send usage data
2016-04-28 18:01:33 -07:00
James B. Pollack
5e31c5f385 convert flashlight and music player 2016-04-28 17:44:14 -07:00
James B. Pollack
a9c95d8e7c convert flappy avatars 2016-04-28 17:42:33 -07:00
David Rowe
6b8109f164 Fix avatar browser top border height and remove separate "close" button 2016-04-29 12:42:10 +12:00
James B. Pollack
cf2d82d320 convert cat and doll 2016-04-28 17:19:35 -07:00
Stephen Birarda
6883891748 don't require authentication to send user activity 2016-04-28 17:08:40 -07:00
Brad Hefta-Gaub
e92e4e57b1 Merge pull request #7772 from AndrewMeadows/minor-optimizations
minor cleanup and optimizations around EntityItem::getDimensions()
2016-04-28 17:04:42 -07:00
Brad Hefta-Gaub
647ec69aaf Merge pull request #7789 from imgntn/movetemplates
Move developer templates into a different location
2016-04-28 17:02:42 -07:00
Brad Hefta-Gaub
e881cba502 Merge pull request #7777 from ctrlaltdavid/20897
Move directory, examples, and edit toolbar buttons down a bit
2016-04-28 17:00:49 -07:00
James B. Pollack
703acd61eb convert bubblewand 2016-04-28 16:38:33 -07:00
Brad Hefta-Gaub
5314755e0d Merge pull request #7782 from ctrlaltdavid/20898
Automatically upgrade toolbar position to bottom center of window
2016-04-28 16:37:34 -07:00
James B. Pollack
6fc1cdc41f convert bow 2016-04-28 16:37:19 -07:00
James B. Pollack
6c6d5905cc more bball 2016-04-28 16:29:32 -07:00
Brad Hefta-Gaub
bc57719f5f Merge pull request #7771 from ericrius1/lampFix
Lamp fix- moves light position up a bit on desklamp at home
2016-04-28 16:29:03 -07:00
Brad Hefta-Gaub
6488744bd5 Merge pull request #7780 from imgntn/defaultScripts
Remove directory.js from default scripts
2016-04-28 16:28:33 -07:00
Brad Hefta-Gaub
b72ac35e8e Merge pull request #7785 from imgntn/editicons
Re-add locking/visibility tools to edit.js
2016-04-28 16:27:34 -07:00
James B. Pollack
e519d483a9 convert sounds 2016-04-28 16:27:31 -07:00
James B. Pollack
851f9b0914 move dev templates into a dif location 2016-04-28 16:23:32 -07:00
James B. Pollack
40c1563b1f convert bball rack 2016-04-28 16:21:03 -07:00
James B. Pollack
e68909ce3e re add local paths 2016-04-28 13:48:09 -07:00
James B. Pollack
aafed4e1b8 fix horizontal typo in examples 2016-04-28 13:42:10 -07:00
James B. Pollack
b52406e127 horizontal 2016-04-28 13:40:58 -07:00
James B. Pollack
795d866da9 re add locking/visibility tools to edit.js 2016-04-28 13:29:54 -07:00
David Rowe
1cf53829d3 Fix upgrading for all toolbar buttons 2016-04-29 08:20:20 +12:00
David Rowe
b7188bad30 Automatically upgrade toolbar position to bottom center of window 2016-04-29 07:13:56 +12:00