Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-02 11:51:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66206 commits 73 branches 59 tags 1.2 GiB
Commit graph

27330 commits

Author SHA1 Message Date
Simon Walton
692ccfc09b Create HIFI_FCDEBUG(_ID) variants that require a category 
Original macros use default settings.
 2018-04-04 09:49:15 -07:00
Simon Walton
7d16ca9c1c Remove uses of addRepeatedMessageRegex() and its implementation 
Change to new log-message ID scheme.
 2018-04-03 17:54:01 -07:00
Simon Walton
d4ab06b1d4 Move HIFI_FDEBUG macro to LogHandler.h 
Not all uses of repeated log messages include NetworkLogging.h,
but if they use addRepeatedMessageRegex() they must include
LogHandler.h. Also add second macro for client-supplied
message ID.
 2018-04-03 15:53:12 -07:00
Simon Walton
5b0bcd76e3 Repeated logging - Fixes and clean-up 2018-04-03 12:23:21 -07:00
Simon Walton
a7fc6a2991 Repeated logs - use #define to replace qCDebug 2018-04-03 10:44:53 -07:00
Simon Walton
6d078f41e7 Use unique IDs for log strings that should have repeats supressed 2018-04-02 17:32:18 -07:00
Anthony Thibault
dc9c9fd0ee
Merge pull request #12683 from hyperlogic/bug-fix/reduce-elbow-flapping 
Reduce avatar elbow fluttering by disabling pole vectors
 2018-04-02 10:51:28 -07:00
John Conklin II
a76b4b1008
Merge pull request #12734 from samcake/RC66-fetchMetaItem 
RC66: Add an extra sanity check when calling fetchMetaSubItemBounds
 2018-03-29 11:05:08 -07:00
John Conklin II
97d9c1b735
Merge pull request #12726 from jherico/fix/rc66_crashes 
Attempt to resolve potential overlay crashes at shutdown
 2018-03-29 09:37:23 -07:00
samcake
2ee0af03c8 Add an extra sanity check when calling fetchMetaSubItems when the subItems is not allocated yet 2018-03-28 16:17:55 -07:00
Cristian Luis Duarte
fe9481b28d Cleanup code, comment out log, simplify radar is valid touch code (no more flag) 2018-03-28 19:50:44 -03:00
Cristian Luis Duarte
f0bcaa47c8 Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera 2018-03-28 16:47:21 -03:00
Brad Davis
9be162de95 Synchronously shut down QML rendering threads 2018-03-28 09:13:46 -07:00
Seth Alves
46fb2033f2
Merge pull request #12574 from druiz17/remap-keybaord 
changing keyboard mapping
 2018-03-27 19:00:05 -07:00
Seth Alves
6948de7e24 default to serverless tutorial 2018-03-26 14:32:40 -07:00
Dante Ruiz
b8796db1e5 Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord 2018-03-26 09:13:58 -07:00
Cristian Luis Duarte
6cb5cd7f92 Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera 2018-03-26 11:19:42 -03:00
Cristian Luis Duarte
242b009562 Android - Use mouse events for interacting with UI. Now LoginDialog UI interation does not move radar camera. Remove repeated tooggle call in audio.js. Adapt button to simulated mouse events. 2018-03-23 18:59:55 -03:00
SamGondelman
a19f71e759 fix tonemapping on android 2018-03-23 14:16:47 -07:00
John Conklin II
563ff61325
Merge pull request #12661 from SamGondelman/android 
Android: Stats, disable IK, reduce impact of InputRecorder
 2018-03-23 11:08:50 -07:00
John Conklin II
0bc23456c3
Merge pull request #12682 from ctrlaltdavid/21807 
JSDoc that an entity's clientOnly property can be set at entity creation
 2018-03-22 17:55:45 -07:00
Dante Ruiz
4d52caccde making some more requested changes 2018-03-22 17:39:22 -07:00
Dante Ruiz
1d17658c80 Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord 2018-03-22 16:29:16 -07:00
Clément Brisset
feec59655c
Merge pull request #12692 from highfidelity/stable 
Merge stable back into master
 2018-03-22 15:08:30 -07:00
John Conklin II
6d9892856d
Merge pull request #12510 from sethalves/serverless-domains 
Serverless domains
 2018-03-22 14:06:49 -07:00
Stephen Birarda
e8bea3a611
Merge pull request #12369 from simon-walton/BugFix 
Lexer code has confusion between strings and chars
 2018-03-22 12:03:47 -07:00
Sam Gondelman
e46a8f022c
Merge pull request #12695 from gcalero/fix/current_context 
Fix/current context
 2018-03-22 10:54:34 -07:00
Dante Ruiz
cea0f98aae reverting files 2018-03-22 09:20:27 -07:00
Dante Ruiz
f5a954d08e Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains 2018-03-22 09:06:42 -07:00
Gabriel Calero
12b289bbc1 Restore debug logger for GLES. Fix SIGABRT Cannot make QOpenGLContext current in a different thread 2018-03-22 12:38:56 -03:00
Simon Walton
10f3032746 Compare QString w/ char*, not char 2018-03-21 23:09:46 -07:00
Seth Alves
b551b144a7 remove unneeded setIsConnected call 2018-03-21 19:15:27 -07:00
Seth Alves
4f20a87c6d review 2018-03-21 16:26:02 -07:00
Seth Alves
916ed3a0d4 review 2018-03-21 16:18:31 -07:00
Brad Davis
d529d7b1d3 Remove whitespace before shader version line 2018-03-21 16:07:04 -07:00
Seth Alves
ae94ab3d67 make sure _sockAddr is cleared if the new url isn't a hifi:// one 2018-03-21 15:28:12 -07:00
Seth Alves
bea7ee42e2 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-21 14:30:07 -07:00
Seth Alves
ef52ae13ee rearrange domain-url-changed signals 2018-03-21 14:30:00 -07:00
John Conklin II
2d63afbe28
Merge pull request #12588 from SamGondelman/shapeTex 
Materials on primitives
 2018-03-21 12:08:24 -07:00
John Conklin II
283aff71ec
Merge pull request #12612 from jherico/gl_common 
Break out common GL and GLES code into a single shared library
 2018-03-21 11:28:24 -07:00
Seth Alves
4033af9b11 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-21 11:11:43 -07:00
Ken Cooke
f5f4e2a780
Merge pull request #12635 from ctrlaltdavid/21776 
Fix Window hasFocus(), setFocus(), and raiseMainWindow()
 2018-03-21 09:27:51 -07:00
Dante Ruiz
86cd5ffa30 Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord 2018-03-21 08:49:25 -07:00
Bradley Austin Davis
d5d8e4c0b0 Restoring geometry shader 2018-03-20 18:28:53 -07:00
Anthony J. Thibault
f19b1d9890 Fix for character walk animations in desktop mode. 2018-03-20 18:12:55 -07:00
Sam Gateau
a7533e5287
Merge pull request #12675 from SamGondelman/hotfix 
Model behaves correctly if missing material
 2018-03-20 14:27:21 -07:00
Sam Gateau
e59eed64fb
Merge pull request #12680 from SamGondelman/relative 
Support relative paths for material images
 2018-03-20 14:24:50 -07:00
Bradley Austin Davis
a861be112f Fix GLES build 2018-03-20 14:15:38 -07:00
Stephen Birarda
0074c0470d
Merge pull request #12524 from birarda/feat/runtime-beside-exe 
switch back to app-local VC runtimes and UCRT
 2018-03-20 14:07:27 -07:00
John Conklin II
de5ff20968
Merge pull request #12664 from gcalero/android_websurface_check_nocrash 
Android - Prevent crash when setting the url property to _webSurface.
 2018-03-20 11:40:08 -07:00