Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 20:20:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
24643 commits 75 branches 59 tags 1.2 GiB
Commit graph

24643 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Brad Davis
10b5935063 Let QML take care of more of the height/width stuff 2015-04-27 18:11:19 -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
Brad Davis
59b8b80148 Merge remote-tracking branch 'upstream/master' into vr_menus 
Conflicts:
	interface/src/Menu.cpp
 2015-04-27 16:02:13 -07:00
Brad Davis
1beaf18d1b Prevent the login dialog from spawning the address bar on enter keys 2015-04-27 16:00:23 -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
Seth Alves
32f91a86e7 remove some unneeded code 2015-04-27 15:43:47 -07:00
Brad Davis
fd28baac8c Working on message box and addressbar tweaks 2015-04-27 15:42:20 -07:00
Seth Alves
2f36cd0fb0 make it so assignment-clients runnings scripts can rez entities 2015-04-27 15:30:17 -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
Bradley Austin Davis
ca16d37ce5 Mac testing 2015-04-27 12:46:34 -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 Davis
76ce34a74b Scanning for code style 2015-04-27 11:41:10 -07:00
Brad Davis
d55d467d3f Tweaking VR menu for PR 2015-04-27 11:35:57 -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
Brad Davis
1a912787c2 Merge branch 'ui-refactor' into vr_menus 2015-04-27 11:05:14 -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
Brad Davis
0b1df891af Backporting visual work from branch 2015-04-27 10:53:58 -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
Andrew Meadows
7a222dff1d move one-liner isEnabled() to header 2015-04-27 09:54:58 -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
3032b1fb67 Merge branch 'ui-refactor' into vr_menus 2015-04-26 20:14:04 -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
d4d469b881 Adding note to change filename 2015-04-25 20:13:59 -07:00
Brad Davis
b77b3e4f3d Merge branch 'ui-refactor' into menu2 2015-04-25 17:00:07 -07:00
Brad Davis
2e61b5a933 Coding standards 2015-04-25 16:59:43 -07:00
Brad Davis
198224c4ec Merge branch 'ui-refactor' into menu2 2015-04-25 16:48:05 -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
Brad Davis
a96f69a673 Switching to a wrapper mechanism for VR menus 2015-04-25 16:20: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
David Rowe
6071e44ba4 Regularize debug messages for Faceshift and DDE 2015-04-25 11:35:14 -07:00