Brad Hefta-Gaub
3edf2af5ec
Merge pull request #4923 from jherico/matrix_assert
...
Fix assert caused by calling glm::perspective with nonsensical values
2015-05-20 18:20:28 -07:00
Brad Davis
079a7f2600
Fix assert caused by calling glm::perspective with nonsensical values
2015-05-20 18:11:14 -07:00
Seth Alves
a935b923c8
Merge pull request #4919 from birarda/master
...
repairs to domain-server settings for hashes
2015-05-20 17:59:12 -07:00
samcake
496898273c
Merge pull request #4846 from jherico/dk1
...
Second attempt at fixing the HMD eye projections, without breaking the camera this time.
2015-05-20 17:02:28 -07:00
Brad Hefta-Gaub
6955626b77
Merge pull request #4900 from ericrius1/hockey
...
added check to airhockey script so entities that have never been crea…
2015-05-20 14:50:00 -07:00
Brad Hefta-Gaub
6d20fa72db
Merge pull request #4899 from Nex-Pro/plankyUpdate
...
Planky Game. Added values for friction and restitution in the entity parameters.
2015-05-20 14:49:39 -07:00
Brad Hefta-Gaub
75f6092023
Merge pull request #4902 from Atlante45/fix_source_url
...
Fix sourceUrl box in edit.js
2015-05-20 14:49:15 -07:00
Brad Hefta-Gaub
79023763ef
Merge pull request #4869 from ctrlaltdavid/20543
...
CR for #20543 - Option to auto-mute mic if step away from PC when face tracking is enabled
2015-05-20 14:47:31 -07:00
Brad Hefta-Gaub
39ab2f43bf
Merge pull request #4885 from Atlante45/warings
...
Quiet warnings
2015-05-20 14:45:55 -07:00
Brad Hefta-Gaub
07366ca173
Merge pull request #4917 from huffman/fix-spotlight-size
...
Fix spotlight dimensions
2015-05-20 14:45:23 -07:00
Philip Rosedale
f843acb673
Merge pull request #4918 from howard-stearns/anti-collision-deadlock
...
Fix collision deadlock
2015-05-20 13:56:39 -07:00
Stephen Birarda
227bdff07a
fix width of re-order column
2015-05-20 11:31:32 -07:00
Stephen Birarda
8fb5c53142
handle initial values for hash tables
2015-05-20 11:21:19 -07:00
Howard Stearns
c5b8dd51d8
Fix https://app.asana.com/0/32622044445063/34195351184789
...
Handle collision events when we do other updates (and their entity scripts) rather than when we do the physic updates while the tree is locked.
Given that, remove the check that kept sound from playing (or scripts from running) when we would have deadlocked, because now we don't.
2015-05-20 11:07:03 -07:00
Brad Davis
827d7f6221
Merge branch 'master' into dk1
2015-05-20 09:41:20 -07:00
Ryan Huffman
6f69ed2561
Fix calculated dimensions of spotlight
...
The spotlights region of effect is the intersection of the spotlight
with radius r, and the sphere of radius r
2015-05-20 09:11:48 -07:00
Ryan Huffman
bb38b3eb3f
Update default light cutoff to PI / 2
2015-05-20 09:11:21 -07:00
Philip Rosedale
f188078623
Merge pull request #4912 from howard-stearns/grab-picking-crash
...
Simplest fix for the grab crash that occurs with animated complex models
2015-05-18 14:36:27 -07:00
Howard Stearns
bb4df26690
Fix indentation.
2015-05-18 14:25:35 -07:00
Philip Rosedale
85fac8394a
Merge pull request #4914 from sethalves/airhockey-hull
...
airhockey -- various adjustments
2015-05-18 14:17:41 -07:00
Seth Alves
58b6205433
pull in Andrew's adjustment of paddle confinement
2015-05-18 14:10:58 -07:00
Howard Stearns
95be605233
Typo: unlock=>lock in rednerDebugMeshBoxes.
2015-05-18 14:05:13 -07:00
Seth Alves
34b381d48c
have airHockey.js provide the floor of the table, rather than the collision hull
2015-05-18 13:47:10 -07:00
Howard Stearns
7e1b6a48c5
Merge branch 'master' of https://github.com/highfidelity/hifi into grab-picking-crash
2015-05-18 13:35:28 -07:00
Philip Rosedale
8706b7501c
Merge pull request #4913 from sethalves/airhockey-hull
...
airhockey -- put lowered friction back on table. Andrew's fix for paddle vs corner
2015-05-18 13:34:06 -07:00
Seth Alves
ab13eb2d16
put lowered friction back on table. incorportate Andrew's fix for the paddle crashing through the new table corners
2015-05-18 13:30:28 -07:00
Clément Brisset
cc63787eb1
Merge pull request #4910 from ZappoMan/avoidSegregateMeshGroupsCrash
...
workaround for segregateMeshGroups() crash
2015-05-18 22:19:28 +02:00
Howard Stearns
f2a66f3106
Simplest fix for the grab crash that occurs with animated complex models.
...
(e.g., clicking on air hockey props in front of a spinning windmill).
2015-05-18 13:08:11 -07:00
Stephen Birarda
87a0f2f474
Merge pull request #4911 from birarda/domain-wizard
...
fix for table creation in settings.js
2015-05-18 15:45:46 -04:00
Stephen Birarda
dff021ea15
fix for table creation on settings.js
2015-05-18 12:45:24 -07:00
ZappoMan
1bb682180c
workaround for segregateMeshGroups() crash
2015-05-18 12:24:18 -07:00
Philip Rosedale
925ef1d930
Merge pull request #4909 from sethalves/airhockey-hull
...
airhockey -- use a collision hull for table. make deletion code safer
2015-05-18 12:23:27 -07:00
Seth Alves
e2a39b4597
airhockey -- drop from slightly lower so paddle doesn't flip over. update grab script with new table name
2015-05-18 12:18:27 -07:00
Seth Alves
6d9db21d88
Merge branch 'master' of github.com:highfidelity/hifi into airhockey-hull
2015-05-18 12:09:10 -07:00
Seth Alves
5ea506f2c1
use a collision hull for table. make deletion code safer
2015-05-18 11:47:06 -07:00
Clément Brisset
4534dbe686
Merge pull request #4907 from birarda/domain-wizard
...
new domain setup flow in domain-server settings
2015-05-18 20:20:25 +02:00
Stephen Birarda
b5fb8b0d12
Merge pull request #4908 from howard-stearns/edit-script-type
...
Fix (long-standing?) typo in edit.js file reference.
2015-05-18 13:37:45 -04:00
Howard Stearns
adfe21b743
Fix (long-standing?) typo in edit.js file reference.
2015-05-18 10:28:47 -07:00
Stephen Birarda
2eb796eca6
resolve conflicts on merge with upstream/master
2015-05-18 10:25:24 -07:00
Stephen Birarda
1a1b304319
update METAVERSE_URL to correct url
2015-05-18 10:24:10 -07:00
Stephen Birarda
6c5626da43
save input on enter or act on table
2015-05-18 10:19:11 -07:00
Philip Rosedale
195a2d6de5
Merge pull request #4905 from AndrewMeadows/thermonuclear
...
keep hockey paddle in playing field
2015-05-18 09:54:57 -07:00
Andrew Meadows
257a730029
keep hokey paddle in playing field
2015-05-18 09:42:55 -07:00
Atlante45
9d27108acb
Fix sourceUrl box in edit.js
2015-05-18 13:29:13 +02:00
Philip Rosedale
1f8008e5b5
Merge pull request #4897 from samcake/yellow
...
Remove the loading time when moving to a zone
2015-05-16 20:50:26 -07:00
Philip Rosedale
bf6d5af16d
Merge pull request #4901 from AndrewMeadows/thermonuclear
...
check for NULL before using pointer to EntityItem
2015-05-16 18:33:00 -07:00
Andrew Meadows
180590145d
check for NULL before using pointer to EntityItem
2015-05-16 11:12:19 -07:00
Eric Levin
03a4e08573
deleted unecsesary whitespace
2015-05-16 07:41:25 -07:00
Eric Levin
b6f1a1b89b
added check to airhockey script so entities that have never been created are not attempting to be deleted
2015-05-16 07:34:32 -07:00
Stephen Birarda
bc0cb6105d
fix sidebar badging for grouped values
2015-05-15 17:28:37 -07:00
