Seth Alves
d8beed34d6
remove // ? comments
2015-05-20 16:27:28 -07:00
Stephen Birarda
ac954e1c43
fix for lowercase help text in settings
2015-05-20 15:00:11 -07:00
Stephen Birarda
19b669867e
cleanup entity checkboxes for new format
2015-05-20 14:58:09 -07:00
Seth Alves
782402b4c8
Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux
2015-05-20 14:53:05 -07:00
Stephen Birarda
e295f52c0a
handle change event for new checkboxes
2015-05-20 14:52:31 -07:00
Seth Alves
4a59dc24c5
split entity-add and entity-edit messages
2015-05-20 14:52:03 -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
Stephen Birarda
ab52df7254
change checkboxes to prettier bootstrap switches
2015-05-20 14:30:50 -07:00
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
Andrew Meadows
2f4162f447
cleanup of AvatarManger API
2015-05-19 16:53:30 -07: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
Andrew Meadows
f86c419988
stubbery for collidable avatars
2015-05-19 14:15:26 -07:00
Andrew Meadows
ead1d9f4d1
formatting
2015-05-19 14:15:09 -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
Sam Gateau
3ec6ada29d
Introduce an official syncCache on the GLBackend to catch up with the glCOntext ttrue state
2015-05-19 00:32:36 -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
