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

762 commits

Author SHA1 Message Date
Brad Davis
f343598d91 Focus hack for menu fix 2016-01-22 00:55:32 -08:00
Brad Davis
3d46eda165 Frame construction in onCompleted was messing up the browser keyboard focus 2016-01-22 00:55:31 -08:00
Brad Hefta-Gaub
e1c369dc10 Merge pull request #6766 from samcake/hdr 
Ambient Occlusion
 2016-01-21 18:10:52 -08:00
samcake
2471a88e85 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-21 15:53:25 -08:00
Brad Davis
f9f9ddd8bd Yet more atmosphere removal 2016-01-21 15:15:17 -08:00
Brad Davis
b8109af196 Ignite the atmosphere 2016-01-21 15:15:15 -08:00
Leonardo Murillo
098b7a4ff3 Merge pull request #6870 from birarda/console 
Your Stack Manager is now a Server Console
 2016-01-21 14:31:34 -06:00
Brad Davis
d2900200a1 More cleanup & menu fixing 2016-01-20 11:23:56 -08:00
Stephen Birarda
8bc063e758 Merge branch 'master' of https://github.com/highfidelity/hifi into console 2016-01-19 16:21:19 -08:00
samcake
df496b065c Merging with master 2016-01-18 16:40:34 -08:00
Brad Davis
5aa8398adb Working on keyboard focus issues 2016-01-17 20:56:07 -08:00
Brad Davis
746c388f7a Cleanup of QML windowing and message boxes 2016-01-15 23:14:49 -08:00
samcake
577666da6e Merging upstream master 2016-01-14 15:10:54 -08:00
Atlante45
c30569cd55 Naming coding standard 2016-01-13 11:47:43 -08:00
Atlante45
205c14eb43 Remove unused headers 2016-01-13 11:47:43 -08:00
samcake
31bea5034c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-12 10:02:15 -08:00
Zach Pomerantz
801dde7950 Merge branch 'master' of github.com:highfidelity/hifi into feat/render-shape 2016-01-11 16:38:04 -08:00
Anthony J. Thibault
e4e4cb0110 Bug fix for Transform.postMult() with non-uniform scale. 
Previously it would not flag the matrix as non-uniform, this would
cause some operations (such as inverse) to be incorrect.
 2016-01-11 12:03:44 -08:00
Zach Pomerantz
d8ff133cc6 Fix include in gpu-test 2016-01-05 18:11:24 -08:00
Stephen Birarda
8d0478dbef remove ALL_TEST_TARGETS debug 2016-01-04 16:03:40 -08:00
samcake
387706ea64 Fix shader-test compilation 2016-01-04 19:45:43 -04:00
Andrew Meadows
ec27c75332 Merge pull request #6660 from hyperlogic/tony/anim-expressions 
AnimExpression: boolean expression parser and evaluator
 2015-12-30 08:36:44 -08:00
Anthony J. Thibault
5d596bcbc4 Added tests for GLMHelpers::safeEulerAngles. 
To verify that converting to and from quats and eulers will use the same angle order.

Also I fixed some naming inconsistencies in GeometryUtilTests.
 2015-12-29 10:07:38 -08:00
samcake
f9070ee989 Cleanup cruft in the shaders, glowIntensity and alphaThreshold not needed anymore 2015-12-22 12:41:31 -08:00
samcake
1e8e3fec87 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-19 11:38:20 -08:00
Brad Davis
6098c4a1d6 Revert "Revert "Migrate QML based web views to Qt WebEngine"" 
This reverts commit 1f3adeb666.
 2015-12-18 17:18:46 -08:00
samcake
7e66515beb Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-18 17:13:48 -08:00
Brad Davis
1f3adeb666 Revert "Migrate QML based web views to Qt WebEngine" 2015-12-18 17:09:38 -08:00
samcake
41525a7c4d Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-18 16:20:41 -08:00
Brad Davis
88b88a3306 Fixing warnings 2015-12-18 14:32:35 -08:00
Brad Davis
82c865af2c Rename QmlWebWindow to OverlayWebWindow, move ctor registration to script engine 2015-12-17 12:20:38 -08:00
Brad Davis
fa5bab08b1 Support web content inside QML 2015-12-16 16:25:38 -08:00
Anthony J. Thibault
ab85e2967a AnimExpression: support for unary not. 2015-12-15 13:18:30 -08:00
Anthony J. Thibault
22756d168b Changed grammar to support boolean and and or. 2015-12-15 10:35:35 -08:00
Anthony J. Thibault
2b0ed55077 Merge branch 'master' into tony/anim-expressions 2015-12-15 10:35:19 -08:00
samcake
3554f54e17 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-14 17:38:56 -08:00
Atlante45
146581714a More warning fixes 2015-12-11 16:17:41 -08:00
Atlante45
ce51350b65 Fix warnings on windows 64bit 2015-12-11 15:42:15 -08:00
Sam Cake
7e59d5cc04 Fixing the failing test for shader compilations (because we removed the shadowing shaders) 2015-12-07 01:27:50 -08:00
Brad Hefta-Gaub
f71d2d00d2 Merge pull request #6548 from jherico/threaded_present 
Threaded present
 2015-12-04 13:42:09 -08:00
Brad Davis
11917ca501 Fixing preview / vsync functionality 2015-12-04 12:46:19 -08:00
Brad Hefta-Gaub
15c4dbfb11 Merge pull request #6554 from Atlante45/warnings 
Last of the OpenGL warnings on OS X
 2015-12-04 11:24:28 -08:00
Brad Hefta-Gaub
d07629489c Merge pull request #6543 from Atlante45/pointer 
gpu::Shader::create* return shared_ptr
 2015-12-04 11:17:02 -08:00
Atlante45
528a17422d Last of the OpenGL warnings on OS X 2015-12-04 10:33:10 -08:00
Brad Davis
c4514743d1 Fixing tests, moving some plugin container stuff to base class 2015-12-04 10:28:19 -08:00
Brad Davis
b9ace94ff1 Prototyping threaded present 2015-12-04 10:28:16 -08:00
Brad Hefta-Gaub
6fbb67021f Merge pull request #6530 from hyperlogic/tony/mirrored-model-entity-fix 
Fix for mirrored transforms in FBX models
 2015-12-03 17:01:21 -08:00
Anthony J. Thibault
99223d0a3c AnimExpression: support for parsing simple expressions 
supports parens, binary +, -, / and *.
/ and * have higher precedence then + and -
 2015-12-03 15:02:00 -08:00
Atlante45
3da80f5861 gpu::Shader::create* return shared_ptr 2015-12-03 14:56:07 -08:00
Brad Davis
cc80dfb9e1 Fixing case on gl surface format helper 2015-12-03 13:08:26 -08:00