Seth Alves
124ff68cee
make EntityItemID a subclass of QUuid
2015-05-20 14:22:08 -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
Seth Alves
f522334c99
sort out script interface changes
2015-05-20 12:30:06 -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
Seth Alves
a769cfdaf2
client decides on new entity-ids, keep EntityItemID class
2015-05-20 10:42:19 -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
Atlante45
9c9aee667a
Header cleanup
2015-05-20 17:17:03 +02:00
Atlante45
ee4b28b6b9
Other TextRenderer memory leak
2015-05-20 16:56:04 +02:00
Atlante45
9a007ab135
Remove unused method
2015-05-20 16:50:31 +02:00
Atlante45
ee264368c0
Add renderQuad to DeferredLighting
2015-05-20 16:45:21 +02:00
Atlante45
9b49936d29
TextRenderer memory leak
2015-05-20 16:41:47 +02:00
Atlante45
e5d0851337
Remove unnecessary glPush/Pop
2015-05-20 16:29:43 +02:00
Seth Alves
b32e069f1d
bump protocol version
2015-05-19 14:45:01 -07:00
Seth Alves
f9d46b0cb5
interface decides on entityIDs rather than bouncing a temporary id through the entity server
2015-05-19 14:25:23 -07:00
Atlante45
eef87412fd
Particles render in Batch
2015-05-19 15:54:19 +02:00
Atlante45
229f88617d
Header cleanup
2015-05-19 15:19:02 +02: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
e67622d219
Merge branch 'team-teaching' into remove_gl_transform
2015-05-18 17:42:09 +02:00
Brad Hefta-Gaub
1923eab93f
Merge pull request #4903 from highfidelity/master
...
Update team-teaching branch
2015-05-18 08:25:27 -07:00
Atlante45
a9a0c9f387
Render 3D overlays before entities
...
This gets rid of some issues due to entities moving to render pipeline
2015-05-18 17:13:32 +02:00
Atlante45
a7ee10001a
Remove used deprecated methods
...
Also added a warning on the single one in use right now,
so that it gets deleted once it is moved to the rendering pipeline
2015-05-18 16:37:28 +02:00
