Commit graph

44131 commits

Author SHA1 Message Date
Andrew Meadows
8009d23f70 more STATIC_MESH and dynamic overlap prevention 2016-06-22 15:20:45 -07:00
Andrew Meadows
e88b264864 revert compound hull shape generation 2016-06-22 09:30:44 -07:00
Andrew Meadows
702e83ba6a prevent incompatible entity properties combos 2016-06-21 14:03:21 -07:00
Andrew Meadows
4c9ec7ca43 protect physics against bad entity properties 2016-06-21 13:55:11 -07:00
Andrew Meadows
937bd0c1be SHAPE_TYPE_MESH --> SHAPE_TYPE_STATIC_MESH 2016-06-21 13:54:21 -07:00
Andrew Meadows
f22a5613bd fix static mesh for model with per-mesh transforms 2016-06-20 17:29:20 -07:00
Andrew Meadows
5484b6fbb7 more correct extraction from triangle strips 2016-06-20 17:29:20 -07:00
Andrew Meadows
c0c77e9027 optimize/cleanup compound/mesh shape computation 2016-06-20 17:29:20 -07:00
Andrew Meadows
f444b70fdc fix collision shape for scaled models 2016-06-20 17:29:20 -07:00
Andrew Meadows
ab3548cac0 fix crash 2016-06-20 17:29:20 -07:00
Andrew Meadows
d1752211e6 make implicit casts explict 2016-06-20 17:29:20 -07:00
Andrew Meadows
2f6e5ab2ee remove fall-through in switch/case logic 2016-06-20 17:29:20 -07:00
Andrew Meadows
f41fb30ace add "Static Mesh" option to edit.js 2016-06-20 17:29:20 -07:00
Andrew Meadows
a519b77ae7 add SHAPE_TYPE_MESH and build mesh shapes 2016-06-20 17:29:20 -07:00
Andrew Meadows
9fc77ccfa2 use reference to avoid big copy 2016-06-20 17:29:20 -07:00
Andrew Meadows
13bb174b8b small change to commented out debug code 2016-06-20 17:29:20 -07:00
Andrew Meadows
5d5dc2837b fix comment 2016-06-20 17:29:20 -07:00
Andrew Meadows
d64729372a ShapeInfo name changes 2016-06-20 17:29:20 -07:00
Andrew Meadows
57760bca7d sort ShapeInfo data members 2016-06-20 17:29:20 -07:00
Brad Hefta-Gaub
10d79945d1 Merge pull request #8101 from humbletim/fix-entity-lifetime-guards
Fix entity lifetime guards (re: canRez/canRezTmp)
2016-06-20 15:52:54 -07:00
Brad Hefta-Gaub
d5c6296db5 Merge pull request #8095 from SamGondelman/skeletonFix
Fix skeleton switching bug
2016-06-20 15:52:40 -07:00
Zach Pomerantz
1c188a270d Merge pull request #8087 from zzmp/feat/send-domain-descriptors
send domain metadata to metaverse for authed domains
2016-06-20 11:22:01 -07:00
Brad Hefta-Gaub
b012e46dc7 Merge pull request #8097 from sethalves/make-permissions-names-case-insensitive
fix domain-server permissions-grid usernames to be case insensitive
2016-06-20 09:57:47 -07:00
humbletim
e65e6dc9ce Fix entity lifetime guards (re: canRez/canRezTmp) 2016-06-19 13:40:03 -04:00
Seth Alves
d8a67850f2 treat usernames in permissions-grid on domain-server settings page as case-insensitive 2016-06-17 15:17:51 -07:00
Brad Hefta-Gaub
c297fa7c0e Merge pull request #8060 from imgntn/usersUpdates
Hide users.js options when logged out
2016-06-17 14:17:42 -07:00
SamGondelman
caf4a9fa34 got rid of comparison warning 2016-06-17 14:17:32 -07:00
Brad Hefta-Gaub
abd368b69d Merge pull request #8071 from ctrlaltdavid/20969
let user choose an existing file in the file save dialog
2016-06-17 14:14:37 -07:00
Brad Hefta-Gaub
852eda3101 Merge pull request #8066 from imgntn/faceCameraText
Add face camera option to edit.js text entity properties
2016-06-17 14:14:06 -07:00
SamGondelman
7d602986cd removed multiple interface instances hack which you should never do anyways because it breaks everything 2016-06-17 12:01:02 -07:00
SamGondelman
5f7e49b087 possible fix, needs testing 2016-06-17 11:50:56 -07:00
Brad Hefta-Gaub
d8d4eb65ec Merge pull request #8059 from Atlante45/feat/steamworks
Initial Steamworks integration
2016-06-16 18:49:51 -07:00
Brad Hefta-Gaub
3b132e7376 Merge pull request #8076 from ZappoMan/reduceLogSpam
don't log spam on empty URL
2016-06-16 18:25:54 -07:00
Brad Hefta-Gaub
99a0804429 Merge pull request #8086 from imgntn/activeElement
Fix some edit.js errors and log messages
2016-06-16 18:25:20 -07:00
Brad Hefta-Gaub
7d0cd38c8e Merge pull request #8075 from ctrlaltdavid/20970
fix reporting of JSON export failure
2016-06-16 18:24:48 -07:00
Brad Hefta-Gaub
fd163ecc20 Merge pull request #8089 from ctrlaltdavid/20973
make audio device selection available without advanced menus enabled
2016-06-16 18:24:36 -07:00
David Rowe
77976281ab Make audio device selection available without advanced menus enabled 2016-06-17 09:58:44 +12:00
Brad Hefta-Gaub
d7cd82a24e Merge pull request #8085 from ZappoMan/fixShaders
fix v1 procedural shaders
2016-06-16 13:06:15 -07:00
Zach Pomerantz
1ce9e96cba Send domain metadata for authed domains 2016-06-16 13:00:28 -07:00
James B. Pollack
96d6cb12ac supress some messages and errors 2016-06-16 12:27:03 -07:00
Brad Hefta-Gaub
5dae20975a fix v1 procedural shaders 2016-06-16 09:18:44 -07:00
SamGondelman
f02ffa92fd undo debugging 2016-06-15 18:00:08 -07:00
SamGondelman
59b785a33b trying to debug 2016-06-15 16:55:34 -07:00
David Rowe
775656eb1d Delete comment 2016-06-16 08:48:30 +12:00
Clément Brisset
6ed972257f Merge pull request #8077 from birarda/api-recheck-on-fail
clear domain connection refusals on hard reset only
2016-06-15 10:24:39 -07:00
Stephen Birarda
59912012c6 clear domain connection refusals on hard reset, not soft 2016-06-15 09:48:53 -07:00
Brad Hefta-Gaub
3e459085ac don't log spam on empty URL 2016-06-15 09:25:46 -07:00
David Rowe
657f8fdad5 Fix reporting of JSON export failure 2016-06-15 14:12:49 +12:00
Bradley Austin Davis
3525498550 Merge branch 'rc12-merge' 2016-06-14 17:44:24 -07:00
Bradley Austin Davis
21adf4fe68 Merge branch 'master' into rc12-merge 2016-06-14 17:42:22 -07:00