Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-02 03:23:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
23803 commits 73 branches 59 tags 1.2 GiB
Commit graph

23803 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
da9a8e8a97 CR feedback 2015-04-01 09:27:58 -07:00
Seth Alves
23903570f0 added more options to v-hacd util, messed with fatten-mesh code some more 2015-04-01 09:19:34 -07:00
ZappoMan
827e37b920 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI 2015-04-01 09:09:50 -07:00
Bradley Austin Davis
e520a62bcf Merge branch 'master' into oculus_old_renderer 2015-04-01 09:09:06 -07:00
Philip Rosedale
9709724cc2 Merge pull request #4542 from stojce/20429 
CR for Job #20429 - Add "Create account" link to Qt login dialog in Interface
 2015-04-01 09:06:43 -07:00
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
Thijs Wenker
f22c739642 updated gunscript 2015-04-01 16:26:55 +02:00
Stojce Slavkovski
8514a39812 Use constants for URLs 2015-04-01 07:24:16 +02: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
Stojce Slavkovski
7b3d33c2a4 Merge branch 'master' of https://github.com/highfidelity/hifi into 20429 2015-04-01 06:48:09 +02:00
David Rowe
e06f28b7c5 Merge branch 'master' into 20422 
Conflicts:
	examples/users.js
	interface/src/Application.cpp
 2015-03-31 21:01:54 -07:00
Seth Alves
0f967f5971 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-03-31 20:43:28 -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
Seth Alves
380d03b3b2 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-03-31 19:00:19 -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
Bradley Austin Davis
db9ab3e699 Merge branch 'master' into oculus_old_renderer 2015-03-31 18:25:34 -07:00
Bradley Austin Davis
eb816f7f6a Adding support for eye per frame mode and offscreen render scaling 2015-03-31 18:24:58 -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
859628a4fd fix comment 2015-03-31 17:20:16 -07:00
Seth Alves
23c69ad9e1 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-03-31 17:19:59 -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
Seth Alves
164e5ff816 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-03-31 17:00:48 -07:00
Seth Alves
5cc12b8b47 allow for quads in the model which is being used as the template for generating the collision shape. added a flag to run the fatten-face code 2015-03-31 17:00:36 -07:00
Stephen Birarda
e22b33e96d fix QUrl include for ubuntu 2015-03-31 17:00:04 -07:00
Seth Alves
05cb0b830c make max collision size be 1000x1000x1000 rather than 100x100x100 2015-03-31 16:59:43 -07:00
Seth Alves
bacd6445f2 pull comments that get used as scaling hints into a hash table 2015-03-31 16:59:13 -07:00
David Rowe
edaa4cdc65 Remove local file reading from scripts 2015-03-31 16:57:15 -07:00
David Rowe
0a55bcb0c5 Remove XMLHttpRequest's facility to read local files 2015-03-31 16:56: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
ZappoMan
d68143675a first simple pass at using marketplace windows in preferences 2015-03-31 16:24:27 -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