Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
42808 commits 29 branches 0 tags 1.1 GiB
Commit graph

42808 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
cadb53b703 Adding shader versioning and defines from GLBackendShader allowing for runtime defines injection to shaders and more 2016-04-18 18:24:27 -07:00
Omega Hereon [J.L.]
647e991b05 Merge remote-tracking branch 'upstream/master' into gcc53 2016-04-19 01:14:00 +00:00
Brad Hefta-Gaub
a572ac31dc Merge pull request #7704 from samcake/lemon 
Exposing the CPU TIming of the Render Jobs to the JS API
 2016-04-18 18:12:14 -07:00
Omega Hereon [J.L.]
64f6a59bb3 Merge remote-tracking branch 'upstream/master' into gcc53 2016-04-19 01:11:35 +00:00
Brad Hefta-Gaub
0ac9601ea7 Merge pull request #7690 from ZappoMan/improveHMD 
Introduce "recommended overlay rectangle" to display plugins
 2016-04-18 18:04:21 -07:00
Brad Hefta-Gaub
5ae1e70197 Merge pull request #7689 from hyperlogic/tony/jasmine-avatar-unit-tests 
Added avatar unit tests
 2016-04-18 18:03:29 -07:00
Brad Hefta-Gaub
0a79b5dd69 Merge pull request #7707 from huffman/fix/osx-default-script-dir 
Remove fix for old QT file path bug in OSX
 2016-04-18 18:01:47 -07:00
Brad Hefta-Gaub
0e9bd9a776 Merge pull request #7682 from zzmp/clean/stars 
Cleanup stars to persist a single BufferView
 2016-04-18 17:59:48 -07:00
David Rowe
47b4c36546 Merge branch 'master' into 20872 2016-04-19 12:56:55 +12:00
David Rowe
99d9378ffd Fix entity list header and footer text sometimes disappearing 2016-04-19 12:51:13 +12:00
Zach Pomerantz
b11d6ca1c6 Make Render Rates qml script 2016-04-18 17:43:34 -07:00
Zach Pomerantz
f48541961d Expose Rates to JS/QML 2016-04-18 17:43:34 -07:00
Zach Pomerantz
6d7f8f4a6f Make RateCounter rate atomic 2016-04-18 17:42:45 -07:00
Brad Hefta-Gaub
f5cddc9962 fix the bug that Omega found 2016-04-18 17:26:12 -07:00
samcake
c6deff16d6 Resoving to master... 2016-04-18 17:24:55 -07:00
samcake
d25a366962 Resoving to master... 2016-04-18 17:23:57 -07:00
samcake
7951284e9c Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2016-04-18 16:54:17 -07:00
Stephen Birarda
93cf5a1035 fixes for CR comments 2016-04-18 16:53:02 -07:00
samcake
9087de22bd Fixing the extra spaces 2016-04-18 16:10:11 -07:00
Ryan Huffman
4e0ac2a4be Remove fix for old QT file path bug in OSX 2016-04-18 16:07:53 -07:00
Stephen Birarda
1d256be7ee fix random stats sending for AudioMixer clients 2016-04-18 16:04:20 -07:00
Stephen Birarda
33b46bd8e3 remove the billboard packet handling from AM 2016-04-18 16:02:46 -07:00
Zach Pomerantz
2d9dcc8595 Fix text3d to allow transparent text 2016-04-18 16:02:45 -07:00
Brad Hefta-Gaub
01907f181f Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD 2016-04-18 16:01:42 -07:00
Seth Alves
3298883774 Merge pull request #7702 from zzmp/fix/clear-octree-on-exit 
Clear entities and avatars on exit
 2016-04-18 15:48:35 -07:00
Seth Alves
70ddd8529b Merge pull request #7684 from zzmp/fix/runaway-loading-resources 
Fix ResourceCacheSharedItems::_loadingRequests removals
 2016-04-18 15:46:45 -07:00
Brad Hefta-Gaub
d5891e9073 remove abortEvaluation() since it has no effect for the test cases and might cause unexpected side effects 2016-04-18 15:28:33 -07:00
Anthony J. Thibault
279e77f523 updated comment 2016-04-18 15:18:08 -07:00
samcake
dccf549118 Merge pull request #7676 from jherico/perf_testing 
Manually generate mipmaps for textures while loading
 2016-04-18 15:09:12 -07:00
Brad Hefta-Gaub
c3a86f46d0 change the timeout to an interval so it constantly runs 2016-04-18 14:55:23 -07:00
samcake
ca720efce6 Exposing the timing of the jobs by default 2016-04-18 14:53:06 -07:00
Zach Pomerantz
146ea066db Update AvatarManager.cpp 2016-04-18 14:53:04 -07:00
Anthony J. Thibault
544928b46e MyAvatar: fix for laggy avatar attachments 2016-04-18 14:51:33 -07:00
Zach Pomerantz
c9dc642d76 Fix type in AvatarManager::clearAllAvatars 2016-04-18 14:48:24 -07:00
Zach Pomerantz
c87eec4182 Fix typo in AvatarManager::clearAllAvatars 2016-04-18 14:45:33 -07:00
Zach Pomerantz
790e325248 Clear entities and avatars on exit 2016-04-18 14:31:16 -07:00
Seth Alves
65f51322fa Merge pull request #7700 from Atlante45/fix/cleanup-iodevice 
Cleanup disk cache io device
 2016-04-18 14:28:41 -07:00
Zach Pomerantz
62c252e8ef Set GL in QML immediately 2016-04-18 14:23:23 -07:00
Stephen Birarda
9cce964013 use nextPacketTimestamp only to catch up, not stay ahead 2016-04-18 14:19:36 -07:00
Atlante45
c9fa91936a Cleanup disk cache io device 2016-04-18 14:10:51 -07:00
Seth Alves
4bf98a80b9 Merge pull request #7667 from AndrewMeadows/fix-entity-server-crash 
fix entity-server crash when entity moves out of bounds
 2016-04-18 14:09:21 -07:00
Brad Hefta-Gaub
ab7f3d5739 change the timeout to an interval so it constantly runs 2016-04-18 13:58:40 -07:00
Brad Hefta-Gaub
d6fa58c39c add an example script 2016-04-18 13:42:58 -07:00
Anthony J. Thibault
1f383680aa Rig: removed unnecessary emitOnLoadComplete method 2016-04-18 13:35:13 -07:00
Brad Hefta-Gaub
24003840df add an example script 2016-04-18 13:33:08 -07:00
Brad Hefta-Gaub
6ac173d197 add an example script 2016-04-18 13:27:05 -07:00
Anthony J. Thibault
dc92ccc2b2 MyAvatar: Removed unnecessary slot. 2016-04-18 13:19:49 -07:00
Brad Hefta-Gaub
bf8cdabd1b CR feedback 2016-04-18 12:50:29 -07:00
Brad Hefta-Gaub
55010cebb7 remove unhelpful comment 2016-04-18 12:43:32 -07:00
Brad Hefta-Gaub
9e13b1bbae more CR feedback 2016-04-18 12:25:46 -07:00