Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-06 15:49:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
52042 commits 25 branches 0 tags 1.1 GiB
Commit graph

217 commits

Author SHA1 Message Date
Chris Collins
308c134119 Merge pull request #9686 from humbletim/21114-part3 
CR 21114 -- Implement modules/require support into hifi
 2017-03-20 06:22:35 -07:00
humbletim
758c07c7d4 Merge branch 'master' into 21114-part3 2017-03-16 14:29:17 -04:00
samcake
4ef7fc61f0 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2017-03-16 10:43:07 -07:00
Seth Alves
31e0cfe296 Merge pull request #9825 from thoys/record-fixes 
Avatar Recorder and Playback Fixes
 2017-03-16 07:27:42 -08:00
humbletim
52a571558c * changes per CR feedback 
* revert JSON content-type workaround
* add specific error check / advice for unanchored module ids
* update unit tests
 2017-03-16 01:23:23 -04:00
samcake
ea2f1359bc Expose rendering in wireframe mode 2017-03-15 12:23:44 -07:00
Thijs Wenker
097db9a7f9 - debug message removal (oops) 
- smaller timer textbox, allows you to grab around the edges and still drag the toolbar
 2017-03-08 01:41:20 +01:00
Thijs Wenker
b21bd3afa9 Make the time and slider follow the record.js toolbar 2017-03-08 01:14:11 +01:00
Thijs Wenker
6b26f5f3a3 Fix the timer display 2017-03-08 00:09:56 +01:00
humbletim
c559838dbb Add a few more .resolvePath characterization tests 2017-03-07 16:41:20 -05:00
humbletim
fa0d3a1845 unit test cleanup pass 2017-03-07 16:36:10 -05:00
humbletim
143b67e47d Add require/module unit tests 2017-03-07 16:36:10 -05:00
Ryan Huffman
a744e0d11c Merge pull request #9685 from humbletim/21114-part2 
CR-2 21114 -- BaseScriptEngine.cpp, order-of-operations fixes, reworked JS Exceptions
 2017-03-07 13:25:25 -08:00
sam
709c2e4240 Fixing the emissive on overlayfor models 2017-02-27 02:52:00 -08:00
humbletim
3ac116545e * Switch trigger for deferred loads from timer to using leading entity completion 
* Bring back notion of tracking "bad scripts" to fail stampeding entities as a set
* Update stampede JS tests to highlight/troubleshoot preexisting unload issue
 2017-02-24 16:05:11 -05:00
humbletim
02827552ae Add EntityScriptServer version of the stampede test 2017-02-24 12:31:18 -05:00
humbletim
0b73cef252 Add stampede test. 2017-02-23 19:10:44 -05:00
humbletim
8ab7a8cad5 fix bracket 2017-02-23 18:16:41 -05:00
humbletim
e794b64c31 Add resolvePath and include characterization/unit tests 2017-02-23 18:13:24 -05:00
Brad Hefta-Gaub
1b7ec7d61e Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements 
Conflicts:
	libraries/avatars/src/AvatarData.cpp
 2017-02-23 13:50:16 -08:00
Brad Hefta-Gaub
8cc0b383c4 wire up bandwidth buget to sorting 2017-02-21 16:22:22 -08:00
Thijs Wenker
15518e9aa1 remove debugger line 2017-02-21 20:20:23 +01:00
Thijs Wenker
13b2b6086f Fix recorder.js playback in interface 2017-02-21 19:47:26 +01:00
Brad Hefta-Gaub
765500ebce remove debug and fix bug in test script 2017-02-10 10:09:03 -08:00
Brad Hefta-Gaub
f6d4dbb7a4 some debugging 2017-02-10 09:18:04 -08:00
Brad Hefta-Gaub
7fba30f0dd add a test script to show binary message passing 2017-02-09 22:21:51 -08:00
Atlante45
72ed1add94 CR log spam cleanup 2017-02-09 13:04:43 -08:00
Atlante45
6fbe3c9187 Windows specific changes 2017-02-09 13:04:43 -08:00
Atlante45
43d2501993 Add HMD friendly window for the ESS log 2017-02-09 13:04:43 -08:00
Brad Hefta-Gaub
ae071aec0d add a bunch more stats for avatar processing 2017-02-09 09:52:09 -08:00
Brad Hefta-Gaub
41dc498888 add inView simulation stats 2017-02-08 18:32:39 -08:00
Brad Hefta-Gaub
6c41a25032 more stats 2017-02-08 16:51:00 -08:00
Brad Hefta-Gaub
357cc052e1 first cut at simulation stats 2017-02-08 15:32:48 -08:00
howard-stearns
9a44f63b74 update crowd-agent and summon for bubble, avatar-mixin optimizations. 2017-02-07 13:14:15 -08:00
Brad Hefta-Gaub
cff49ea5f3 Merge pull request #9556 from samcake/blue 
Adding support for disabling texturing from the material
 2017-01-31 10:39:44 -08:00
samcake
3c56bd2960 Adding support for disabling texturing from the material 2017-01-30 15:03:04 -08:00
Seth Alves
fa61bbe2a6 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 18:21:39 -08:00
ZappoMan
7ba41c72ef cleanup debugAvatarMixer 2017-01-23 13:31:06 -08:00
ZappoMan
29fff2e556 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-23 13:09:59 -08:00
Seth Alves
eb25e1c12d Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-19 09:41:49 -08:00
samcake
05304c72e0 Merge branch 'master' of https://github.com/highfidelity/hifi into meta 2017-01-18 17:00:20 -08:00
Seth Alves
3517daaad2 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-18 15:49:12 -08:00
samcake
5ed3b48f9d adding the checkbox to show the meta bounds from the debugDeferredLighting.js 2017-01-17 12:15:09 -08:00
humbletim
7025ed5909 update test script to create a triggerable entity 2017-01-17 03:18:56 -05:00
humbletim
88b7f9ec9d add ambient sound test 2017-01-17 01:44:03 -05:00
ZappoMan
aed1b69ee0 make the avatar bounding box be avatar local and only change when it actually changes 2017-01-12 17:19:06 -08:00
Anthony J. Thibault
b251dc9ed6 Tablet springboard can now be scrolled 2017-01-12 13:11:27 -08:00
ZappoMan
eadb1758f9 adding some rate debugging 2017-01-09 17:07:47 -08:00
Seth Alves
d072b1524a Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-05 15:27:11 -08:00
Anthony J. Thibault
94c6cc8e6a Added test script demonstrating event bridge on the tablet 2017-01-03 15:44:02 -08:00