Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 09:33:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
24458 commits 71 branches 56 tags 1.2 GiB
Commit graph

24458 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
c685874b05 Merge pull request #4705 from birarda/avatar-mixer-throttling 
add macro to recursively correctly handle OS X bundle resources
 2015-04-28 01:19:36 -07:00
samcake
1acd27db08 Merge pull request #4709 from jherico/resources 
Removing debug hack to load resources from source folder
 2015-04-27 23:42:45 -07:00
Brad Davis
897e47e8e6 Removing debug hack to load resources from source folder 2015-04-27 23:17:56 -07:00
Brad Hefta-Gaub
086abe8468 Merge pull request #4707 from sethalves/dont-rez-if-no-rez-rights 
don't create entities in local tree if the entity-serer isn't going to accept them.
 2015-04-27 20:33:03 -07:00
Seth Alves
6f441e3490 if our Node isn't allowed to create entities in this domain, don't try. 2015-04-27 19:07:53 -07:00
Philip Rosedale
5fad6b97ff Merge pull request #4706 from ZappoMan/useAvatarCrashFix 
fix crash in scripts using useAvatar methods
 2015-04-27 17:10:10 -07:00
ZappoMan
62a421361c fix crash in scripts using useAvatar methods 2015-04-27 16:58:34 -07:00
Seth Alves
e48552f243 Merge pull request #4702 from AndrewMeadows/thermonuclear 
PhysicsEngine cleanup in preparation for colliding avatars
 2015-04-27 16:20:27 -07:00
Seth Alves
1fb40652f1 Merge pull request #4699 from jherico/build-notes 
Updating the build notes to refelect the new Qt version requirement
 2015-04-27 16:18:36 -07:00
Stephen Birarda
ec2f54b90a add a macro to recursively correctly handle resources 2015-04-27 16:02:52 -07:00
Seth Alves
d22ca6a390 Merge pull request #4703 from ZappoMan/rootEntitiesBugFix 
fix bug in parsing root element data
 2015-04-27 15:52:04 -07:00
ZappoMan
1ef58139a4 fix bug in parsing root element data 2015-04-27 15:07:32 -07:00
Andrew Meadows
31e5758422 namechange updateObjectEasy()-->updateBodyEasy() 2015-04-27 13:04:59 -07:00
Andrew Meadows
72deb2e49b merge upstream/master into andrew/thermonuclear 
Conflicts:
	libraries/entities/src/EntityItem.h
	libraries/physics/src/EntityMotionState.cpp
 2015-04-27 12:54:21 -07:00
Andrew Meadows
c097a0038a Merge pull request #4685 from sethalves/detect-ballistic 
various physics-related experiments
 2015-04-27 12:41:50 -07:00
Seth Alves
bdc6bb3c2d Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic 2015-04-27 12:20:58 -07:00
Seth Alves
2e5049a190 fix bug caused by no-longer reusing a variable 2015-04-27 12:20:01 -07:00
Brad Hefta-Gaub
90c47a6046 Merge pull request #4695 from jherico/ui-refactor 
New UI library, some bug fixes and features
 2015-04-27 11:16:10 -07:00
Seth Alves
e14b4c6ad4 cleanups 2015-04-27 11:01:48 -07:00
Brad Davis
a12bfd95f4 Merge remote-tracking branch 'upstream/master' into ui-refactor 
Conflicts:
	libraries/render-utils/src/MatrixStack.h
 2015-04-27 10:59:57 -07:00
Seth Alves
8278f52a79 cleanups 2015-04-27 10:59:51 -07:00
Seth Alves
b23427a3c8 hook up menu-items to control debug rendering of collision hulls and owned simulations 2015-04-27 10:32:47 -07:00
Seth Alves
2cdbe8bf7b merge from upstream 2015-04-27 09:57:36 -07:00
Seth Alves
e007617112 hook up menu-items to control debug rendering of collision hulls and owned simulations 2015-04-27 09:56:24 -07:00
Brad Davis
c08fde8ecd Merge pull request #4697 from sethalves/quiet-compiler 
quiet compiler, remove some trailing control-Ms
 2015-04-27 09:26:01 -07:00
Seth Alves
26511575c2 Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic 2015-04-27 06:44:59 -07:00
Brad Davis
3071be162a Coding standards 2015-04-26 20:11:27 -07:00
Andrew Meadows
e3d29d74af name changes and preparation for more cleanup 2015-04-26 15:24:30 -07:00
Andrew Meadows
b760a03360 pass arguments by const reference 2015-04-26 15:24:00 -07:00
Brad Davis
2e61b5a933 Coding standards 2015-04-25 16:59:43 -07:00
Brad Davis
0afe8c0e32 Coding standards 2015-04-25 16:46:05 -07:00
Brad Davis
7c16fd05c1 Merge branch 'master' into ui-refactor 2015-04-25 16:35:43 -07:00
Brad Davis
82e3c4c587 Updating the build notes to refelect the new Qt version requirement 2015-04-25 16:26:15 -07:00
Seth Alves
2eebfb9cf1 merge from upstream 2015-04-25 12:50:16 -07:00
Seth Alves
d1d4b0f0ee merge from upstream 2015-04-25 12:50:00 -07:00
Seth Alves
3ce65d297a Merge pull request #4696 from Atlante45/fix_warnings 
Fix a few warnings
 2015-04-25 12:43:47 -07:00
Seth Alves
b69cba1aba respond to code-review 2015-04-25 10:50:18 -07:00
Seth Alves
0fb1a83e3b quiet compiler, remove some trailing control-Ms 2015-04-25 09:20:00 -07:00
Seth Alves
81ff8a4448 count steps during which an EntityItem is moving but has no simulation owner. Once the count is high enough (how high is TBD), attempt to claim ownership 2015-04-25 07:17:21 -07:00
Seth Alves
48ec0c8339 formatting, re-enable code that causes an interface to attempt to claim a moving object with no current simulation-owner 2015-04-25 06:56:19 -07:00
Atlante45
ba507cef98 Fix a few warnings 2015-04-25 11:01:02 +02:00
Seth Alves
ac46f84291 cleanups 2015-04-24 18:36:41 -07:00
Brad Davis
9fbd5d79e4 Removing duplicate declaration 2015-04-24 17:46:56 -07:00
Seth Alves
03706359f5 cleanups 2015-04-24 17:44:52 -07:00
Seth Alves
218393a2b3 rather than keeping track of previous pos/rot sent by server, use a new flag that indicates that the values should be updated in the physics engine, but that the object should not be woken 2015-04-24 17:37:19 -07:00
Brad Davis
fdf2f8395d Bad lambda type 2015-04-24 17:28:43 -07:00
Brad Davis
eb02bdc67f Dangling function 2015-04-24 16:57:39 -07:00
Brad Davis
dab8761c71 Merge remote-tracking branch 'upstream/master' into ui-refactor 2015-04-24 16:46:48 -07:00
Brad Davis
e7b8efc2d9 Cleaning up unused stuff 2015-04-24 16:44:48 -07:00
Brad Davis
08d60c6a01 Fixing message dialog 2015-04-24 16:19:39 -07:00