Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
20840 commits 2 branches 0 tags 1.1 GiB
Commit graph

20840 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
c3cab45d16 remove physics lib requirement for gvr-interface 2015-01-19 12:50:52 -08:00
Stephen Birarda
60bdd206eb Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-19 12:35:22 -08:00
Brad Hefta-Gaub
699964ebb9 Merge pull request #4111 from AndrewMeadows/bispinor 
require Bullet
 2015-01-19 12:30:14 -08:00
Brad Hefta-Gaub
c7c7c35654 Merge pull request #4132 from ctrlaltdavid/3d-text-size 
Tweak 3D text overlay text size calculations
 2015-01-19 12:24:51 -08:00
Stephen Birarda
671734ba44 fix TBB find module for android build 2015-01-19 12:01:24 -08:00
Stephen Birarda
596c708d52 cleanup links from OpenSSL section in build guide 2015-01-19 11:56:50 -08:00
Stephen Birarda
a1e7da3c7f add some instructions for TBB 2015-01-19 11:49:10 -08:00
Stephen Birarda
035c56289f add instructions for android OpenSSL compilation 2015-01-19 11:26:16 -08:00
Stephen Birarda
de065ff442 add more instructions for Qt and GLM 2015-01-19 10:58:57 -08:00
Stephen Birarda
14e4879154 add a BUILD_ANDROID guide, reference ANDROID_LIB_DIR 2015-01-19 10:53:17 -08:00
Andrew Meadows
fd9b56fe49 add lib/Release and lib/Debug to lib PATH_SUFFIXES 2015-01-19 10:41:45 -08:00
Stephen Birarda
10be0ee984 resolve conflicts on merge with upstream master 2015-01-19 10:26:56 -08:00
David Rowe
9860feec61 Tweak 3D text overlay text size calculations 2015-01-19 09:54:44 -08:00
samcake
cc95e512c5 Merge pull request #4130 from AndrewMeadows/thermonuclear 
fix for entities rendering as black on linux
 2015-01-17 09:33:03 -08:00
Andrew Meadows
614a7eb0b5 fix for entities rendering as black on linux 2015-01-16 16:49:11 -08:00
Andrew Meadows
117ed9206c add ${BULLET_SEARCH_DIRS}/include, 
remove PATH_SUFFIXES include/bullet
 2015-01-16 16:19:47 -08:00
Stephen Birarda
4a2a9f92a7 Merge pull request #4129 from ctrlaltdavid/notifications-startup 
Stop notifications of all users at startup
 2015-01-16 15:44:50 -08:00
David Rowe
b2cadbe36a Stop notifications of all users at startup 2015-01-16 15:24:26 -08:00
Andrew Meadows
840acecbe6 merge upstream/master into andrew/bispinor 
Conflicts:
	libraries/physics/src/EntityMotionState.cpp
 2015-01-16 15:22:06 -08:00
Andrew Meadows
d5efc375d9 Merge pull request #4128 from ZappoMan/master 
fix double targets and freezing bullets
 2015-01-16 14:37:22 -08:00
Andrew Meadows
d5119b3532 merge upstream/master into andrew/bispinor 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/physics/src/EntityMotionState.h
	libraries/physics/src/ObjectMotionState.cpp
	libraries/physics/src/PhysicsEngine.cpp
	libraries/physics/src/PhysicsEngine.h
 2015-01-16 14:36:27 -08:00
ZappoMan
9a60896a40 fix double targets and freezing bullets 2015-01-16 14:24:50 -08:00
Andrew Meadows
0a04dc8445 modify PATH_SUFFIXES when hunting for include dir 2015-01-16 13:38:11 -08:00
Brad Hefta-Gaub
81cd3e9e7f Merge pull request #4127 from birarda/master 
put user location without curly braces
 2015-01-16 13:35:09 -08:00
Philip Rosedale
1ff90bec5d Merge pull request #4124 from AndrewMeadows/inertia 
support for simple kinematic motion
 2015-01-16 13:33:44 -08:00
Andrew Meadows
e5eccbc791 add back BULLET_ROOT_DIR hint 2015-01-16 13:25:43 -08:00
Andrew Meadows
a293c61c05 use hifi_library_search_hints() macro 2015-01-16 13:20:58 -08:00
Andrew Meadows
54a6a0a27c use custom config when hunting for bullet include 2015-01-16 12:50:50 -08:00
Stephen Birarda
9c1196a2a6 put user location without curly braces 2015-01-16 12:08:56 -08:00
Philip Rosedale
9beb493a45 Merge pull request #4126 from samcake/temp1 
Remove glMaterial from Entity rendering, Add Ambient Sphere lighting
 2015-01-16 10:49:43 -08:00
Andrew Meadows
7c9419aa4e fix non-bullet build 2015-01-16 10:34:52 -08:00
Sam Gateau
afb6175d60 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-16 10:32:56 -08:00
Sam Gateau
6b55b4ff82 No more Magic numbers and fixing the code path for linux 2015-01-16 10:26:51 -08:00
Andrew Meadows
2427fa68cd remove unnecessary Bullet #include 2015-01-16 10:06:39 -08:00
Brad Hefta-Gaub
6be61cb912 Merge pull request #4125 from AndrewMeadows/thermonuclear 
Remove pre-Bullet server-side EntityItem motion
 2015-01-16 10:00:22 -08:00
Sam Gateau
8634d86167 Adding ambient sphere in the lighting equation and menu to control te presets 2015-01-16 09:43:21 -08:00
Sam Gateau
0e38ea8854 Adding ambient sphere in the lighting equation and menu to control te presets 2015-01-16 09:41:43 -08:00
Sam Gateau
bb362b748f Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-16 09:39:23 -08:00
Sam Gateau
d1fb071208 Adding ambient sphere in the lighting equation and menu to control te presets 2015-01-16 09:38:53 -08:00
Andrew Meadows
4392af3b3a Remove pre-Bullet server-side EntityItem motion 2015-01-16 09:26:43 -08:00
Andrew Meadows
ba31309206 also find debug Bullet libs 2015-01-16 08:57:35 -08:00
Brad Hefta-Gaub
cc9ae17964 Merge pull request #4122 from PhilipRosedale/master 
Improvements to gun adding floating targets that topple
 2015-01-15 21:34:22 -08:00
Andrew Meadows
3fed38793e merge andrew/origin/inertia to andrew/local/inertia 2015-01-15 17:55:51 -08:00
Andrew Meadows
4c1cd991f4 remove pessimistic send of object updates 
we have not yet seen the headache of packetloss and unreliable messages
 2015-01-15 17:53:37 -08:00
Andrew Meadows
250fd98fee support for simple kinematic motion 2015-01-15 17:51:01 -08:00
Clément Brisset
1c310cbbcc Merge pull request #4121 from ctrlaltdavid/fix-script-load 
Fix path to hydraMove.js
 2015-01-15 17:49:26 -08:00
Stephen Birarda
bf71567fd8 Merge pull request #4123 from birarda/master 
use new place names in domain-server settings
 2015-01-15 17:44:24 -08:00
Stephen Birarda
2c1d4c8a64 fix settings url to check domains 2015-01-15 17:44:15 -08:00
Stephen Birarda
891cb42eff use new place names in domain-server settings 2015-01-15 17:41:59 -08:00
Philip Rosedale
abad341244 Merge branch 'master' of https://github.com/worklist/hifi 2015-01-15 17:35:12 -08:00