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

39455 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
5e38aee0ba Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-23 11:21:00 -08:00
Clément Brisset
d7f55b1f3c Merge pull request #7158 from sethalves/stuck-web-entities 
Stuck web entities
 2016-02-23 10:16:35 -08:00
Stephen Birarda
8385d12d9b Merge pull request #7159 from Atlante45/fix/atp 
Fix packet resend faillure bug
 2016-02-23 10:15:36 -08:00
samcake
9d0803e6b8 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-23 09:33:54 -08:00
samcake
9cb8bd0808 Adding one more feature for NULL_VAR in scribe function parameters and unifying the MAterialTexture shader code 2016-02-23 02:41:26 -08:00
Brad Hefta-Gaub
04bd32e008 Merge pull request #7160 from jherico/auto_show_desktop 
Auto-unhide the desktop when showing or raising a window
 2016-02-22 23:28:24 -08:00
Brad Davis
160a107bbd Auto-unhide the desktop when showing or raising a window 2016-02-22 19:36:00 -08:00
Seth Alves
23b204c0c6 fix logic that checks getEntityProperties return value 2016-02-22 19:03:12 -08:00
samcake
00782b0e76 GOing home, this is in the middle of adding the Roughness texture and potentially cleaning up the different compinations of shaders regarding the material textures 2016-02-22 18:19:36 -08:00
Clément Brisset
965d6bb006 Merge pull request #7155 from jherico/script_engine_crash 
Fix a number of crashes / hangs on exit
 2016-02-22 16:17:33 -08:00
Atlante45
4c18a50473 Only debug if define set 2016-02-22 15:42:11 -08:00
Atlante45
97aebaf52a Fix log regexes 2016-02-22 15:33:53 -08:00
Atlante45
cb4f400c7e Cleanup obfuscation code 2016-02-22 15:32:00 -08:00
Atlante45
17b4d6fcf9 Factor members copy 2016-02-22 15:15:38 -08:00
Atlante45
f06ac911c5 Fix XORing algorithm 2016-02-22 15:15:38 -08:00
Atlante45
3a11e84c94 Use hex for msvc compatibility 2016-02-22 15:15:38 -08:00
Atlante45
c29ad09306 Fix obfuscation 2016-02-22 15:15:38 -08:00
Atlante45
bf5a65ca45 Add missing copies 2016-02-22 15:15:38 -08:00
Atlante45
4605cf5087 Move all udt header constants to Constant.h 2016-02-22 15:15:38 -08:00
Atlante45
3d7d812044 Add resend mecanic with obfuscation 2016-02-22 15:15:38 -08:00
Atlante45
6d9405d91d Add obfuscation level to packets 2016-02-22 15:15:38 -08:00
Atlante45
f6526272de Add header descriptions 2016-02-22 15:15:38 -08:00
Brad Davis
c07f3789e4 Don't crash on script destructor 2016-02-22 14:26:33 -08:00
Brad Davis
b4a7dc113e Safer shutdown behavior in QML surfaces 2016-02-22 14:25:30 -08:00
Brad Davis
4169e9be9d Don't deadlock objreader on shutdown 2016-02-22 14:24:31 -08:00
Seth Alves
f113a83c5b merge from upstream 2016-02-22 14:02:38 -08:00
Seth Alves
c470649076 don't crash if entity vanishes while doing touch test 2016-02-22 14:00:01 -08:00
Seth Alves
8a3b233659 don't crash if entity vanishes while doing touch test 2016-02-22 13:58:07 -08:00
Ryan Huffman
e6ccf501fa Merge pull request #7135 from zzmp/fix/grid 
Update renderGrid to use a shader, and fix grid edit tools
 2016-02-22 12:58:23 -08:00
Zach Pomerantz
5bf9b8bc76 Set grid minor div min to 0.01 2016-02-22 11:59:15 -08:00
Howard Stearns
523b77328c Merge pull request #7157 from ZappoMan/revertFlippedAudioChange 
revert change that trusted Qt's claim that it supports the audio format
 2016-02-22 11:37:54 -08:00
Brad Hefta-Gaub
bb1ed2147f revert change that trusted Qt's claim that it supports the format 2016-02-22 11:22:03 -08:00
Chris Collins
f24e4bc6b1 Merge pull request #7152 from sethalves/fix-touch 
fix grab-script touch
 2016-02-22 09:58:29 -08:00
Chris Collins
7074f72e6f Merge pull request #7154 from ZappoMan/hmdHacking 
various HMD fixes and improvements
 2016-02-22 09:24:44 -08:00
samcake
377ee5a486 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-22 09:23:14 -08:00
samcake
c7f43386e5 Compressing the g-buffer better 2016-02-22 09:23:16 -08:00
Brad Hefta-Gaub
cbe80bffd6 go into away mode if you the HMD loses mouse capture 2016-02-21 12:57:14 -08:00
Brad Hefta-Gaub
9f602a938d don't move mouse on reset sensors 2016-02-21 12:42:02 -08:00
Brad Davis
f35c1694f7 Merge pull request #7133 from ZappoMan/hmdHacking 
Working on making HMD mouse really work
 2016-02-21 12:20:12 -08:00
Brad Hefta-Gaub
ba36eed9eb whitespace fixes 2016-02-21 11:40:15 -08:00
Brad Hefta-Gaub
68771c92f7 change position to use mutex instead of atomic<> 2016-02-21 11:38:26 -08:00
Brad Hefta-Gaub
2c7c6be6a6 fix build buster 2016-02-21 10:40:11 -08:00
Brad Hefta-Gaub
a12446dab5 Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking 
Conflicts:
	libraries/entities-renderer/src/RenderableWebEntityItem.cpp
 2016-02-21 10:10:24 -08:00
Brad Hefta-Gaub
f41ebdf71d CR feedback 2016-02-21 10:03:54 -08:00
Brad Hefta-Gaub
3e6cddede3 CR feedback 2016-02-21 10:03:51 -08:00
Brad Hefta-Gaub
dd558f0656 Merge pull request #7147 from jherico/too_many_webs 
Too many (or too large) web views crash Interface
 2016-02-21 10:03:16 -08:00
Brad Hefta-Gaub
32a7179c62 CR feedback 2016-02-21 09:59:19 -08:00
Seth Alves
5f79500e4d fix grab-script touch 2016-02-21 09:37:43 -08:00
Brad Hefta-Gaub
1a4591db58 Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking 2016-02-21 09:30:41 -08:00
Brad Davis
4aec42893f Merge pull request #7150 from thoys/smooth_particle_trail 
Smooth particle trails
 2016-02-20 20:19:43 -08:00