Stephen Birarda
|
a1f1f7603d
|
Merge pull request #4564 from PhilipRosedale/master
Buttons at bottom in dice, gun so not to conflict with edit.js
|
2015-04-01 09:06:34 -07:00 |
|
Philip Rosedale
|
9642bd199d
|
Buttons at bottom
|
2015-03-31 22:12:06 -07:00 |
|
Philip Rosedale
|
8114fdd1e2
|
move button locations, names some constants in avatar controller
|
2015-03-31 21:51:50 -07:00 |
|
Philip Rosedale
|
647ad18812
|
Merge pull request #4563 from ericrius1/master
added unload function to lightController.js so light is deleted when it'...
|
2015-03-31 19:31:38 -07:00 |
|
Eric Levin
|
fd3fc0acdd
|
added unload function to lightController.js so light is deleted when it's parent entity is
|
2015-03-31 19:08:30 -07:00 |
|
Stephen Birarda
|
1d5f1807f7
|
Merge pull request #4562 from sethalves/editors-are-rezzers
add a bool value to Node which indicates if it is allowed to rez new ent...
|
2015-03-31 18:53:29 -07:00 |
|
Seth Alves
|
04901e99fc
|
fix error message
|
2015-03-31 18:41:29 -07:00 |
|
Seth Alves
|
8bca8ad4ef
|
bump protocol versions for PacketTypeDomainList and PacketTypeDomainListRequest
|
2015-03-31 18:37:42 -07:00 |
|
Seth Alves
|
4e83301c65
|
add a bool value to Node which indicates if it is allowed to rez new entities
|
2015-03-31 18:27:46 -07:00 |
|
Philip Rosedale
|
d57959503b
|
Merge pull request #4560 from AndrewMeadows/bispinor
improved bounding shape calculation for Mery model
|
2015-03-31 18:19:34 -07:00 |
|
Philip Rosedale
|
6a171c2f22
|
Merge pull request #4559 from birarda/constant-metaverse-url
add a networking constants class with the metaverse server URL
|
2015-03-31 18:13:41 -07:00 |
|
Seth Alves
|
d17289f566
|
Merge pull request #4556 from birarda/damaged-xcode
handle a domain-server port change once connection initiated
|
2015-03-31 17:12:01 -07:00 |
|
Andrew Meadows
|
7fb9427f29
|
Merge pull request #4549 from jherico/dbg_macro
Enabling the use of #ifdef DEBUG as a platform neutral idiom
|
2015-03-31 17:08:12 -07:00 |
|
Brad Hefta-Gaub
|
90498969e2
|
Merge pull request #4558 from birarda/master
fix deadlock opportunity in killNodeWithUUID
|
2015-03-31 17:00:50 -07:00 |
|
Stephen Birarda
|
e22b33e96d
|
fix QUrl include for ubuntu
|
2015-03-31 17:00:04 -07:00 |
|
Andrew Meadows
|
ef10e5734d
|
bounding box for skeleton with bad mesh weights
|
2015-03-31 16:53:33 -07:00 |
|
Stephen Birarda
|
61806935bb
|
add a networking constants class with metaverse URL
|
2015-03-31 16:40:21 -07:00 |
|
Philip Rosedale
|
9635c6d248
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2015-03-31 16:29:55 -07:00 |
|
Stephen Birarda
|
86174d6a29
|
Merge pull request #4551 from ZappoMan/neverCullAvatarParts
never cull mesh parts for avatars
|
2015-03-31 16:29:01 -07:00 |
|
Philip Rosedale
|
b7f0be761c
|
gun buildings fall on creation, dice stops correctly
|
2015-03-31 16:27:09 -07:00 |
|
Stephen Birarda
|
64921c38b6
|
don't overlock in killNodeWithUUID
|
2015-03-31 16:25:22 -07:00 |
|
Stephen Birarda
|
cf7a6dda74
|
Merge branch 'master' of https://github.com/highfidelity/hifi into damaged-xcode
|
2015-03-31 16:14:59 -07:00 |
|
Stephen Birarda
|
740438d08d
|
handle domain-server local port changes once connected
|
2015-03-31 16:11:41 -07:00 |
|
Philip Rosedale
|
c336d235bf
|
Merge pull request #4538 from birarda/damaged-xcode
potential fix for damaged xcode thanks to TBB
|
2015-03-31 16:04:26 -07:00 |
|
Brad Hefta-Gaub
|
b6f670a8d8
|
Merge pull request #4554 from samcake/yellow
Better support for Nvidia Optimus Laptop
|
2015-03-31 15:56:01 -07:00 |
|
Brad Hefta-Gaub
|
867c8078bd
|
Merge pull request #4553 from PhilipRosedale/master
Blocks fall when made, better edge colors
|
2015-03-31 15:53:44 -07:00 |
|
Brad Hefta-Gaub
|
b43761a6c1
|
Merge pull request #4545 from samcake/orange
No more FLat global lighting, always use one of the SPherical harmonics presets
|
2015-03-31 15:52:49 -07:00 |
|
Brad Hefta-Gaub
|
d77333953e
|
Merge pull request #4552 from sethalves/island
Fix various collision-model related bugs
|
2015-03-31 15:47:53 -07:00 |
|
Stephen Birarda
|
e73e74336e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into damaged-xcode
|
2015-03-31 15:42:16 -07:00 |
|
Philip Rosedale
|
63fe49c60e
|
Merge pull request #4534 from birarda/master
don't use DX11 for bullet even if found
|
2015-03-31 15:21:29 -07:00 |
|
Sam Gateau
|
b4d11e2eb5
|
Add the needed global variable exported to enable the nvidia gpu on optimus platform (laptops with intel integrated) also log the opengl version and gpu and driver used
|
2015-03-31 15:18:59 -07:00 |
|
Sam Gateau
|
74f04c0c84
|
remove useless comment
|
2015-03-31 14:57:51 -07:00 |
|
Seth Alves
|
07493432da
|
Merge pull request #4550 from ctrlaltdavid/fix-typo
Fix typo
|
2015-03-31 14:51:28 -07:00 |
|
Sam Gateau
|
07a36158e6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2015-03-31 14:46:56 -07:00 |
|
Seth Alves
|
af6ce8fb07
|
HERE COMES AN S
|
2015-03-31 14:37:41 -07:00 |
|
Seth Alves
|
48144a46b1
|
don't keep empty mesh-parts. take units hint from a common first-line comment, if it's there.
|
2015-03-31 14:34:35 -07:00 |
|
Seth Alves
|
95cc8672c0
|
remove unneeded assert
|
2015-03-31 14:32:43 -07:00 |
|
ZappoMan
|
a889191916
|
never cull mesh parts for avatars
|
2015-03-31 14:27:34 -07:00 |
|
David Rowe
|
154dacf791
|
Fix typo
|
2015-03-31 14:21:56 -07:00 |
|
Philip Rosedale
|
f4695643e3
|
Blocks fall when made, better edge colors
|
2015-03-31 14:13:19 -07:00 |
|
Seth Alves
|
55d506bb53
|
formatting
|
2015-03-31 14:04:49 -07:00 |
|
Seth Alves
|
ea2c5ff622
|
formatting
|
2015-03-31 14:04:33 -07:00 |
|
Seth Alves
|
9e0118492e
|
make sure to not leave in-use resources in UnusedResource list
|
2015-03-31 14:04:21 -07:00 |
|
Seth Alves
|
347ef3c4e1
|
use scaling from visual model on collision model rather than using the bounds from the collision model
|
2015-03-31 14:03:37 -07:00 |
|
Stephen Birarda
|
3ed097ff86
|
Merge pull request #4548 from AndrewMeadows/inertia
fix typo that broke avatar motion
|
2015-03-31 13:42:20 -07:00 |
|
Bradley Austin Davis
|
02b69f4a70
|
Enabling the use of #ifdef DEBUG as a platform neutral idiom
|
2015-03-31 13:32:13 -07:00 |
|
Stephen Birarda
|
e5637a1f28
|
Merge pull request #4547 from ZappoMan/preloadOnImport
fix issue with preload not being called on import
|
2015-03-31 13:31:13 -07:00 |
|
Andrew Meadows
|
9739d68370
|
fix typo that broke avatar motion
|
2015-03-31 13:20:06 -07:00 |
|
Brad Hefta-Gaub
|
434349d947
|
Merge pull request #4541 from ctrlaltdavid/20428
CR for Job #20428 - Add the ability to minimize/maximize users.js
|
2015-03-31 13:09:46 -07:00 |
|
Brad Hefta-Gaub
|
e27a89b7c3
|
Merge pull request #4539 from birarda/settings-thread-delete-later
fix for cleanup of SettingsManager thread
|
2015-03-31 13:09:06 -07:00 |
|