Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 03:21:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
21543 commits 76 branches 59 tags 1.2 GiB
Commit graph

21543 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
67c21be5dc remove old audioIO connections for bandwidth 2015-02-02 17:17:22 -08:00
Stephen Birarda
c904a62e64 repairs for defines in GVRMainWindow 2015-02-02 17:15:24 -08:00
Stephen Birarda
28d710877c remove application calls from audio-client 2015-02-02 17:13:08 -08:00
Stephen Birarda
bd0552618f resolve conflicts on merge with upstream/master 2015-02-02 17:10:13 -08:00
Stephen Birarda
951617d40a get PlatformActivity menu working in GVR 2015-02-02 17:01:04 -08:00
Stephen Birarda
3f50311d04 handle back key press in GVRMainWindow 2015-02-02 12:54:15 -08:00
Stephen Birarda
30a9f6159b add required files for ndk-gdb 2015-02-02 11:01:35 -08:00
Stephen Birarda
884d8713ee actually enter and leave vr mode 2015-02-02 10:04:04 -08:00
Brad Hefta-Gaub
2eeb2a5ec5 Merge pull request #4205 from AndrewMeadows/isentropic 
small models get box collision shape
 2015-01-30 18:30:55 -08:00
Andrew Meadows
a723c748f5 check initialization of _needsInitialSimulation 2015-01-30 18:08:00 -08:00
Brad Hefta-Gaub
e73a000bb8 Merge pull request #4208 from birarda/master 
update to @problem's new interface icon
 2015-01-30 16:53:32 -08:00
Brad Hefta-Gaub
918349b227 Merge pull request #4196 from ctrlaltdavid/20277 
CR for Job #20277 - Interface user agent string change
 2015-01-30 16:52:30 -08:00
Andrew Meadows
7a2def167b Merge pull request #4206 from sethalves/rework-bandwidth-meter 
Rework bandwidth meter dialog
 2015-01-30 16:41:07 -08:00
Andrew Meadows
9da6b623a3 move shape polymorphism to ModelEntityItem 2015-01-30 16:25:35 -08:00
Andrew Meadows
bc52ba1d29 restore polymorphism for Box and Sphere entities 2015-01-30 16:18:50 -08:00
David Rowe
729fbbf5ac A further custom User-Agent string 2015-01-30 15:56:01 -08:00
Stephen Birarda
f78f6ab4cf fix check for debug/release icon 2015-01-30 15:41:44 -08:00
Stephen Birarda
2c74502394 move Interface icon back in icon sub-folder 2015-01-30 15:26:29 -08:00
Stephen Birarda
c4a2da15d1 change interface icon to lowercase 2015-01-30 15:26:07 -08:00
Seth Alves
067deefeb6 avoid use of snprintf 2015-01-30 15:23:40 -08:00
Stephen Birarda
ae87dac523 update to new interface icon 2015-01-30 15:22:21 -08:00
Seth Alves
eda7785d3b minor edit to make diff nicer 2015-01-30 14:41:03 -08:00
Andrew Meadows
80f6f718d0 EntityItem base class now computes shapeInfo 2015-01-30 14:17:29 -08:00
Andrew Meadows
b035c5b082 fix for updating moving models 2015-01-30 14:16:32 -08:00
David Rowe
5474c0634e Merge branch 'master' into 20277 
Conflicts:
	libraries/script-engine/src/ScriptEngine.cpp
 2015-01-30 13:49:45 -08:00
Seth Alves
5c9d64c482 Merge branch 'master' of github.com:highfidelity/hifi into rework-bandwidth-meter 2015-01-30 13:46:43 -08:00
Atlante45
fa36a04a94 Merge branch 'android' of git://github.com/birarda/hifi into android 2015-01-30 13:44:27 -08:00
Seth Alves
620efb2bbe change display style of bandwidth detail dialog, include a totals line 2015-01-30 13:43:28 -08:00
Stephen Birarda
8a57a64617 put application in full screen mode 2015-01-30 13:43:18 -08:00
Atlante45
0cc4f5b226 Merge branch 'android' of git://github.com/birarda/hifi into android 2015-01-30 13:30:17 -08:00
Stephen Birarda
05c4c32e30 make sure ANDROID is defined for Android build 2015-01-30 13:29:54 -08:00
Brad Hefta-Gaub
53534cea61 Merge pull request #4203 from huffman/remove-auto-on-edit-entities 
Fix editEntities.js automatically turning on
 2015-01-30 13:15:57 -08:00
Ryan Huffman
a98829ed8a Fix editEntities.js automatically turning on 2015-01-30 13:12:00 -08:00
samcake
efbf043f7d Merge pull request #4202 from Atlante45/master 
Edge case when removing all scripts
 2015-01-30 13:01:53 -08:00
Atlante45
fae59ab939 Edge case when removing all scripts 2015-01-30 12:20:00 -08:00
Atlante45
4562c29be8 Merge branch 'master' of https://github.com/highfidelity/hifi into android 
Conflicts:
	interface/src/avatar/Hand.cpp
 2015-01-30 12:02:11 -08:00
Seth Alves
dd9d054286 Start on refactoring of bandwidth metrics 2015-01-30 11:44:57 -08:00
Atlante45
22f7cbc00d Minimal temporary setup for avatars in GVR 2015-01-30 11:42:50 -08:00
Atlante45
d9152136ea Remove unused header 2015-01-30 11:41:48 -08:00
Atlante45
19ea9724ab Re-add accidentally removed int size() 2015-01-30 11:41:14 -08:00
samcake
1c89e27718 Merge pull request #4201 from Atlante45/master 
Fix not saving stopped scripts
 2015-01-30 11:39:40 -08:00
Atlante45
18c77e1cca Fix not saving stopped scripts 2015-01-30 11:27:45 -08:00
Seth Alves
2999a77f87 merge from master 2015-01-30 11:15:01 -08:00
Seth Alves
f0edba9a6b Start on refactoring of bandwidth metrics 2015-01-30 11:11:17 -08:00
samcake
e3fa2e1995 Merge pull request #4191 from ZappoMan/moreImmediateModeRemoval 
Removal of glColorXXX()
 2015-01-30 10:21:18 -08:00
Stephen Birarda
3af97b7f8d show GVRInterface in full screen on Android 2015-01-30 10:16:48 -08:00
Brad Hefta-Gaub
83201084c5 Merge pull request #4199 from huffman/fix-edit-includes 
Fix editEntities.js includes
 2015-01-30 10:16:44 -08:00
Ryan Huffman
0d1488e44f Fix editEntities.js includes 2015-01-30 10:03:37 -08:00
Brad Hefta-Gaub
72c088fdc6 Merge pull request #4198 from huffman/edit-always-on 
editEntities.js always on
 2015-01-30 10:00:47 -08:00
Ryan Huffman
77c78689d1 Merge branch 'master' of github.com:highfidelity/hifi into edit-always-on 2015-01-30 09:28:09 -08:00