Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-09 13:02:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
31457 commits 67 branches 56 tags 1.2 GiB
Commit graph

195 commits

Author SHA1 Message Date
Stephen Birarda
699a9566c3 add option to specify OS X SDK for Xcode 7 2015-09-10 15:00:01 -07:00
Seth Alves
0ac885da80 fix when memory debugging message is printed 2015-08-20 10:17:13 -07:00
Seth Alves
c25082d86f use -fsanitize=address in all code rather than just the top-level links 2015-08-20 10:14:16 -07:00
Brad Davis
aba7bebf6e Revert "Updating to the new version of the sixense library" 2015-08-19 09:44:51 -07:00
Brad Davis
eba446e7f6 Updating to the new version of the sixense library 2015-08-18 18:55:59 -07:00
Stephen Birarda
078e60076c don't set a default build type 2015-08-05 14:34:00 -07:00
Stephen Birarda
6c337b8aeb repairs for build type of glew external 2015-08-05 14:30:36 -07:00
Stephen Birarda
cc909507f4 get GLEW for all platforms as external project 2015-08-05 12:34:11 -07:00
Bradley Austin Davis
f19653f3e2 Integrate glew 2015-08-01 20:08:19 -07:00
Seiji Emery
7ba03418fc PR Fixes 2015-07-02 17:24:03 -07:00
Seiji Emery
d75f3b1398 Fixed test target dependencies (which were not getting added into the *-tests build targets) 2015-06-20 11:49:26 -07:00
Seth Alves
021dc64789 merge from upstream 2015-06-18 15:03:09 -07:00
Seth Alves
b8cf4ea29d use -Woverloaded-virtual with g++. quiet compiler warnings 2015-06-16 21:19:31 -07:00
Seth Alves
2a841cc0b8 clang doesn't know -Wdouble-promotion 2015-06-16 19:19:18 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Brad Davis
1846ead27c Merge branch 'master' into vs2015 2015-06-10 10:11:58 -07:00
Brad Davis
8bad80324f Merge branch 'master' into plugins_pt3 2015-05-29 09:05:01 -07:00
Brad Davis
e5bc0fad1e Merge branch 'master' into plugins_pt3 2015-05-27 23:45:31 -07:00
Seth Alves
386b3301f4 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 14:46:37 -07:00
David Rowe
a2272d3f42 Fix Windows C4351 build warning 
VS2013 warns about default initialization of arrays because it behaved
differently in previous versions. Default initialization is what we expect
now that we're using VS2013 so we can disable this warning globally.
 2015-05-27 11:49:00 -07:00
Brad Davis
09085f1cd9 Working towards display plugins 2015-05-26 18:42:38 -07:00
Seth Alves
4166c3224f link polyvox library in with entities 2015-05-19 16:24:13 -07:00
Ryan Huffman
0883bde1be Update compiler flags to produce warnings on non-gnu compilers 2015-05-01 11:29:23 -07:00
Brad Davis
a83616a7dc Don't prevent building on Visual Studio 2015 2015-04-30 10:32:19 -07:00
Seth Alves
0fb1a83e3b quiet compiler, remove some trailing control-Ms 2015-04-25 09:20:00 -07:00
Brad Davis
7a33474245 Merge remote-tracking branch 'upstream/master' into offscreen 
Conflicts:
	interface/src/Menu.cpp
 2015-04-21 13:02:38 -07:00
Stephen Birarda
03129f98d4 make VHACD an external project 2015-04-15 13:51:51 -07:00
Brad Davis
d14d5f3d29 Working on new-UI implementations of address bar and login 2015-04-15 00:36:04 -07:00
David Rowe
12f5b992c9 Add /LARGEADDRESSAWARE linker flag for Windows builds 
Enables Interface to use more than 2GB of memory.
Reduces the incidence of bad_alloc crashes.
 2015-04-08 20:01:01 -07:00
Bradley Austin Davis
db9ab3e699 Merge branch 'master' into oculus_old_renderer 2015-03-31 18:25:34 -07:00
Bradley Austin Davis
02b69f4a70 Enabling the use of #ifdef DEBUG as a platform neutral idiom 2015-03-31 13:32:13 -07:00
Bradley Austin Davis
1d56266044 Merge branch 'master' into oculus_old_renderer 2015-03-20 09:56:54 -07:00
Brad Davis
54f2774d2e Organize projects into folders for IDEs that support it 2015-03-19 15:45:11 -07:00
Brad Davis
fd29f72bfe Making nsight usage optional (still defaults to on) 2015-03-16 12:59:41 -07:00
Brad Davis
320cfa7c9e Merge remote-tracking branch 'upstream/master' into oculus_old_renderer 2015-03-09 14:54:09 -07:00
Andrew Meadows
e4c68bf31c committing some temp debug stuff to help git diff 
(will remove this stuff later)
 2015-03-05 18:06:08 -08:00
Brad Davis
c1c97fc8b6 Updating cmake files after merging from master 2015-03-04 23:32:27 -08:00
Stephen Birarda
e43da00537 remove xmpp chat support 2015-03-03 10:13:41 -08:00
Stephen Birarda
a7a9ede744 handle an SDK in Xcode beta 2015-02-25 13:53:57 -08:00
Stephen Birarda
e0d31f6e61 remove extra added spaces 2015-02-25 13:52:14 -08:00
Stephen Birarda
994c0386d3 cleanup command that looks for SDK 2015-02-25 13:50:59 -08:00
Stephen Birarda
d24287f627 look in Xcode application for 10.9 SDK 2015-02-25 13:48:28 -08:00
Leonardo Murillo
006b3ed0ac Merge pull request #4300 from birarda/dependencies 
NOT MERGEABLE - add some externals as cmake external projects
 2015-02-25 13:22:49 -08:00
Stephen Birarda
e7e7323ff0 pass 10.9 SDK as CMAKE_OSX_SYSROOT 2015-02-24 15:00:41 -08:00
Stephen Birarda
8be707f63f rename add paths macro for fixup_bundle 2015-02-23 13:24:21 -08:00
Stephen Birarda
2ad8ac866d make correct version of bullet for windows 2015-02-23 12:50:53 -08:00
Stephen Birarda
c64f172311 add qxmpp as external project 2015-02-20 16:06:37 -08:00
Stephen Birarda
dc9c4ea43c add options with default for get of external projects 2015-02-20 15:34:41 -08:00
Stephen Birarda
bc0bd462cb add an external project for SDL 2 2015-02-20 15:26:16 -08:00
Stephen Birarda
a3d370f01f more path shortening for build of external projects 2015-02-19 14:33:31 -08:00