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

692 commits

Author SHA1 Message Date
Stephen Birarda
653e0d29c7 resolve conflicts on merge with upstream/core 2015-08-05 14:37:30 -07:00
Stephen Birarda
6c337b8aeb repairs for build type of glew external 2015-08-05 14:30:36 -07:00
Bradley Austin Davis
252677e1c2 Fix MD5 of glew dep 2015-08-05 14:02:14 -07:00
Brad Davis
754bf5c6f7 Merge pull request #5509 from birarda/core 
get GLEW for all platforms as external project
 2015-08-05 13:41:48 -07:00
Sam Gondelman
513c652ab3 merge from master and attempt to fix connexion conflicts 2015-08-05 12:42:39 -07:00
Stephen Birarda
34e188fe6e log more of the steps for glew external project 2015-08-05 12:35:37 -07:00
Stephen Birarda
cc909507f4 get GLEW for all platforms as external project 2015-08-05 12:34:11 -07:00
Bradley Austin Davis
04d579be7a Removing integrated glew 2015-08-05 11:21:59 -07:00
Bradley Austin Davis
ed5f70039f Merge branch 'master' into core 2015-08-03 22:18:38 -07:00
Sam Gondelman
95232920f1 trying to fix mac linking errors 2015-08-03 16:35:34 -07:00
Sam Gondelman
c9780338ae merge from master 2015-08-03 16:27:45 -07:00
Bradley Austin Davis
f19653f3e2 Integrate glew 2015-08-01 20:08:19 -07:00
Sam Gondelman
647bb2b9ce removing unnecessary weak link 2015-08-01 11:41:29 -07:00
Sam Gondelman
8d77afaa94 more work on cleaning up connexion 2015-08-01 11:41:29 -07:00
Sam Gondelman
01c4e17236 trying to fix connexion linker errors, general style fixes, renamed some files 2015-08-01 11:41:29 -07:00
SamGondelman
e8daee013e windows finds framework 2015-07-31 16:27:10 -07:00
SamGondelman
25e75bcc79 WIP: trying to fix windows not finding framework 2015-07-30 18:11:24 -07:00
Sam Gondelman
a01a4f929f removing unnecessary weak link 2015-07-30 15:14:51 -07:00
Sam Gondelman
b8f7d4b8c8 more work on cleaning up connexion 2015-07-30 13:19:05 -07:00
Sam Gondelman
b19376ef6e trying to fix connexion linker errors, general style fixes, renamed some files 2015-07-30 12:17:36 -07:00
Sam Gateau
8c96096a67 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-29 14:04:20 -07:00
Andrew Meadows
77a12eb50e compile on linux with GLEW 2015-07-28 17:53:01 -07:00
Marcel Verhagen
32d0513962 The 3Dconnextion files from https://github.com/highfidelity/hifi/pull/5351 
For now without a merge conflict.

Updated the menu name.

Still have to look at the fast zooming and yaw on windows, probably have to add a var to prevent the button changes to be pushed to fast. Not sure why the yaw thing does not always work, could be that the position is also send at the same time and the input mapper does not not process all those synchronical. Probably will have to do something with masking the postion when the rotation is set for yaw.
 2015-07-27 19:04:49 +02:00
Bradley Austin Davis
c3f77a1c24 Merge branch 'master' into maggie 2015-07-21 19:21:45 -04:00
Seth Alves
4db66e7894 build separate debug and release versions of polyvox library 2015-07-15 14:38:44 -07:00
Seth Alves
930e570b48 build separate debug and release versions of polyvox library 2015-07-15 13:54:57 -07:00
Seth Alves
f1c10f5119 build separate debug and release versions of polyvox library 2015-07-15 13:38:12 -07:00
Seth Alves
3bc182730a build separate debug and release versions of polyvox library 2015-07-15 10:52:38 -07:00
Seth Alves
a71c5cae5f build separate debug and release versions of polyvox library 2015-07-15 10:33:22 -07:00
Seth Alves
443cfc8970 build separate debug and release versions of polyvox library 2015-07-15 10:31:21 -07:00
Seth Alves
fd84893c61 build separate debug and release versions of polyvox library 2015-07-15 09:42:26 -07:00
Seth Alves
316c322118 build separate debug and release versions of polyvox library 2015-07-15 09:36:51 -07:00
Brad Davis
0c50cb670a Moving boostconfig folder in IDEs 2015-07-13 12:40:26 -07:00
Brad Davis
0a389a9daa Updating oglplus version and switching to url based dist 2015-07-07 11:11:52 -07:00
Seiji Emery
16e7af1848 Reverted macro naming convention 2015-07-02 17:41:38 -07:00
Seiji Emery
a48adf5ce5 Cleanup + formatting 2015-06-30 14:12:58 -07:00
Seiji Emery
e81b0a3c3a Fixed tests for ALL_BUILD 
Fixed physics tests, disabled out-of-date octree tests, and renamed /
added QTestExtensions to the tests folder (IDE view).

ALL_BUILD will now succeed.
 2015-06-26 13:31:31 -07:00
Seiji Emery
6e87f44ec7 Merge remote-tracking branch 'upstream/master' 2015-06-24 15:12:57 -07:00
Seiji Emery
0ee0c92f2f Re-added stuff 2015-06-24 14:54:54 -07:00
Andrew Meadows
1ceed98ca2 Merge pull request #5166 from jherico/64bit 
Enable Windows 64 bit builds
 2015-06-23 17:03:42 -07:00
Seiji Emery
0cc940d433 Modified the build files for external targets so that they longer show up project view in IDEs (which clutters up the view, etc). 
Said files are now buried under hidden/externals; the (phony) build targets still exist and are visible in the target dropdown, but this is filterable (in Xcode, dunno about Visual Studio (just start typing and a filter/search box comes up))
 2015-06-19 21:58:16 -07:00
Brad Davis
d65e5882aa Working on 64 bit builds 2015-06-18 21:44:12 -07:00
Brad Davis
a8d3dc7218 Updating oglplus version 2015-06-17 23:50:38 -07:00
Brad Davis
4f8ea3f624 Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-16 09:58:20 -07:00
Stephen Birarda
128b086e82 don't build the polyvox examples 2015-06-12 10:25:34 -07:00
Brad Davis
1846ead27c Merge branch 'master' into vs2015 2015-06-10 10:11:58 -07:00
Brad Davis
e9587d90c4 Trying to fix linux build 2015-06-09 01:50:32 -07:00
Brad Davis
43bddf23b4 Grabbing correct oglplus commit 2015-06-09 01:03:14 -07:00
Brad Davis
5a1b713160 Fixing texture include error in oglplus 2015-06-09 00:59:17 -07:00
Brad Davis
11bc838be9 Switching to Git for oglplus 2015-06-09 00:48:42 -07:00