Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 10:32:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
24571 commits 75 branches 59 tags 1.2 GiB
Commit graph

24571 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
David Rowe
c37eb3de8a Fix DDE shutdown 2015-04-25 11:34:50 -07:00
David Rowe
736691e3ec Refactor face tracking FPS calculation 2015-04-25 11:33:32 -07:00
Seth Alves
b69cba1aba respond to code-review 2015-04-25 10:50:18 -07:00
Brad Davis
ee30588fd4 More menu work 2015-04-25 10:41:06 -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
fbdb9b143e Merge branch 'ui-refactor' into m_and_m 
Conflicts:
	interface/resources/qml/HifiMenu.qml
	interface/resources/qml/MessageDialog.qml
	interface/resources/qml/Root.qml
	interface/resources/qml/TestRoot.qml
	interface/resources/qml/controls/Dialog.qml
	interface/src/Application.cpp
	interface/src/ui/LoginDialog.cpp
	libraries/ui/src/MessageDialog.cpp
	libraries/ui/src/MessageDialog.h
	libraries/ui/src/OffscreenQmlDialog.h
	libraries/ui/src/OffscreenUi.cpp
	libraries/ui/src/OffscreenUi.h
	tests/ui/src/main.cpp
 2015-04-24 18:02:12 -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
Brad Davis
e5df17eb99 Merge pull request #4691 from ZappoMan/defaultAvatars 
fix default avatars on first run
 2015-04-24 16:17:26 -07:00
Brad Hefta-Gaub
dbb1e3c820 Merge pull request #4682 from jherico/offscreen 
Attempting to fix backspace issue in new UI
 2015-04-24 16:10:42 -07:00
Brad Hefta-Gaub
4fccb74855 Merge pull request #4692 from huffman/checkbox-fix 
Checkbox fix
 2015-04-24 16:08:52 -07:00
Brad Hefta-Gaub
1d6001af53 Merge pull request #4694 from Atlante45/zone_use_avatar_pos 
Zones use avatar position not view frustum
 2015-04-24 16:08:19 -07:00