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

10386 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
4a1cb63d7b remove an blank line in Application headers 2014-03-06 15:09:35 -08:00
Stephen Birarda
87d908a3bc resolve conflicts on merge with upstream master 2014-03-06 15:03:03 -08:00
Stephen Birarda
2d10995d01 Merge pull request #2219 from ZappoMan/cruft_removal 
Fix Crash and Cruft Removal
 2014-03-06 15:01:31 -08:00
Stephen Birarda
5373cbbb9b Merge pull request #2228 from josecpujol/fix_2198 
Changed the up vector for computing the scale factor: it failed when
 2014-03-06 14:49:13 -08:00
Stephen Birarda
27d486c0a1 resolve conflicts on merge with upstream master 2014-03-06 14:47:58 -08:00
AndrewMeadows
da83c97b3e Merge pull request #2226 from birarda/external-glm 
make glm an external dependency
 2014-03-06 14:40:18 -08:00
Stephen Birarda
83ae77670a fix link to gitter in README 2014-03-06 14:23:04 -08:00
Stephen Birarda
1bcb595f57 add missing interface config includes for windows 2014-03-06 13:52:06 -08:00
Stephen Birarda
04807dd5d1 include cstdio for snprintf call in BandwidthDialog 2014-03-06 13:31:08 -08:00
Jose Carlos
8e81c4c467 Changed the up vector for computing the scale factor: it failed when 
there was a roll in the view
 2014-03-06 21:49:36 +01:00
Stephen Birarda
06743f771f remove a double InterfaceConfig incldue in AmbientOcclusionEffect 2014-03-06 12:49:01 -08:00
Stephen Birarda
b670859aaa reference SharedUtil from LogDialog as a library header 2014-03-06 12:46:06 -08:00
Stephen Birarda
820dc7f45f include cstdio for sprintf call 2014-03-06 12:41:25 -08:00
Stephen Birarda
e7b166a304 Revert "include InterfaceConfig before Application to fix win build" 
This reverts commit dde2b199c9.
 2014-03-06 12:35:20 -08:00
Stephen Birarda
dde2b199c9 include InterfaceConfig before Application to fix win build 2014-03-06 12:14:14 -08:00
Stephen Birarda
b705ec560f cleanup resources directory references by copying beside the executable 2014-03-06 11:46:49 -08:00
Stephen Birarda
c737283935 qrc references should only use a single slash 2014-03-06 10:45:47 -08:00
Stephen Birarda
94a0db04f9 don't copy resources into OS X bundle 2014-03-06 10:41:44 -08:00
Stephen Birarda
403f91c988 update resource references to use Qt resource system 2014-03-06 10:41:11 -08:00
Stephen Birarda
cc554c53f1 use Qt Resource System to compile in resources 2014-03-06 10:25:15 -08:00
Stephen Birarda
90d4bbee78 Merge branch 'master' of https://github.com/highfidelity/hifi into external-glm 2014-03-06 09:16:22 -08:00
ZappoMan
d5c18a54fa removed dead code 2014-03-06 01:32:58 -08:00
ZappoMan
a887baf081 fix warning 2014-03-05 21:22:08 -08:00
ZappoMan
13985f8149 fix crash in Menu.removeSeparator() if the menu item doesn't exist or isn't a separator 2014-03-05 21:17:25 -08:00
ZappoMan
7a8d26247a remove piemenu 2014-03-05 21:03:32 -08:00
Philip Rosedale
a39b0313c9 Merge pull request #2216 from ey6es/master 
Generate mipmaps for avatar textures, fix shadows (don't render display names into the shadow map).
 2014-03-05 18:18:23 -08:00
Andrzej Kapolka
82011905be Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-05 18:10:55 -08:00
Andrzej Kapolka
a7af3bc284 Merge branch 'master' of https://github.com/highfidelity/hifi 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-03-05 18:08:59 -08:00
Philip Rosedale
e05e5e90cf Merge pull request #2213 from ZappoMan/particle_collions_penetration 
added penetration support to particle collisions JS callbacks
 2014-03-05 18:07:50 -08:00
Andrzej Kapolka
ad25455f86 Track hysteresis for next model separately, but just in case, don't use 
recursion to fall back on hysteresis value.  Closes #2209.
 2014-03-05 18:06:14 -08:00
ZappoMan
a54e401377 Merge branch 'master' of https://github.com/worklist/hifi into particle_collions_penetration 
Conflicts:
	libraries/script-engine/src/Vec3.cpp
 2014-03-05 18:04:57 -08:00
Philip Rosedale
828159cdcb Merge pull request #2204 from ZappoMan/flocking_birds 
Flocking birds & more
 2014-03-05 18:01:41 -08:00
Philip Rosedale
c2a63c4206 Merge pull request #2190 from AndrewMeadows/shapes 
Collision Shapes
 2014-03-05 17:59:42 -08:00
Andrzej Kapolka
3930b3e824 Display names are great, but not in the shadow map. Closes #2208. 2014-03-05 17:44:08 -08:00
Andrzej Kapolka
78221c7de2 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-05 17:13:00 -08:00
Stephen Birarda
284cd6bb30 more header repair in the README 2014-03-05 16:44:32 -08:00
Stephen Birarda
162b4b7e5f fix full stack header in README 2014-03-05 16:41:57 -08:00
Stephen Birarda
f7e5b7c0e8 add a README section inviting chat 2014-03-05 16:33:41 -08:00
Stephen Birarda
f6263010d4 add an extra line before emphasis line for pull requests 2014-03-05 16:31:51 -08:00
Stephen Birarda
32dc012330 add a line about submitting a pull request 2014-03-05 16:31:24 -08:00
Stephen Birarda
3afbdabd66 fixes to coding instructions in contributing 2014-03-05 16:29:37 -08:00
Stephen Birarda
4857268ab7 add some more information to the CONTRIBUTING guide 2014-03-05 16:22:38 -08:00
Stephen Birarda
53da23cdf0 more header cleanup in the README 2014-03-05 16:09:49 -08:00
Stephen Birarda
e7820d667f add a stubbed CONTRIBUTING document 2014-03-05 16:09:12 -08:00
Stephen Birarda
4c807defe0 more README simplification, rename INSTALL to BUILD 2014-03-05 16:06:48 -08:00
Stephen Birarda
6ce0e75468 fix a link to the install guide from README 2014-03-05 16:04:41 -08:00
Stephen Birarda
bf7eb97d3d simplify the README instructions for running own world 2014-03-05 16:04:01 -08:00
Stephen Birarda
378230c983 add information for High Fidelity custom qt5 formula 2014-03-05 15:57:10 -08:00
Stephen Birarda
86913236cf install guide header tweaks and Qt5 dependencies for linux 2014-03-05 15:54:25 -08:00
Stephen Birarda
a5b49f191b add instructions for GLM_ROOT_DIR for windows 2014-03-05 15:49:01 -08:00