Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 18:45:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
44117 commits 25 branches 0 tags 1.1 GiB
Commit graph

18073 commits

Author SHA1 Message Date
Andrew Meadows
9fc77ccfa2 use reference to avoid big copy 2016-06-20 17:29:20 -07:00
Andrew Meadows
13bb174b8b small change to commented out debug code 2016-06-20 17:29:20 -07:00
Andrew Meadows
5d5dc2837b fix comment 2016-06-20 17:29:20 -07:00
Andrew Meadows
d64729372a ShapeInfo name changes 2016-06-20 17:29:20 -07:00
Andrew Meadows
57760bca7d sort ShapeInfo data members 2016-06-20 17:29:20 -07:00
Brad Hefta-Gaub
10d79945d1 Merge pull request #8101 from humbletim/fix-entity-lifetime-guards 
Fix entity lifetime guards (re: canRez/canRezTmp)
 2016-06-20 15:52:54 -07:00
Brad Hefta-Gaub
d5c6296db5 Merge pull request #8095 from SamGondelman/skeletonFix 
Fix skeleton switching bug
 2016-06-20 15:52:40 -07:00
humbletim
e65e6dc9ce Fix entity lifetime guards (re: canRez/canRezTmp) 2016-06-19 13:40:03 -04:00
Seth Alves
d8a67850f2 treat usernames in permissions-grid on domain-server settings page as case-insensitive 2016-06-17 15:17:51 -07:00
SamGondelman
caf4a9fa34 got rid of comparison warning 2016-06-17 14:17:32 -07:00
SamGondelman
5f7e49b087 possible fix, needs testing 2016-06-17 11:50:56 -07:00
Brad Hefta-Gaub
d8d4eb65ec Merge pull request #8059 from Atlante45/feat/steamworks 
Initial Steamworks integration
 2016-06-16 18:49:51 -07:00
Brad Hefta-Gaub
3b132e7376 Merge pull request #8076 from ZappoMan/reduceLogSpam 
don't log spam on empty URL
 2016-06-16 18:25:54 -07:00
Brad Hefta-Gaub
7d0cd38c8e Merge pull request #8075 from ctrlaltdavid/20970 
fix reporting of JSON export failure
 2016-06-16 18:24:48 -07:00
Brad Hefta-Gaub
d7cd82a24e Merge pull request #8085 from ZappoMan/fixShaders 
fix v1 procedural shaders
 2016-06-16 13:06:15 -07:00
Brad Hefta-Gaub
5dae20975a fix v1 procedural shaders 2016-06-16 09:18:44 -07:00
SamGondelman
f02ffa92fd undo debugging 2016-06-15 18:00:08 -07:00
SamGondelman
59b785a33b trying to debug 2016-06-15 16:55:34 -07:00
David Rowe
775656eb1d Delete comment 2016-06-16 08:48:30 +12:00
Stephen Birarda
59912012c6 clear domain connection refusals on hard reset, not soft 2016-06-15 09:48:53 -07:00
Brad Hefta-Gaub
3e459085ac don't log spam on empty URL 2016-06-15 09:25:46 -07:00
David Rowe
657f8fdad5 Fix reporting of JSON export failure 2016-06-15 14:12:49 +12:00
Atlante45
5560ba9a4c Quit application when SteamVR requests it 2016-06-14 16:29:50 -07:00
Atlante45
fc7b271e50 Missed OS X Warning 2016-06-14 16:29:50 -07:00
Atlante45
96258a795a Initial Steamworks integration 2016-06-14 16:29:50 -07:00
Chris Collins
55330f2205 Merge pull request #8057 from jherico/settings 
Fixing issues with unclosed groups in settings persistence
 2016-06-14 14:34:14 -07:00
Chris Collins
0236af8bcd Merge pull request #8067 from birarda/api-recheck-on-fail 
only signal once on a protocol mismatch with DS
 2016-06-14 12:53:21 -07:00
Bradley Austin Davis
b1c472e82b Fixing settings, even in release builds 2016-06-14 12:16:40 -07:00
Brad Hefta-Gaub
b1de94f39d Merge pull request #8061 from imgntn/entityaddtypeserrors 
More verbose messaging about incorrect case in entity types
 2016-06-14 10:56:58 -07:00
Stephen Birarda
2163f9b5f3 signal once for domain protocol mismatch, case 918 2016-06-14 10:43:45 -07:00
Bradley Austin Davis
d52a1fe6f9 Fix persistence for global scope settings handles, clean up invalid variants in settings 2016-06-14 09:49:38 -07:00
Bradley Austin Davis
34c8d257d2 Fixing issues with unclosed groups in settings persistence 2016-06-14 09:49:38 -07:00
Brad Davis
196ab401e5 Merge pull request #8046 from SamGondelman/proceduralRaymarch 
Exposed orientation and eye position to procedural entity shaders
 2016-06-14 09:48:07 -07:00
James B. Pollack
1306417c8e more verbose messaging about incorrect entity types 2016-06-13 17:48:58 -07:00
SamGondelman
dc9121433d trying to fix skeleton switching bug 2016-06-13 16:37:34 -07:00
Seth Alves
f8f62a4ff1 remove unused function 2016-06-13 15:10:52 -07:00
Seth Alves
eba518cb65 try to make code that converts bullet-calculated values to parent-frame values more effecient 2016-06-13 14:26:41 -07:00
Seth Alves
998a5594c0 Merge branch 'master' of github.com:highfidelity/hifi into quiet-es-sim-spam 2016-06-13 13:41:32 -07:00
Chris Collins
b14f9cd312 Merge pull request #8041 from sethalves/fix-avatar-entity-locking 
Fix avatar entity locking
 2016-06-13 13:10:32 -07:00
Seth Alves
52245f25f2 rework code that transforms global _server* values into parent-frame values 2016-06-13 11:48:45 -07:00
Seth Alves
99bfc76dd3 Merge branch 'master' of github.com:highfidelity/hifi into quiet-es-sim-spam 2016-06-13 11:14:26 -07:00
Brad Hefta-Gaub
da28b0f3e7 Merge pull request #8048 from ctrlaltdavid/20961 
fix import of invalid JSON file failing silently
 2016-06-12 19:42:53 -07:00
Seth Alves
924c949af5 permissions for the local node were being updated without the various *changed* signals being called. this was keeping the asset-server menu item from being correct, among other things 2016-06-11 15:16:45 -07:00
Seth Alves
4c45d081cd merge from upstream 2016-06-10 19:57:46 -07:00
SamGondelman
8a682450a9 still trying to fix cmake errors 2016-06-10 17:01:22 -07:00
Chris Collins
006eb8fe64 Merge pull request #8031 from birarda/api-recheck-on-fail 
re-instate domain API connection info refresh during failure, fix localhost connection after downgrade
 2016-06-10 15:26:42 -07:00
SamGondelman
7b21d71180 try to fix cmake error 2016-06-10 14:09:04 -07:00
SamGondelman
53435fc730 removed extra argument 2016-06-10 14:04:33 -07:00
SamGondelman
f32e29ac2d small changes 2016-06-10 13:46:02 -07:00
SamGondelman
da98ee0916 reorganized procedural shader code, added getWorldEyeWorldPos(), removed iWorldEyePosition 2016-06-10 13:42:19 -07:00