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
42762 commits 29 branches 0 tags 1.1 GiB
Commit graph

42762 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Brad Hefta-Gaub
374ba10524 more CR feedback 2016-04-18 12:23:36 -07:00
Brad Hefta-Gaub
0d20f2468e CR feedback 2016-04-18 12:13:21 -07:00
samcake
3887dfdf34 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-04-18 11:52:45 -07:00
Omega Hereon [J.L.]
d5cad1d53c Merge branch 'gcc53' of https://github.com/OmegaHeron/hifi into gcc53 2016-04-18 18:46:03 +00:00
samcake
0ae54b9abc Typo 2016-04-18 11:45:48 -07:00
Omega Hereon [J.L.]
b3b58b8176 Fix instances of error: isnan was not declared in this scope with GCC5.3/Ubuntu 16.04 
In all but these 3 files isnan is glm::isnan
 2016-04-18 18:45:15 +00:00
Anthony J. Thibault
f15bc7b99a Added script to disable avatar animations, but not IK. 2016-04-18 11:41:28 -07:00
Brad Hefta-Gaub
c26115cf2e one small tweak 2016-04-18 11:40:17 -07:00
Omega Hereon [J.L.]
9f1ba5d617 Fixes instancs error: isnan was not declared in this scope with GCC5.3/Ubuntu 16.04 
In all but these 3 files isnan is glm::isnan
 2016-04-18 18:38:52 +00:00
Anthony J. Thibault
1682598be7 Added onLoadComplete signal to MyAvatar 
This can be used in javaScript to detect when the model has finished loading because the url has changed or the model has been reset.
 2016-04-18 11:37:02 -07:00
Brad Hefta-Gaub
1c111e20bd fix possible thread issue with Entities.callEntityMethod() 2016-04-18 11:20:26 -07:00
samcake
d746fba142 Cleaning up the stats.qml 2016-04-18 11:18:28 -07:00
samcake
88c58cc276 Adding the simple state sort to draw opaque deferred 2016-04-18 10:51:31 -07:00
Brad Hefta-Gaub
47900df3e7 cleanup 2016-04-18 10:43:08 -07:00
Brad Hefta-Gaub
f6c75d0530 cleanup 2016-04-18 10:41:54 -07:00
Omega Hereon [J.L.]
8db8d1e31d Merge remote-tracking branch 'upstream/master' 2016-04-18 17:40:44 +00:00
Brad Hefta-Gaub
0520363da8 cleanup 2016-04-18 10:37:15 -07:00
Ryan Huffman
37469f16c8 Fix string interpolation in installer 2016-04-18 10:31:12 -07:00
Brad Hefta-Gaub
d1f6b371c9 cleanup 2016-04-18 10:27:12 -07:00
Seth Alves
b943a664b6 Merge pull request #7691 from ctrlaltdavid/20886 
Fix QML warnings at shutdown
 2016-04-18 10:26:09 -07:00
Seth Alves
dea748d132 Merge pull request #7683 from zzmp/clean/texture 
Remove unused static method gpu::Texture
 2016-04-18 10:25:53 -07:00
Ryan Huffman
a4b7e54e4d Update installer to use variables for display names 2016-04-18 10:16:06 -07:00
Brad Hefta-Gaub
a4f562672a cleanup 2016-04-18 10:08:33 -07:00
Ryan Huffman
f72a760151 Fix application names in installer prompt 2016-04-18 09:54:39 -07:00
Anthony J. Thibault
efb6a5c3f6 hifi-boot.js: Coding convention update 2016-04-18 09:49:09 -07:00
Brad Hefta-Gaub
9db0fe0d11 switch to using QSharedPointer for _entitiesScriptEngine 2016-04-18 09:46:04 -07:00
samcake
0531f90675 Adding state sorting for free 2016-04-18 00:22:05 -07:00
Omega Hereon [J.L.]
6a70ad23dd Merge remote-tracking branch 'upstream/master' 2016-04-17 17:36:55 +00:00
Brad Davis
b50f835d35 Warning and error fixes 2016-04-17 10:22:26 -07:00
Brad Davis
3a969eed47 Manually generate image mip levels when loading textures 2016-04-17 10:22:24 -07:00
Brad Davis
0d3bf366c1 Support loading multiple mips in texture transfer 2016-04-17 10:22:24 -07:00
Brad Davis
ac3d6c77b9 Add default parameter to mip loaded notifications 2016-04-17 10:20:02 -07:00
Brad Davis
c35d81260d Load local texture files through the same code as network 2016-04-17 10:20:01 -07:00
Brad Davis
75c99fe416 Working on GPU library test code 2016-04-17 10:20:01 -07:00
Brad Davis
f3e5306f90 Working on an automated performance test 2016-04-17 10:20:00 -07:00
Brad Hefta-Gaub
a3221f36c8 Merge branch 'master' of https://github.com/highfidelity/hifi into resetScriptEngineOnDomainChange 2016-04-17 10:03:06 -07:00
Brad Hefta-Gaub
4b7a4e80ff Merge pull request #7675 from samcake/orange 
Fixing the Bump Map generating Normal Map path
 2016-04-17 10:00:45 -07:00
Brad Hefta-Gaub
71d57295eb handle possibly deleted ScriptEngine in getScriptContents 2016-04-16 19:39:45 -07:00
Brad Hefta-Gaub
b62f1a135d fix qml to work with rect instead of vec4 2016-04-16 17:29:03 -07:00
Brad Hefta-Gaub
8f3d48190a switch to QRect instead of vec4 2016-04-16 16:59:47 -07:00
Brad Hefta-Gaub
6b5fd1e807 code review feedback 2016-04-16 16:11:36 -07:00
Joe Large [Omega Heron]
be208ba682 Revert "Correct references to isnan to glm::isnan for compat with Ubuntu 16.04/GCC 5.3" 
Moving this to a branch.

This reverts commit b88fc62b97.
 2016-04-16 18:24:50 -04:00
Brad Hefta-Gaub
54777c9cd5 Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD 2016-04-16 15:19:35 -07:00
Joe Large [Omega Heron]
b88fc62b97 Correct references to isnan to glm::isnan for compat with Ubuntu 16.04/GCC 5.3 2016-04-16 17:46:37 -04:00
Brad Hefta-Gaub
87078b1ea2 first cut at resetting entities script engine on domain change 2016-04-16 11:09:23 -07:00
samcake
d2cb017a04 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-16 10:44:56 -07:00